From 72da1f7ca6f73346ff92bed7df96b4d28d6ccfd1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期六, 04 三月 2023 11:25:03 +0800
Subject: [PATCH] 1.工单派发选择工艺路线或选择生产车间时判断绑定条件接口开发
2.组织架构删除update改为delete
3.工艺路线新增else if改为if
4.节拍工价根据工序线编码查找关联设备集合

---
 VueWebApi/Controllers/BasicSettingController.cs |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/VueWebApi/Controllers/BasicSettingController.cs b/VueWebApi/Controllers/BasicSettingController.cs
index e3824cd..3fe5bdc 100644
--- a/VueWebApi/Controllers/BasicSettingController.cs
+++ b/VueWebApi/Controllers/BasicSettingController.cs
@@ -616,15 +616,13 @@
             string unitid = obj["id"].ToString();    //寰�鏉ュ崟浣峣d(涓婚敭)
             string unitcode = obj["unitcode"].ToString(); //寰�鏉ュ崟浣嶇紪鐮佺紪鐮�
             string unitname = obj["unitname"].ToString(); //寰�鏉ュ崟浣嶅悕绉�
-            string mtypecode = obj["mtypecode"].ToString(); //澶栬喘渚涙柟缂栫爜
-            string btypecode = obj["btypecode"].ToString(); //澶栧崗渚涙柟缂栫爜
-            string htypecode = obj["htypecode"].ToString(); //瀹㈡埛缂栫爜
+            string typecode = obj["typecode"].ToString(); //鍗曚綅灞炴�х紪鐮�
             string person = obj["person"].ToString(); //鑱旂郴浜�
             string contact = obj["contact"].ToString(); //鑱旂郴鏂瑰紡
             string description = obj["description"].ToString(); //琛ュ厖鎻忚堪
             var usercode = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
             string OperType = obj["OperType"].ToString();  //鎿嶄綔绫诲瀷
-            mes = BasicSettingBLL.AddUpdateCurrentUnit(unitid, unitcode, unitname, mtypecode, btypecode,htypecode, person, contact, description, usercode, OperType);
+            mes = BasicSettingBLL.AddUpdateCurrentUnit(unitid, unitcode, unitname, typecode, person, contact, description, usercode, OperType);
             return TJson.toJson(mes);
         }
         #endregion
@@ -774,5 +772,22 @@
             return TJson.toJson(mes);
         }
         #endregion
+
+
+
+        #region[閫氳繃杞﹂棿缂栫爜鏌ユ壘璁惧淇℃伅]
+        /// <summary>
+        /// 閫氳繃杞﹂棿缂栫爜鏌ユ壘璁惧淇℃伅
+        /// </summary>
+        /// <param name="wkshpcode">杞﹂棿缂栫爜</param>
+        /// <returns></returns>
+        [Route(template: "WhkspIsEqpSearch")]
+        [HttpGet]
+        public HttpResponseMessage WhkspIsEqpSearch(string wkshpcode)
+        {
+            mes = BasicSettingBLL.WhkspIsEqpSearch(wkshpcode);
+            return TJson.toJson(mes);
+        }
+        #endregion
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3