From 54cf93766639d96ed2bdd101440d2ce9f2538e7e Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 12 九月 2023 18:54:44 +0800
Subject: [PATCH] 正清和质量看板接口功能 修改存货查询功能

---
 VueWebApi/Controllers/ProductionManagementController.cs |  116 +++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 75 insertions(+), 41 deletions(-)

diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index a0b93e5..5dbf07b 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
     {
         //瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -32,6 +32,7 @@
         /// </summary>
         /// <param name="erporderstus">璁㈠崟鐘舵�佺爜</param>
         /// <param name="erpordercode">璁㈠崟缂栧彿</param>
+        /// <param name="saleordercode">閿�鍞崟鍙�</param>
         /// <param name="partcode">浜у搧缂栫爜</param>
         /// <param name="partname">浜у搧鍚嶇О</param>
         /// <param name="partspec">浜у搧瑙勬牸</param>
@@ -45,8 +46,10 @@
         /// <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 paystartdate = null, string payenddate = null, string creatuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
+        public HttpResponseMessage ErpOrderSearch(string erporderstus = null, string erpordercode = null,string saleordercode=null, string partcode = null, string partname = null, string partspec = null, string paystartdate = null, string payenddate = null, string creatuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
         {
+            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
             string paydatestartdate = "";  //棰勮寮�宸ュ紑濮嬫椂闂�
             string paydateenddate = "";    //棰勮寮�宸ョ粨鏉熸椂闂�
             string paydatestartdate1 = "";  //棰勮瀹屽伐寮�濮嬫椂闂�
@@ -63,7 +66,7 @@
             }
             int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
             int endNum = rows * page;   //缁撴潫璁板綍 rowNum
-            mes = ProductionManagementBLL.ErpOrderSearch(erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
+            mes = ProductionManagementBLL.ErpOrderSearch(stu_torgcode, stu_torgtypecode,erporderstus, erpordercode, saleordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
             return TJson.toJson(mes);
         }
         #endregion
@@ -80,6 +83,7 @@
         {
             string erporderid = obj["erporderid"].ToString(); //璁㈠崟id
             string erpordercode = obj["erpordercode"].ToString(); //璁㈠崟缂栧彿
+            string saleordercode = obj["saleordercode"].ToString(); //閿�鍞鍗曞彿
             string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
             string wkshopcode = obj["wkshopcode"].ToString(); //杞﹂棿缂栫爜
             string warehousecode = obj["warehousecode"].ToString(); //浠撳簱缂栫爜
@@ -89,7 +93,7 @@
             string relse_qty = obj["relse_qty"].ToString(); //宸蹭笅鍗曟暟閲�
             string saleOrderDeliveryDate = obj["saleOrderDeliveryDate"].ToString(); //浜や粯鏃堕棿
             var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
-            mes = ProductionManagementBLL.MarkSaveErpOrder(erporderid, erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, username);
+            mes = ProductionManagementBLL.MarkSaveErpOrder(erporderid, erpordercode, saleordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, username);
             return TJson.toJson(mes);
         }
         #endregion
@@ -105,9 +109,25 @@
         [HttpPost]
         public HttpResponseMessage ClosedErpOrder(string erporderid, string erpordercode)
         {
-            //var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
-            var username = "Admin";
+            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
             mes = ProductionManagementBLL.ClosedErpOrder(erporderid, erpordercode, username);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[ERP璁㈠崟鍒犻櫎]
+        /// <summary>
+        /// ERP璁㈠崟鍒犻櫎
+        /// </summary>
+        /// <param name="erporderid">璁㈠崟id</param>
+        /// <param name="erpordercode">璁㈠崟鍙�</param>
+        /// <returns></returns>
+        [Route(template: "DeleteErpOrder")]
+        [HttpPost]
+        public HttpResponseMessage DeleteErpOrder(string erporderid, string erpordercode)
+        {
+            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+            mes = ProductionManagementBLL.DeleteErpOrder(erporderid, erpordercode, username);
             return TJson.toJson(mes);
         }
         #endregion
@@ -121,6 +141,7 @@
         /// <param name="mesorderstus">宸ュ崟鐘舵�佺爜</param>
         /// <param name="mesordercode">宸ュ崟缂栧彿</param>
         /// <param name="sourceorder">婧愬崟鍗曞彿</param>
+        /// <param name="saleordercode">閿�鍞崟鍙�</param>
         /// <param name="ordertype">鍗曟嵁绫诲瀷</param>
         /// <param name="partcode">浜у搧缂栫爜</param>
         /// <param name="partname">浜у搧鍚嶇О</param>
@@ -134,11 +155,13 @@
         /// <returns></returns>
         [Route(template: "MesOrderSearch")]
         [HttpGet]
-        public HttpResponseMessage MesOrderSearch(int page, int rows, string prop, string order, string mesorderstus = null, string mesordercode = null, string sourceorder = null, string ordertype = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)
+        public HttpResponseMessage MesOrderSearch(int page, int rows, string prop, string order, string mesorderstus = null, string mesordercode = null, string sourceorder = null,string saleordercode=null, string ordertype = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)
         {
+            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
             int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
             int endNum = rows * page;   //缁撴潫璁板綍 rowNum
-            mes = ProductionManagementBLL.MesOrderSearch(mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+            mes = ProductionManagementBLL.MesOrderSearch(stu_torgcode, stu_torgtypecode,mesorderstus, mesordercode, sourceorder, saleordercode, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
             return TJson.toJson(mes);
         }
         #endregion
@@ -149,6 +172,7 @@
         /// </summary>
         /// <param name="mesordercode">宸ュ崟缂栧彿</param>
         /// <param name="sourceorder">婧愬崟鍗曞彿</param>
+        /// <param name="saleordercode">閿�鍞崟鍙�</param>
         /// <param name="partcode">浜у搧缂栫爜</param>
         /// <param name="partname">浜у搧鍚嶇О</param>
         /// <param name="partspec">浜у搧瑙勬牸</param>
@@ -161,11 +185,11 @@
         /// <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)
+        public HttpResponseMessage MesBadOrderSearch(int page, int rows, string prop, string order, string mesordercode = null, string sourceorder = null,string saleordercode=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);
+            mes = ProductionManagementBLL.MesBadOrderSearch(mesordercode, sourceorder, saleordercode, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
             return TJson.toJson(mes);
         }
         #endregion
@@ -175,12 +199,13 @@
         /// 浜у搧缂栫爜鏌ユ壘宸ヨ壓璺嚎涓嬫媺鎺ュ彛
         /// </summary>
         /// <param name="partcode">浜у搧缂栫爜</param>
+        /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
         /// <returns></returns>
         [Route(template: "PartSelectRoute")]
         [HttpGet]
-        public HttpResponseMessage PartSelectRoute(string partcode)
+        public HttpResponseMessage PartSelectRoute(string partcode,string wkshopcode)
         {
-            mes = ProductionManagementBLL.PartSelectRoute(partcode);
+            mes = ProductionManagementBLL.PartSelectRoute(partcode, wkshopcode);
             return TJson.toJson(mes);
         }
         #endregion
@@ -190,13 +215,14 @@
         /// 浜у搧+宸ヨ壓璺嚎鏌ユ壘杞﹂棿涓嬫媺鎺ュ彛
         /// </summary>
         /// <param name="partcode">浜у搧缂栫爜</param>
-        /// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
         /// <returns></returns>
         [Route(template: "RouteSelectWkshop")]
         [HttpGet]
-        public HttpResponseMessage RouteSelectWkshop(string partcode, string routecode)
+        public HttpResponseMessage RouteSelectWkshop(string partcode)
         {
-            mes = ProductionManagementBLL.RouteSelectWkshop(partcode, routecode);
+            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+            mes = ProductionManagementBLL.RouteSelectWkshop(stu_torgcode, stu_torgtypecode,partcode);
             return TJson.toJson(mes);
         }
         #endregion
@@ -387,9 +413,11 @@
         [HttpGet]
         public HttpResponseMessage MesOrderStepSearch(string orderstepqrcode = null, int page = 0, int rows = 0, string prop = null, string order = null)
         {
+            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
             int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
             int endNum = rows * page;   //缁撴潫璁板綍 rowNum
-            mes = ProductionManagementBLL.MesOrderStepSearch(orderstepqrcode, startNum, endNum, prop, order);
+            mes = ProductionManagementBLL.MesOrderStepSearch(stu_torgcode, stu_torgtypecode,orderstepqrcode, startNum, endNum, prop, order);
             return TJson.toJson(mes);
         }
         #endregion
@@ -408,9 +436,11 @@
         [HttpGet]
         public HttpResponseMessage MesOrderWxStepSearch(string orderstepqrcode = null, int page = 0, int rows = 0, string prop = null, string order = null)
         {
+            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
             int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
             int endNum = rows * page;   //缁撴潫璁板綍 rowNum
-            mes = ProductionManagementBLL.MesOrderWxStepSearch(orderstepqrcode, startNum, endNum, prop, order);
+            mes = ProductionManagementBLL.MesOrderWxStepSearch(stu_torgcode, stu_torgtypecode,orderstepqrcode, startNum, endNum, prop, order);
             return TJson.toJson(mes);
         }
         #endregion
@@ -429,9 +459,11 @@
         [HttpGet]
         public HttpResponseMessage MesOrderNgStepSearch(string orderstepqrcode = null, int page = 0, int rows = 0, string prop = null, string order = null)
         {
+            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
             int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
             int endNum = rows * page;   //缁撴潫璁板綍 rowNum
-            mes = ProductionManagementBLL.MesOrderNgStepSearch(orderstepqrcode, startNum, endNum, prop, order);
+            mes = ProductionManagementBLL.MesOrderNgStepSearch(stu_torgcode, stu_torgtypecode,orderstepqrcode, startNum, endNum, prop, order);
             return TJson.toJson(mes);
         }
         #endregion
@@ -456,14 +488,15 @@
         /// 鐢熶骇寮�鎶ュ伐锛氬紑宸�(寮�濮�/鎶ュ伐)/澶栧崗(鍙戞枡/鏀舵枡)鏃舵潯浠跺垽鏂強鏁版嵁杩斿洖鎺ュ彛
         /// </summary>
         /// <param name="OperType">鎿嶄綔绫诲瀷锛氳嚜鍒�(ZZ)/澶栧崗(WX)</param>
-        /// <param name="SelectType">鎿嶄綔绫诲瀷锛氬鍗忓彂鏂欐爣璇�(OUT)/澶栧崗鏀舵枡鏍囪瘑(IN)</param>
+        /// <param name="SelectType">鎿嶄綔绫诲瀷锛氳嚜鍒�(璁惧缂栫爜)/澶栧崗(鍙戞枡鏍囪瘑(OUT)/鏀舵枡鏍囪瘑(IN))</param>
         /// <param name="orderstepqrcode">鎵弿浜岀淮鐮佷俊鎭�</param>
+        /// <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
         /// <returns></returns>
         [Route(template: "MesOrderStepStart")]
         [HttpGet]
-        public HttpResponseMessage MesOrderStepStart(string OperType, string orderstepqrcode, string SelectType = null)
+        public HttpResponseMessage MesOrderStepStart(string OperType,string stu_torgcode, string orderstepqrcode, string SelectType = null)
         {
-            mes = ProductionManagementBLL.MesOrderStepStart(OperType, SelectType, orderstepqrcode);
+            mes = ProductionManagementBLL.MesOrderStepStart(OperType, stu_torgcode, SelectType, orderstepqrcode);
             return TJson.toJson(mes);
         }
         #endregion
@@ -487,12 +520,15 @@
         /// <summary>
         /// 鐢熶骇寮�鎶ュ伐锛氭姤宸ユ椂鑾峰彇鐢熶骇鐝粍涓嬫媺妗�
         /// </summary>
+        /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
         /// <returns></returns>
         [Route(template: "MesOrderStepReportSelectUserGroup")]
         [HttpGet]
-        public HttpResponseMessage MesOrderStepReportSelectUserGroup()
+        public HttpResponseMessage MesOrderStepReportSelectUserGroup(string wkshopcode)
         {
-            mes = ProductionManagementBLL.MesOrderStepReportSelectUserGroup();
+            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+            mes = ProductionManagementBLL.MesOrderStepReportSelectUserGroup(stu_torgcode, stu_torgtypecode,wkshopcode);
             return TJson.toJson(mes);
         }
         #endregion
@@ -507,7 +543,8 @@
         [HttpGet]
         public HttpResponseMessage MesOrderGroupSelectUser(string usergroupcode)
         {
-            mes = ProductionManagementBLL.MesOrderGroupSelectUser(usergroupcode);
+            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+            mes = ProductionManagementBLL.MesOrderGroupSelectUser(stu_torgcode,usergroupcode);
             return TJson.toJson(mes);
         }
         #endregion
@@ -602,11 +639,11 @@
             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 defectlist= obj["defectlist"].ToString();//涓嶈壇姹囨��
             string remarks = obj["remarks"].ToString(); //澶囨敞
             var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
-            mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, inbarcode, reckway, usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
+            List<ReportDefectList> defectobjs = JsonConvert.DeserializeObject<List<ReportDefectList>>(defectlist);
+            mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, inbarcode, reckway, usergroupcode, reportuser, taskqty, startqty, reportqty, defectobjs, remarks, username);
             return TJson.toJson(mes);
         }
         #endregion
@@ -654,11 +691,11 @@
             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 defectlist = obj["defectlist"].ToString();//涓嶈壇姹囨��
             string remarks = obj["remarks"].ToString(); //澶囨敞
             var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
-            mes = ProductionManagementBLL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inbarcode, inuser, taskqty, sqty, ngqty, badcode, remarks, username);
+            List<ReportDefectList> defectobjs = JsonConvert.DeserializeObject<List<ReportDefectList>>(defectlist);
+            mes = ProductionManagementBLL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inbarcode, inuser, taskqty, sqty, defectobjs, remarks, username);
             return TJson.toJson(mes);
         }
         #endregion
@@ -684,14 +721,15 @@
         /// <summary>
         /// 宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭�
         /// </summary>
+        /// <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
         /// <param name="orderstepqrcode">鎵弿宸ュ簭浜岀淮鐮佷俊鎭�</param>
         /// <param name="checktype">妫�楠屾柟寮廎irstCheck锛堥妫�锛� PatroCheck(宸℃)  EndCheck(瀹屽伐妫�)</param>
         /// <returns></returns>
         [Route(template: "MesOrderStepCheckSearch")]
         [HttpGet]
-        public HttpResponseMessage MesOrderStepCheckSearch(string orderstepqrcode, string checktype)
+        public HttpResponseMessage MesOrderStepCheckSearch(string stu_torgcode, string orderstepqrcode, string checktype)
         {
-            mes = ProductionManagementBLL.MesOrderStepCheckSearch(orderstepqrcode, checktype);
+            mes = ProductionManagementBLL.MesOrderStepCheckSearch(stu_torgcode,orderstepqrcode, checktype);
             return TJson.toJson(mes);
         }
         #endregion
@@ -720,6 +758,7 @@
         [HttpPost]
         public HttpResponseMessage SaveMesOrderStepCheckItem([FromBody] JObject obj)
         {
+            string stu_torgcode = obj["stu_torgcode"].ToString(); //鎵�灞炵粍缁囩紪鍙�
             string wocode = obj["wocode"].ToString(); //宸ュ崟缂栧彿
             string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
             string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
@@ -733,7 +772,7 @@
             string ngqty = obj["ngqty"].ToString();//涓嶅悎鏍兼暟閲�
             string checkitemcont = obj["checkitemcont"].ToString(); //妫�楠岄」鐩暟鎹�
             var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
-            mes = ProductionManagementBLL.SaveMesOrderStepCheckItem(wocode, partcode, stepcode, checkstandcode, check_type, sampmethod, qualitystatus, labqty, sampleqty, goodqty, ngqty, checkitemcont, username);
+            mes = ProductionManagementBLL.SaveMesOrderStepCheckItem(stu_torgcode,wocode, partcode, stepcode, checkstandcode, check_type, sampmethod, qualitystatus, labqty, sampleqty, goodqty, ngqty, checkitemcont, username);
             return TJson.toJson(mes);
         }
         #endregion
@@ -761,9 +800,11 @@
         [HttpGet]
         public HttpResponseMessage MesOrderBitchClosedSearch(string mesorderstus = null, string mesordercode = null, string sourceorder = null, string ordertype = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
         {
+            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
             int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
             int endNum = rows * page;   //缁撴潫璁板綍 rowNum
-            mes = ProductionManagementBLL.MesOrderBitchClosedSearch(mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+            mes = ProductionManagementBLL.MesOrderBitchClosedSearch(stu_torgcode, stu_torgtypecode,mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
             return TJson.toJson(mes);
         }
         #endregion
@@ -1146,13 +1187,6 @@
         /// <summary>
         /// 鐢熶骇鍏ュ簱鎻愪氦
         /// </summary>
-        /// <param name="wkshp_code">杞﹂棿缂栫爜</param>
-        /// <param name="erporder_code">璁㈠崟缂栧彿</param>
-        /// <param name="wo_code">宸ュ崟缂栧彿</param>
-        /// <param name="saleorder_code">閿�鍞鍗曞彿</param>
-        /// <param name="orderdate">鍗曟嵁鏃ユ湡</param>
-        /// <param name="ordercode">鍗曟嵁缂栫爜</param>
-        /// <param name="storehousecode">浠撳簱缂栫爜</param>
         /// <param name="obj">鏄庣粏鏁版嵁</param>
         /// <returns></returns>
         [Route(template: "ProductInHouseOrderSeave")]

--
Gitblit v1.9.3