From 61eedf1c07cc2c338e84f48712f210b35e716cfb Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 31 七月 2023 11:18:48 +0800
Subject: [PATCH] ERP单据同步增加车间过滤

---
 VueWebApi/Controllers/AppProductionManagementController.cs |   52 +++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/VueWebApi/Controllers/AppProductionManagementController.cs b/VueWebApi/Controllers/AppProductionManagementController.cs
index 618c9f7..1246def 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
     {
         //瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -25,15 +25,16 @@
         /// <summary>
         /// 鐢熶骇寮�鎶ュ伐锛氬紑宸�(寮�濮�/鎶ュ伐)/澶栧崗(鍙戞枡/鏀舵枡)鏃舵潯浠跺垽鏂強鏁版嵁杩斿洖鎺ュ彛
         /// </summary>
+        /// <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
         /// <param name="OperType">鎿嶄綔绫诲瀷锛氳嚜鍒�(ZZ)/澶栧崗(WX)</param>
         /// <param name="SelectType">鎿嶄綔绫诲瀷锛氬鍗忓彂鏂欐爣璇�(OUT)/澶栧崗鏀舵枡鏍囪瘑(IN)</param>
         /// <param name="orderstepqrcode">鎵弿浜岀淮鐮佷俊鎭�</param>
         /// <returns></returns>
         [Route(template: "MesOrderStepStart")]
         [HttpGet]
-        public HttpResponseMessage MesOrderStepStart(string OperType, string orderstepqrcode, string SelectType = null)
+        public HttpResponseMessage MesOrderStepStart(string stu_torgcode, string OperType, string orderstepqrcode, string SelectType = null)
         {
-            mes = ProductionManagementBLL.MesOrderStepStart(OperType, SelectType, orderstepqrcode);
+            mes = ProductionManagementBLL.MesOrderStepStart(OperType, stu_torgcode, SelectType, orderstepqrcode);
             return TJson.toJson(mes);
         }
         #endregion
@@ -57,12 +58,15 @@
         /// <summary>
         /// 鐢熶骇寮�鎶ュ伐锛氭姤宸ユ椂鑾峰彇鐢熶骇鐝粍涓嬫媺妗�
         /// </summary>
+        /// <param name="stu_torgcode">缁勭粐缂栫爜</param>
+        /// <param name="stu_torgtypecode">缁勭粐绫诲瀷</param>
+        /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
         /// <returns></returns>
         [Route(template: "MesOrderStepReportSelectUserGroup")]
         [HttpGet]
-        public HttpResponseMessage MesOrderStepReportSelectUserGroup()
+        public HttpResponseMessage MesOrderStepReportSelectUserGroup(string stu_torgcode,string stu_torgtypecode, string wkshopcode)
         {
-            mes = ProductionManagementBLL.MesOrderStepReportSelectUserGroup();
+            mes = ProductionManagementBLL.MesOrderStepReportSelectUserGroup(stu_torgcode, stu_torgtypecode,wkshopcode);
             return TJson.toJson(mes);
         }
         #endregion
@@ -71,13 +75,14 @@
         /// <summary>
         /// 鐢熶骇寮�鎶ュ伐锛氭牴鎹敓浜х彮缁勬煡鎵句汉鍛樺垪琛�
         /// </summary>
+        /// <param name="stu_torgcode">缁勭粐缂栫爜</param>
         /// <param name="usergroupcode">鐝粍缂栫爜</param>
         /// <returns></returns>
         [Route(template: "MesOrderGroupSelectUser")]
         [HttpGet]
-        public HttpResponseMessage MesOrderGroupSelectUser(string usergroupcode)
+        public HttpResponseMessage MesOrderGroupSelectUser(string stu_torgcode, string usergroupcode)
         {
-            mes = ProductionManagementBLL.MesOrderGroupSelectUser(usergroupcode);
+            mes = ProductionManagementBLL.MesOrderGroupSelectUser(stu_torgcode,usergroupcode);
             return TJson.toJson(mes);
         }
         #endregion
@@ -232,5 +237,38 @@
             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
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3