From 01c5f10d8e452f78b1a970cf878ea61316eda0da Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 29 三月 2023 10:57:14 +0800
Subject: [PATCH] 订单下达生成工单语句修改、生产工单手工创建生成单据号接口

---
 VueWebApi/Controllers/ProductionManagementController.cs |   77 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 76 insertions(+), 1 deletions(-)

diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index 69ccf3c..17b04f9 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -17,7 +17,7 @@
 {
     [RoutePrefix(prefix: "api/ProductionManagement")]
     [ControllerGroup("鐢熶骇绠$悊", "鍦ㄧ嚎鎺ュ彛")]
-    //[ChannelActionFilter]
+    [ChannelActionFilter]
     public class ProductionManagementController : ApiController
     {
         //瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -142,6 +142,33 @@
         }
         #endregion
 
+        #region[MES鎶ュ簾琛ュ崟宸ュ崟鏌ヨ]
+        /// <summary>
+        /// MES鎶ュ簾琛ュ崟宸ュ崟鏌ヨ
+        /// </summary>
+        /// <param name="mesordercode">宸ュ崟缂栧彿</param>
+        /// <param name="sourceorder">婧愬崟鍗曞彿</param>
+        /// <param name="partcode">浜у搧缂栫爜</param>
+        /// <param name="partname">浜у搧鍚嶇О</param>
+        /// <param name="partspec">浜у搧瑙勬牸</param>
+        /// <param name="creatuser">鍒涘缓浜哄憳</param>
+        /// <param name="createdate">鍒涘缓鏃堕棿</param>
+        /// <param name="page">椤电爜</param>
+        /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+        /// <param name="prop">鎺掑簭瀛楁</param>
+        /// <param name="order">鎺掑簭瑙勫垯</param>
+        /// <returns></returns>
+        [Route(template: "MesBadOrderSearch")]
+        [HttpGet]
+        public HttpResponseMessage MesBadOrderSearch(int page, int rows, string prop, string order, string mesordercode = null, string sourceorder = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)
+        {
+            int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
+            int endNum = rows * page;   //缁撴潫璁板綍 rowNum
+            mes = ProductionManagementBLL.MesBadOrderSearch(mesordercode, sourceorder, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
         #region[浜у搧缂栫爜鏌ユ壘宸ヨ壓璺嚎涓嬫媺鎺ュ彛]
         /// <summary>
         /// 浜у搧缂栫爜鏌ユ壘宸ヨ壓璺嚎涓嬫媺鎺ュ彛
@@ -184,6 +211,37 @@
         public HttpResponseMessage SelectRouteStep(string routecode)
         {
             mes = ProductionManagementBLL.SelectRouteStep(routecode);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[宸ュ崟娲惧彂閫夋嫨宸ヨ壓璺嚎鎴栭�夋嫨鐢熶骇杞﹂棿鏃跺垽鏂粦瀹氭潯浠禲
+        /// <summary>
+        /// 宸ュ崟娲惧彂閫夋嫨宸ヨ壓璺嚎鎴栭�夋嫨鐢熶骇杞﹂棿鏃跺垽鏂粦瀹氭潯浠�
+        /// </summary>
+        /// <param name="partcode">浜у搧缂栫爜</param>
+        /// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
+        /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+        /// <returns></returns>
+        [Route(template: "SelectRouteOrWkshop")]
+        [HttpGet]
+        public HttpResponseMessage SelectRouteOrWkshop(string partcode, string routecode, string wkshopcode)
+        {
+            mes = ProductionManagementBLL.SelectRouteOrWkshop(partcode, routecode, wkshopcode);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[MES宸ュ崟鏂板銆佽幏鍙栧伐鍗曞彿]
+        /// <summary>
+        /// MES宸ュ崟鏂板銆佽幏鍙栧伐鍗曞彿
+        /// </summary>
+        /// <returns></returns>
+        [Route(template: "AddMesOrderCodeSearch")]
+        [HttpPost]
+        public HttpResponseMessage AddMesOrderCodeSearch()
+        {
+            mes = ProductionManagementBLL.AddMesOrderCodeSearch();
             return TJson.toJson(mes);
         }
         #endregion
@@ -266,6 +324,23 @@
         }
         #endregion
 
+        #region[MES宸ュ崟宸ュ簭浠诲姟鏌ョ湅SOP,鑾峰彇SOP鏂囦欢涓嬫媺鍒楄〃]
+        /// <summary>
+        /// MES宸ュ崟宸ュ簭浠诲姟鏌ョ湅SOP,鑾峰彇SOP鏂囦欢涓嬫媺鍒楄〃
+        /// </summary>
+        /// <param name="partcode">浜у搧缂栫爜</param>
+        /// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
+        /// <param name="stepcode">宸ュ簭缂栫爜</param>
+        /// <returns></returns>
+        [Route(template: "SearchWorkStepSopList")]
+        [HttpGet]
+        public HttpResponseMessage SearchWorkStepSopList(string partcode,string routecode,string stepcode)
+        {
+            mes = ProductionManagementBLL.SearchWorkStepSopList(partcode, routecode, stepcode);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
 
 
         #region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(鑷埗)]

--
Gitblit v1.9.3