From d6502baa8e5610c04127fbee92ff6111e40956f8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 13 六月 2023 09:50:02 +0800
Subject: [PATCH] 生产入库、采购入库接口提交

---
 VueWebApi/Controllers/AppProductionManagementController.cs |  136 ++++++++++++++++++++++++++++----------------
 1 files changed, 86 insertions(+), 50 deletions(-)

diff --git a/VueWebApi/Controllers/AppProductionManagementController.cs b/VueWebApi/Controllers/AppProductionManagementController.cs
index 6f75a37..03e22af 100644
--- a/VueWebApi/Controllers/AppProductionManagementController.cs
+++ b/VueWebApi/Controllers/AppProductionManagementController.cs
@@ -13,7 +13,7 @@
 {
     [RoutePrefix(prefix: "api/AppProductionManagement")]
     [ControllerGroup("App鐢熶骇绠＄悊", "鍦ㄧ嚎鎺ュ彛")]
-    [ChannelActionFilterAttributeApp]
+    //[ChannelActionFilterAttributeApp]
     public class AppProductionManagementController : ApiController
     {
         //瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -135,16 +135,16 @@
         /// <returns></returns>
         [Route(template: "SavaMesOrderStepStart")]
         [HttpPost]
-        public HttpResponseMessage SavaMesOrderStepStart([FromBody] JObject obj)
+        public HttpResponseMessage SavaMesOrderStepStart()
         {
-            string mesordercode = obj["mesordercode"].ToString(); //宸ュ崟缂栧彿
-            string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
-            string stepseq = obj["stepseq"].ToString(); //宸ュ簭搴忓彿
-            string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
-            string eqpcode = obj["eqpcode"].ToString(); //璁惧缂栫爜
-            string taskqty = obj["taskqty"].ToString(); //浠诲姟鏁伴噺
-            string startqty = obj["startqty"].ToString(); //寮�宸ユ暟閲�
-            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //寮�宸ヤ汉鍛�
+            string mesordercode = HttpContext.Current.Request["mesordercode"].ToString();//宸ュ崟缂栧彿
+            string partcode = HttpContext.Current.Request["partcode"].ToString();//浜у搧缂栫爜
+            string stepseq = HttpContext.Current.Request["stepseq"].ToString();//宸ュ簭搴忓彿
+            string stepcode = HttpContext.Current.Request["stepcode"].ToString();//宸ュ簭缂栫爜
+            string eqpcode = HttpContext.Current.Request["eqpcode"].ToString();//璁惧缂栫爜
+            string taskqty = HttpContext.Current.Request["taskqty"].ToString();//浠诲姟鏁伴噺
+            string startqty = HttpContext.Current.Request["startqty"].ToString();//寮�宸ユ暟閲�
+            var username = HttpContext.Current.Request["admin"].ToString(); //寮�宸ヤ汉鍛�
             mes = ProductionManagementBLL.SavaMesOrderStepStart(mesordercode, partcode, stepseq, stepcode, eqpcode, taskqty, startqty, username);
             return TJson.toJson(mes);
         }
@@ -158,23 +158,25 @@
         /// <returns></returns>
         [Route(template: "SavaMesOrderStepReport")]
         [HttpPost]
-        public HttpResponseMessage SavaMesOrderStepReport([FromBody] JObject obj)
+        public HttpResponseMessage SavaMesOrderStepReport()
         {
-            string mesordercode = obj["mesordercode"].ToString(); //宸ュ崟缂栧彿
-            string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
-            string stepseq = obj["stepseq"].ToString(); //宸ュ簭搴忓彿
-            string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
-            string eqpcode = obj["eqpcode"].ToString(); //璁惧缂栫爜
-            string usergroupcode = obj["usergroupcode"].ToString(); //鐝粍缂栫爜
-            string reportuser = obj["reportuser"].ToString();  //鎶ュ伐浜哄憳
-            string taskqty = obj["taskqty"].ToString(); //浠诲姟鏁伴噺
-            string startqty = obj["startqty"].ToString(); //寮�宸ユ暟閲�
-            string reportqty = obj["reportqty"].ToString(); //鎶ュ伐宸ユ暟閲�
-            string ngqty = obj["ngqty"].ToString(); //涓嶈壇鏁伴噺
-            string badcode = obj["badcode"].ToString(); //涓嶈壇鍘熷洜缂栫爜
-            string remarks = obj["remarks"].ToString(); //澶囨敞
-            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
-            mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
+            string mesordercode = HttpContext.Current.Request["mesordercode"].ToString();//宸ュ崟缂栧彿
+            string partcode = HttpContext.Current.Request["partcode"].ToString();//浜у搧缂栫爜
+            string stepseq = HttpContext.Current.Request["stepseq"].ToString();//宸ュ簭搴忓彿
+            string stepcode = HttpContext.Current.Request["stepcode"].ToString();//宸ュ簭缂栫爜
+            string eqpcode = HttpContext.Current.Request["eqpcode"].ToString();//璁惧缂栫爜
+            string inbarcode = HttpContext.Current.Request["inbarcode"].ToString(); //鍏ュ簱鏉＄爜
+            string reckway = HttpContext.Current.Request["reckway"].ToString(); //璁′欢鏂瑰紡(鐝粍:group銆佷釜浜�:person)
+            string usergroupcode = HttpContext.Current.Request["usergroupcode"].ToString();//鐝粍缂栫爜
+            string reportuser = HttpContext.Current.Request["reportuser"].ToString();//鎶ュ伐浜哄憳
+            string taskqty = HttpContext.Current.Request["taskqty"].ToString();//浠诲姟鏁伴噺
+            string startqty = HttpContext.Current.Request["startqty"].ToString();//寮�宸ユ暟閲�
+            string reportqty = HttpContext.Current.Request["reportqty"].ToString();//鎶ュ伐宸ユ暟閲�
+            string ngqty = HttpContext.Current.Request["ngqty"].ToString();//涓嶈壇鏁伴噺
+            string badcode = HttpContext.Current.Request["badcode"].ToString();//涓嶈壇鍘熷洜缂栫爜
+            string remarks = HttpContext.Current.Request["remarks"].ToString();//澶囨敞
+            string username = HttpContext.Current.Request["admin"].ToString();//鎿嶄綔浜哄憳
+            mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, inbarcode, reckway,usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
             return TJson.toJson(mes);
         }
         #endregion
@@ -187,17 +189,17 @@
         /// <returns></returns>
         [Route(template: "SavaMesOrderStepOut")]
         [HttpPost]
-        public HttpResponseMessage SavaMesOrderStepOut([FromBody] JObject obj)
+        public HttpResponseMessage SavaMesOrderStepOut()
         {
-            string mesordercode = obj["mesordercode"].ToString(); //宸ュ崟缂栧彿
-            string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
-            string stepseq = obj["stepseq"].ToString(); //宸ュ簭搴忓彿
-            string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
-            string wxcode = obj["wxcode"].ToString(); //澶栧崗渚涘簲鍟嗙紪鐮�
-            string outuser = obj["outuser"].ToString();  //鍙戞枡浜哄憳
-            string taskqty = obj["taskqty"].ToString(); //浠诲姟鏁伴噺
-            string fqty = obj["fqty"].ToString(); //鍙戞枡鏁伴噺
-            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+            string mesordercode = HttpContext.Current.Request["mesordercode"].ToString();//宸ュ崟缂栧彿
+            string partcode = HttpContext.Current.Request["partcode"].ToString();//浜у搧缂栫爜
+            string stepseq = HttpContext.Current.Request["stepseq"].ToString();//宸ュ簭搴忓彿
+            string stepcode = HttpContext.Current.Request["stepcode"].ToString();//宸ュ簭缂栫爜
+            string wxcode = HttpContext.Current.Request["wxcode"].ToString();//澶栧崗渚涘簲鍟嗙紪鐮�
+            string outuser = HttpContext.Current.Request["outuser"].ToString();//鍙戞枡浜哄憳
+            string taskqty = HttpContext.Current.Request["taskqty"].ToString();//浠诲姟鏁伴噺
+            string fqty = HttpContext.Current.Request["fqty"].ToString();//鍙戞枡鏁伴噺
+            string username = HttpContext.Current.Request["admin"].ToString();//鎿嶄綔浜哄憳
             mes = ProductionManagementBLL.SavaMesOrderStepOut(mesordercode, partcode, stepseq, stepcode, wxcode, outuser, taskqty, fqty, username);
             return TJson.toJson(mes);
         }
@@ -211,21 +213,55 @@
         /// <returns></returns>
         [Route(template: "SavaMesOrderStepIn")]
         [HttpPost]
-        public HttpResponseMessage SavaMesOrderStepIn([FromBody] JObject obj)
+        public HttpResponseMessage SavaMesOrderStepIn()
         {
-            string mesordercode = obj["mesordercode"].ToString(); //宸ュ崟缂栧彿
-            string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
-            string stepseq = obj["stepseq"].ToString(); //宸ュ簭搴忓彿
-            string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
-            string wxcode = obj["wxcode"].ToString(); //澶栧崗渚涘簲鍟嗙紪鐮�
-            string inuser = obj["inuser"].ToString();  //鏀舵枡浜哄憳
-            string taskqty = obj["taskqty"].ToString(); //浠诲姟鏁伴噺
-            string sqty = obj["sqty"].ToString(); //鏀舵枡鏁伴噺
-            string ngqty = obj["ngqty"].ToString(); //涓嶈壇鏁伴噺
-            string badcode = obj["badcode"].ToString(); //涓嶈壇鍘熷洜缂栫爜
-            string remarks = obj["remarks"].ToString(); //澶囨敞
-            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
-            mes = ProductionManagementBLL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inuser, taskqty, sqty, ngqty, badcode, remarks, username);
+            string mesordercode = HttpContext.Current.Request["mesordercode"].ToString();//宸ュ崟缂栧彿
+            string partcode = HttpContext.Current.Request["partcode"].ToString();//浜у搧缂栫爜
+            string stepseq = HttpContext.Current.Request["stepseq"].ToString();//宸ュ簭搴忓彿
+            string stepcode = HttpContext.Current.Request["stepcode"].ToString();//宸ュ簭缂栫爜
+            string wxcode = HttpContext.Current.Request["wxcode"].ToString();//澶栧崗渚涘簲鍟嗙紪鐮�
+            string inbarcode = HttpContext.Current.Request["inbarcode"].ToString(); //鍏ュ簱鏉＄爜
+            string inuser = HttpContext.Current.Request["inuser"].ToString();//鏀舵枡浜哄憳
+            string taskqty = HttpContext.Current.Request["taskqty"].ToString();//浠诲姟鏁伴噺
+            string sqty = HttpContext.Current.Request["sqty"].ToString();//鏀舵枡鏁伴噺
+            string ngqty = HttpContext.Current.Request["ngqty"].ToString();//涓嶈壇鏁伴噺
+            string badcode = HttpContext.Current.Request["badcode"].ToString();//涓嶈壇鍘熷洜缂栫爜
+            string remarks = HttpContext.Current.Request["remarks"].ToString();//澶囨敞
+            string username = HttpContext.Current.Request["admin"].ToString();//鎿嶄綔浜哄憳
+            mes = ProductionManagementBLL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inbarcode, inuser, taskqty, sqty, ngqty, badcode, remarks, username);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+
+
+        #region[鐢熶骇鍏ュ簱鎵弿鏉＄爜]
+        /// <summary>
+        /// 鐢熶骇鍏ュ簱鎵弿鏉＄爜
+        /// </summary>
+        /// <param name="labcode">鏉＄爜缂栧彿</param>
+        /// <returns></returns>
+        [Route(template: "MesAppProductInHouseOrderBarCodeSearch")]
+        [HttpGet]
+        public HttpResponseMessage MesAppProductInHouseOrderBarCodeSearch(string labcode)
+        {
+            mes = ProductionManagementBLL.MesAppProductInHouseOrderBarCodeSearch(labcode);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[鐢熶骇鍏ュ簱鎵弿鏉＄爜鎻愪氦]
+        /// <summary>
+        /// 鐢熶骇鍏ュ簱鎵弿鏉＄爜鎻愪氦
+        /// </summary>
+        /// <param name="username">鎿嶄綔浜哄憳</param>
+        /// <param name="obj">鎻愪氦鏁版嵁</param>
+        /// <returns></returns>
+        [Route(template: "MesAppProductInHouseOrderBarCodeSave")]
+        [HttpPost]
+        public HttpResponseMessage MesAppProductInHouseOrderBarCodeSave(string username, [FromBody] JObject obj)
+        {
+            mes = ProductionManagementBLL.ProductInHouseOrderSeave(username, obj);
             return TJson.toJson(mes);
         }
         #endregion

--
Gitblit v1.9.3