From 5b84275a7ce63b83c778c5ac050b8c039cd4fac8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 06 八月 2024 17:46:25 +0800
Subject: [PATCH] 1.修改接口：UpdateMesOrderStepSearch --工单派发 2.修改接口：MesOrderNewStepContent --工单派发 3.修改接口：RouteSelectStep--工单派发 4.新增组织架构类型接口：TOrganTypeDate 5.新增组织架构车间接口：TorgWkshop 6.新增车间查找设备接口：WkshopEqpPermissions 7.新增往来单位基础资料接口：CustomerTypePermissions 8.新增往来单位类型查找往来单位资料接口：CustomerTypeSearchPermissions 9.新增工序关联工作站接口 10.修改工序工价提交接口(增加了设备)
---
VueWebCoreApi/Controllers/BasicSettingController.cs | 58 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/VueWebCoreApi/Controllers/BasicSettingController.cs b/VueWebCoreApi/Controllers/BasicSettingController.cs
index 004da7c..cfc18a6 100644
--- a/VueWebCoreApi/Controllers/BasicSettingController.cs
+++ b/VueWebCoreApi/Controllers/BasicSettingController.cs
@@ -31,14 +31,15 @@
/// </summary>
/// <param name="storg_code">缁勭粐缂栫爜</param>
/// <param name="storg_name">缁勭粐鍚嶇О</param>
+ /// <param name="torgtype_code">缁勭粐绫诲瀷缂栫爜</param>
/// <returns></returns>
[Route(template: "STorgData")]
[HttpGet]
- public JsonResult STorgData(string storg_code, string storg_name)
+ public JsonResult STorgData(string storg_code, string storg_name,string torgtype_code)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
- mes = BasicSettingBLL.STorgData(storg_code, storg_name);
+ mes = BasicSettingBLL.STorgData(storg_code, storg_name, torgtype_code);
return Json(mes);
}
#endregion
@@ -60,10 +61,11 @@
string leve = obj["leve"].ToString(); //灞傜骇缂栫爜
string parent_id = obj["parent_id"].ToString(); //parent_id
string storgcode = obj["storgcode"].ToString(); //鎵�灞炵粍缁囩紪鐮�
+ string torgtype_code = obj["torgtype_code"].ToString(); //缁勭粐绫诲瀷缂栫爜
string torg_seq = obj["torg_seq"].ToString(); //鎺掑簭搴忓彿
string status = obj["status"].ToString(); //鐘舵��
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = BasicSettingBLL.AddUpdateOrganization(OrganCode, OrganName, leve, parent_id, storgcode, torg_seq, status, OperType, us);
+ mes = BasicSettingBLL.AddUpdateOrganization(OrganCode, OrganName, leve, parent_id, storgcode, torgtype_code, torg_seq, status, OperType, us);
return Json(mes);
}
#endregion
@@ -881,22 +883,16 @@
/// <summary>
/// 宸ュ簭鏂板缂栬緫
/// </summary>
- /// <param name="obj">鎻愪氦鏁版嵁瀵硅薄</param>
+ /// <param name="OperType">鎿嶄綔绫诲瀷:Add/Update</param>
+ /// <param name="tflw_rteqp">鎻愪氦鏁版嵁</param>
/// <returns></returns>
[Route(template: "AddUpdateStep")]
[HttpPost]
- public JsonResult AddUpdateStep([FromBody] JObject obj)
+ public JsonResult AddUpdateStep(string OperType, TFlw_Rteqp tflw_rteqp)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
- string stepid = obj["id"].ToString(); //宸ュ簭id(涓婚敭)
- string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
- string stepname = obj["stepname"].ToString(); //宸ュ簭鍚嶇О
- string steptypecode = obj["steptypecode"].ToString(); //宸ュ簭绫诲瀷缂栫爜
- string enable = obj["enable"].ToString(); //鍚敤鐘舵��
- string description = obj["description"].ToString(); //宸ュ簭鎻忚堪
- string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = BasicSettingBLL.AddUpdateStep(stepid, stepcode, stepname, steptypecode, enable, description, us, OperType);
+ mes = BasicSettingBLL.AddUpdateStep(OperType, us, tflw_rteqp);
return Json(mes);
}
#endregion
@@ -914,6 +910,41 @@
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
mes = BasicSettingBLL.DeleteStep(stepcode, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐煡璇
+ /// <summary>
+ /// 宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐煡璇�
+ /// </summary>
+ /// <param name="stepcode">宸ュ簭缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "StepAssociationEqp")]
+ [HttpGet]
+ public JsonResult StepAssociationEqp(string stepcode)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = BasicSettingBLL.StepAssociationEqp(stepcode, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region [宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐彁浜
+ /// <summary>
+ /// 宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐彁浜�
+ /// </summary>
+ /// <param name="stepcode">宸ュ簭缂栫爜</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "SaveStepAssociationEqp")]
+ [HttpPost]
+ public JsonResult SaveStepAssociationEqp(string stepcode, List<ObjectData> json)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = BasicSettingBLL.SaveStepAssociationEqp(stepcode, us, json);
return Json(mes);
}
#endregion
@@ -961,7 +992,6 @@
[HttpGet]
public JsonResult RouteSelectStep(string partcode,string routecode)
{
-
mes = BasicSettingBLL.RouteSelectStep(partcode, routecode);
return Json(mes);
}
--
Gitblit v1.9.3