From 350aef928584da9bb91d2de8646ce42e1f5758c1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 08 七月 2022 15:36:16 +0800
Subject: [PATCH] 生产开报工接口提交

---
 VueWebApi/Controllers/ProductionManagementController.cs |  351 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 346 insertions(+), 5 deletions(-)

diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index 8b9f946..41cd39e 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -11,7 +11,7 @@
 
 namespace VueWebApi.Controllers
 {
-    [RoutePrefix(prefix: "api/BasicSetting")]
+    [RoutePrefix(prefix: "api/ProductionManagement")]
     [ControllerGroup("鐢熶骇绠＄悊", "鍦ㄧ嚎鎺ュ彛")]
     public class ProductionManagementController : ApiController
     {
@@ -40,7 +40,7 @@
         /// <returns></returns>
         [Route(template: "ErpOrderSearch")]
         [HttpGet]
-        public HttpResponseMessage ErpOrderSearch(string erporderstus = null, string erpordercode = null, string partcode = null, string partname = null, string partspec = null,string paydate=null,string creatuser=null,string createdate=null, int page = 0, int rows = 0, string prop = null, string order = null)
+        public HttpResponseMessage ErpOrderSearch(string erporderstus = null, string erpordercode = null, string partcode = null, string partname = null, string partspec = null, string paydate = null, string creatuser = null, string createdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
         {
             string paydatestartdate = "";  //浜や粯寮�濮嬫椂闂�
             string paydateenddate = "";    //浜や粯缁撴潫鏃堕棿
@@ -51,7 +51,7 @@
                 paydatestartdate = paydate.Split('~')[0].ToString();
                 paydateenddate = paydate.Split('~')[1].ToString();
             }
-            if (createdate != "" && createdate != null) 
+            if (createdate != "" && createdate != null)
             {
                 createstartdate = paydate.Split('~')[0].ToString();
                 createenddate = paydate.Split('~')[1].ToString();
@@ -73,7 +73,6 @@
         [HttpPost]
         public HttpResponseMessage MarkSaveErpOrder([FromBody] JObject obj)
         {
-            string erporderstus = obj["erporderstus"].ToString();    //璁㈠崟鐘舵�佺爜
             string erpordercode = obj["erpordercode"].ToString(); //璁㈠崟缂栧彿
             string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
             string wkshopcode = obj["wkshopcode"].ToString(); //杞﹂棿缂栫爜
@@ -83,7 +82,7 @@
             string ordernum = obj["ordernum"].ToString(); //涓嬪崟鍗曟暟
             string relse_qty = obj["relse_qty"].ToString(); //宸蹭笅鍗曟暟閲�
             var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
-            mes = ProductionManagementBLL.MarkSaveErpOrder(erporderstus, erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty,username);
+            mes = ProductionManagementBLL.MarkSaveErpOrder(erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, username);
             return TJson.toJson(mes);
         }
         #endregion
@@ -133,5 +132,347 @@
             return TJson.toJson(mes);
         }
         #endregion
+
+        #region[浜у搧缂栫爜鏌ユ壘宸ヨ壓璺嚎涓嬫媺鎺ュ彛]
+        /// <summary>
+        /// 浜у搧缂栫爜鏌ユ壘宸ヨ壓璺嚎涓嬫媺鎺ュ彛
+        /// </summary>
+        /// <param name="partcode">浜у搧缂栫爜</param>
+        /// <returns></returns>
+        [Route(template: "PartSelectRoute")]
+        [HttpGet]
+        public HttpResponseMessage PartSelectRoute(string partcode)
+        {
+            mes = ProductionManagementBLL.PartSelectRoute(partcode);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[浜у搧+宸ヨ壓璺嚎鏌ユ壘杞﹂棿涓嬫媺鎺ュ彛]
+        /// <summary>
+        /// 浜у搧+宸ヨ壓璺嚎鏌ユ壘杞﹂棿涓嬫媺鎺ュ彛
+        /// </summary>
+        /// <param name="partcode">浜у搧缂栫爜</param>
+        /// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
+        /// <returns></returns>
+        [Route(template: "RouteSelectWkshop")]
+        [HttpGet]
+        public HttpResponseMessage RouteSelectWkshop(string partcode, string routecode)
+        {
+            mes = ProductionManagementBLL.RouteSelectWkshop(partcode, routecode);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[鏍规嵁閫夋嫨宸ヨ壓璺嚎鏌ョ湅宸ュ簭鎺ュ彛]
+        /// <summary>
+        /// 鏍规嵁閫夋嫨宸ヨ壓璺嚎鏌ョ湅宸ュ簭鎺ュ彛
+        /// </summary>
+        /// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
+        /// <returns></returns>
+        [Route(template: "SelectRouteStep")]
+        [HttpGet]
+        public HttpResponseMessage SelectRouteStep(string routecode)
+        {
+            mes = ProductionManagementBLL.SelectRouteStep(routecode);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[MES宸ュ崟鏂板銆佺紪杈戞彁浜
+        /// <summary>
+        /// MES宸ュ崟鏂板銆佺紪杈戞彁浜�
+        /// </summary>
+        /// <param name="obj">鎻愪氦鏁版嵁</param>
+        /// <returns></returns>
+        [Route(template: "AddUpdateMesOrder")]
+        [HttpPost]
+        public HttpResponseMessage AddUpdateMesOrder([FromBody] JObject obj)
+        {
+            string mesorderstus = obj["mesorderstus"].ToString();    //宸ュ崟鐘舵�佺爜
+            string mesordercode = obj["mesordercode"].ToString(); //宸ュ崟缂栧彿
+            string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
+            string mesqty = obj["mesqty"].ToString(); //宸ュ崟鏁伴噺
+            string routecode = obj["routecode"].ToString(); //宸ヨ壓璺嚎缂栫爜
+            string wkshopcode = obj["wkshopcode"].ToString();//鐢熶骇杞﹂棿缂栫爜
+            string planstartdate = obj["planstartdate"].ToString(); //璁″垝寮�濮嬫椂闂�
+            string planenddate = obj["planenddate"].ToString();     //璁″垝瀹屾垚鏃堕棿
+            string orderlev = obj["orderlev"].ToString(); //宸ュ崟绛夌骇
+            string opertype = obj["OperType"].ToString();  //鎿嶄綔绫诲瀷
+            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+            mes = ProductionManagementBLL.AddUpdateMesOrder(mesorderstus, mesordercode, partcode, mesqty, routecode, wkshopcode, planstartdate, planenddate, orderlev, username, opertype);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[MES宸ュ崟鍒犻櫎]
+        /// <summary>
+        /// MES宸ュ崟鍒犻櫎
+        /// </summary>
+        /// <param name="wocode">宸ュ崟缂栧彿</param>
+        /// <param name="m_po">璁㈠崟缂栧彿</param>
+        /// <param name="orderqty">宸ュ崟鏁伴噺</param>
+        /// <returns></returns>
+        [Route(template: "DeleteMesOrder")]
+        [HttpPost]
+        public HttpResponseMessage DeleteMesOrder(string wocode, string m_po, string orderqty)
+        {
+            mes = ProductionManagementBLL.DeleteMesOrder(wocode, m_po, orderqty);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[MES宸ュ崟鍏抽棴]
+        /// <summary>
+        /// MES宸ュ崟鍏抽棴
+        /// </summary>
+        /// <param name="wocode">宸ュ崟缂栧彿</param>
+        /// <param name="m_po">璁㈠崟缂栧彿</param>
+        /// <returns></returns>
+        [Route(template: "ClosedMesOrder")]
+        [HttpPost]
+        public HttpResponseMessage ClosedMesOrder(string wocode, string m_po)
+        {
+            mes = ProductionManagementBLL.ClosedMesOrder(wocode, m_po);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[MES宸ュ崟鏌ョ湅宸ュ簭浠诲姟]
+        /// <summary>
+        /// MES宸ュ崟鏌ョ湅宸ュ簭浠诲姟
+        /// </summary>
+        /// <param name="wo_code">宸ュ崟缂栧彿</param>
+        /// <returns></returns>
+        [Route(template: "SearchWorkStep")]
+        [HttpGet]
+        public HttpResponseMessage SearchWorkStep(string wo_code)
+        {
+            mes = ProductionManagementBLL.SearchWorkStep(wo_code);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+
+
+        #region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(鑷埗)]
+        /// <summary>
+        /// 鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(鑷埗)
+        /// </summary>
+        /// <param name="orderstepqrcode">鎵弿鐨勪簩缁寸爜淇℃伅</param>
+        /// <param name="page">椤电爜</param>
+        /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+        /// <param name="prop">鎺掑簭瀛楁</param>
+        /// <param name="order">鎺掑簭瑙勫垯(榛樿鎸夌収璁″垝寮�宸ユ椂闂存搴�)</param>
+        /// <returns></returns>
+        [Route(template: "MesOrderStepSearch")]
+        [HttpGet]
+        public HttpResponseMessage MesOrderStepSearch(string orderstepqrcode = null, int page = 0, int rows = 0, string prop = null, string order = null)
+        {
+            int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
+            int endNum = rows * page;   //缁撴潫璁板綍 rowNum
+            mes = ProductionManagementBLL.MesOrderStepSearch(orderstepqrcode, startNum, endNum, prop, order);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(澶栧崗)]
+        /// <summary>
+        /// 鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(澶栧崗)
+        /// </summary>
+        /// <param name="orderstepqrcode">鎵弿鐨勪簩缁寸爜淇℃伅</param>
+        /// <param name="page">椤电爜</param>
+        /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+        /// <param name="prop">鎺掑簭瀛楁</param>
+        /// <param name="order">鎺掑簭瑙勫垯(榛樿鎸夌収璁″垝寮�宸ユ椂闂存搴�)</param>
+        /// <returns></returns>
+        [Route(template: "MesOrderWxStepSearch")]
+        [HttpGet]
+        public HttpResponseMessage MesOrderWxStepSearch(string orderstepqrcode = null, int page = 0, int rows = 0, string prop = null, string order = null)
+        {
+            int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
+            int endNum = rows * page;   //缁撴潫璁板綍 rowNum
+            mes = ProductionManagementBLL.MesOrderWxStepSearch(orderstepqrcode, startNum, endNum, prop, order);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region [鐢熶骇寮�鎶ュ伐锛氬紑宸�(寮�濮�/鎶ュ伐)/澶栧崗(鍙戞枡/鏀舵枡)鏃舵潯浠跺垽鏂強鏁版嵁杩斿洖鎺ュ彛]
+        /// <summary>
+        /// 鐢熶骇寮�鎶ュ伐锛氬紑宸�(寮�濮�/鎶ュ伐)/澶栧崗(鍙戞枡/鏀舵枡)鏃舵潯浠跺垽鏂強鏁版嵁杩斿洖鎺ュ彛
+        /// </summary>
+        /// <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 SelectType, string orderstepqrcode)
+        {
+            mes = ProductionManagementBLL.MesOrderStepStart(OperType, SelectType, orderstepqrcode);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[鐢熶骇寮�鎶ュ伐锛氬紑宸ユ椂鑾峰彇璁惧涓嬫媺鍒楄〃]
+        /// <summary>
+        /// 鐢熶骇寮�鎶ュ伐锛氬紑宸ユ椂鑾峰彇璁惧涓嬫媺鍒楄〃
+        /// </summary>
+        /// <param name="orderstepqrcode">鎵弿浜岀淮鐮佷俊鎭�</param>
+        /// <returns></returns>
+        [Route(template: "MesOrderStepStartSelectEqp")]
+        [HttpGet]
+        public HttpResponseMessage MesOrderStepStartSelectEqp(string orderstepqrcode)
+        {
+            mes = ProductionManagementBLL.MesOrderStepStartSelectEqp(orderstepqrcode);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[鐢熶骇寮�鎶ュ伐锛氭姤宸ユ椂鑾峰彇鐢熶骇鐝粍涓嬫媺妗哴
+        /// <summary>
+        /// 鐢熶骇寮�鎶ュ伐锛氭姤宸ユ椂鑾峰彇鐢熶骇鐝粍涓嬫媺妗�
+        /// </summary>
+        /// <returns></returns>
+        [Route(template: "MesOrderStepReportSelectUserGroup")]
+        [HttpGet]
+        public HttpResponseMessage MesOrderStepReportSelectUserGroup()
+        {
+            mes = ProductionManagementBLL.MesOrderStepReportSelectUserGroup();
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[鐢熶骇寮�鎶ュ伐锛氭牴鎹敓浜х彮缁勬煡鎵句汉鍛樺垪琛╙
+        /// <summary>
+        /// 鐢熶骇寮�鎶ュ伐锛氬紑宸ユ椂鑾峰彇璁惧涓嬫媺鍒楄〃
+        /// </summary>
+        /// <param name="usergroupcode">鐝粍缂栫爜</param>
+        /// <returns></returns>
+        [Route(template: "MesOrderGroupSelectUser")]
+        [HttpGet]
+        public HttpResponseMessage MesOrderGroupSelectUser(string usergroupcode)
+        {
+            mes = ProductionManagementBLL.MesOrderGroupSelectUser(usergroupcode);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[鐢熶骇鎶ュ伐锛氭姤宸�/澶栧崗鏀舵枡 鑾峰彇涓嶈壇鍘熷洜涓嬫媺鍒楄〃]
+        /// <summary>
+        /// 鐢熶骇鎶ュ伐锛氭姤宸�/澶栧崗鏀舵枡 鑾峰彇涓嶈壇鍘熷洜涓嬫媺鍒楄〃
+        /// </summary>
+        /// <param name="orderstepqrcode">鎵弿浜岀淮鐮佷俊鎭�</param>
+        /// <returns></returns>
+        [Route(template: "MesOrderStepSelectCause")]
+        [HttpGet]
+        public HttpResponseMessage MesOrderStepSelectCause(string orderstepqrcode)
+        {
+            mes = ProductionManagementBLL.MesOrderStepSelectCause(orderstepqrcode);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[鐢熶骇寮�鎶ュ伐,寮�宸ユ彁浜
+        /// <summary>
+        /// 鐢熶骇寮�鎶ュ伐,寮�宸ユ彁浜�
+        /// </summary>
+        /// <param name="obj">寮�宸ユ彁浜ゆ暟鎹�</param>
+        /// <returns></returns>
+        [Route(template: "SavaMesOrderStepStart")]
+        [HttpPost]
+        public HttpResponseMessage SavaMesOrderStepStart([FromBody] JObject obj)
+        {
+            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(); //寮�宸ヤ汉鍛�
+            mes = ProductionManagementBLL.SavaMesOrderStepStart(mesordercode, partcode, stepseq, stepcode, eqpcode, taskqty, startqty, username);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[鐢熶骇寮�鎶ュ伐,鎶ュ伐鎻愪氦]
+        /// <summary>
+        /// 鐢熶骇寮�鎶ュ伐,鎶ュ伐鎻愪氦
+        /// </summary>
+        /// <param name="obj">鎶ュ伐鎻愪氦鏁版嵁</param>
+        /// <returns></returns>
+        [Route(template: "SavaMesOrderStepReport")]
+        [HttpPost]
+        public HttpResponseMessage SavaMesOrderStepReport([FromBody] JObject obj)
+        {
+            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(); //涓嶈壇鍘熷洜缂栫爜
+            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+            mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, username);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[鐢熶骇寮�鎶ュ伐,鍙戞枡鎻愪氦]
+        /// <summary>
+        /// 鐢熶骇寮�鎶ュ伐,鍙戞枡鎻愪氦
+        /// </summary>
+        /// <param name="obj">鍙戞枡鎻愪氦鏁版嵁</param>
+        /// <returns></returns>
+        [Route(template: "SavaMesOrderStepOut")]
+        [HttpPost]
+        public HttpResponseMessage SavaMesOrderStepOut([FromBody] JObject obj)
+        {
+            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(); //鎿嶄綔浜哄憳
+            mes = ProductionManagementBLL.SavaMesOrderStepOut(mesordercode, partcode, stepseq, stepcode, wxcode, outuser, taskqty, fqty, username);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[鐢熶骇寮�鎶ュ伐,鏀舵枡鎻愪氦]
+        /// <summary>
+        /// 鐢熶骇寮�鎶ュ伐,鏀舵枡鎻愪氦
+        /// </summary>
+        /// <param name="obj">鏀舵枡鎻愪氦鏁版嵁</param>
+        /// <returns></returns>
+        [Route(template: "SavaMesOrderStepIn")]
+        [HttpPost]
+        public HttpResponseMessage SavaMesOrderStepIn([FromBody] JObject obj)
+        {
+            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(); //涓嶈壇鍘熷洜缂栫爜
+            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+            mes = ProductionManagementBLL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inuser, taskqty, sqty, ngqty, badcode, username);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
     }
 }

--
Gitblit v1.9.3