From 6e1231595e0e72b0fa421711d34bc77d3b406a4b Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 21 四月 2023 10:14:37 +0800
Subject: [PATCH] 高级排程过工单信息测试接口(实现不了) 采购到货单接口开发

---
 VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache |    2 
 VueWebApi/obj/Release/VueWebApi.pdb                            |    0 
 VueWebApi/Controllers/PurchaseOrderController.cs               |   92 +++++
 VueWebApi/DLL/BLL/PurchaseOrderBLL.cs                          |   29 +
 VueWebApi/DLL/DAL/AppPurchManagementDAL.cs                     |   46 ++
 VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user |   10 
 .vs/VueWebApi/v16/.suo                                         |    0 
 VueWebApi/DLL/BLL/ProductionManagementBLL.cs                   |   14 
 VueWebApi/DLL/DAL/BaseDateDAL.cs                               |    2 
 VueWebApi/DLL/DAL/ProductionManagementDAL.cs                   |  250 +++++++++++++++
 VueWebApi/Models/AdvancedSchedulingDevice.cs                   |    1 
 VueWebApi/bin/VueWebApi.xml                                    |   78 ++++
 VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache |    0 
 VueWebApi/VueWebApi.csproj                                     |    1 
 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb     |    0 
 VueWebApi/Models/ApsOrderSerch.cs                              |   35 ++
 VueWebApi/Controllers/ProductionManagementController.cs        |   55 ++-
 VueWebApi/DLL/DAL/PurchaseOrderDAL.cs                          |  184 +++++++++++
 VueWebApi/Logs/2023-04-19.TXT                                  |   30 +
 VueWebApi/Tools/LabCodeStatusMessage.cs                        |   16 
 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml     |   78 ++++
 VueWebApi/bin/VueWebApi.pdb                                    |    0 
 VueWebApi/Logs/2023-04-13.TXT                                  |    0 
 23 files changed, 897 insertions(+), 26 deletions(-)

diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index af1d97a..23109d1 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index 5f2d3cf..9416126 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -89,7 +89,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, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, username);
             return TJson.toJson(mes);
         }
         #endregion
@@ -107,7 +107,7 @@
         {
             //var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
             var username = "Admin";
-            mes = ProductionManagementBLL.ClosedErpOrder(erporderid,erpordercode, username);
+            mes = ProductionManagementBLL.ClosedErpOrder(erporderid, erpordercode, username);
             return TJson.toJson(mes);
         }
         #endregion
@@ -134,7 +134,7 @@
         /// <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 ordertype = 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
@@ -161,7 +161,7 @@
         /// <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 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
@@ -241,7 +241,7 @@
         /// <returns></returns>
         [Route(template: "SelectRouteOrWkshop")]
         [HttpGet]
-        public HttpResponseMessage SelectRouteOrWkshop(string partcode,string routecode,string wkshopcode)
+        public HttpResponseMessage SelectRouteOrWkshop(string partcode, string routecode, string wkshopcode)
         {
             mes = ProductionManagementBLL.SelectRouteOrWkshop(partcode, routecode, wkshopcode);
             return TJson.toJson(mes);
@@ -322,7 +322,7 @@
         public HttpResponseMessage ClosedMesOrder(string wocode, string m_po)
         {
             var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
-            mes = ProductionManagementBLL.ClosedMesOrder(username,wocode, m_po);
+            mes = ProductionManagementBLL.ClosedMesOrder(username, wocode, m_po);
             return TJson.toJson(mes);
         }
         #endregion
@@ -605,7 +605,7 @@
             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, reckway,usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
+            mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, reckway, usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
             return TJson.toJson(mes);
         }
         #endregion
@@ -743,7 +743,7 @@
             string data = obj["data"].ToString();
             List<StepCheck> json = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StepCheck>>(data);
             var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
-            mes = ProductionManagementBLL.SaveMesOrderStepCheckItem(mesordercode, partcode, stepcode, checkstanedcode, checkusercode, checktypecode, checkresult, checkdescr, checkqty, username,json);
+            mes = ProductionManagementBLL.SaveMesOrderStepCheckItem(mesordercode, partcode, stepcode, checkstanedcode, checkusercode, checktypecode, checkresult, checkdescr, checkqty, username, json);
             return TJson.toJson(mes);
         }
         #endregion
@@ -788,7 +788,7 @@
         [HttpPost]
         public HttpResponseMessage MesOrderBitchClosedSeave(DataTable dt)
         {
-            
+
             var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
             mes = ProductionManagementBLL.MesOrderBitchClosedSeave(username, dt);
             return TJson.toJson(mes);
@@ -877,7 +877,7 @@
         /// <returns></returns>
         [Route(template: "CapacityPlanningSearch")]
         [HttpGet]
-        public HttpResponseMessage CapacityPlanningSearch(int page, int rows, string prop, string order,string workshop = null, string devicetype = null, string stustype = null)
+        public HttpResponseMessage CapacityPlanningSearch(int page, int rows, string prop, string order, string workshop = null, string devicetype = null, string stustype = null)
         {
             int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
             int endNum = rows * page;   //缁撴潫璁板綍 rowNum
@@ -898,7 +898,7 @@
         /// <returns></returns>
         [Route(template: "CapacityPlanSubmit")]
         [HttpPost]
-        public HttpResponseMessage CapacityPlanSubmit(string wkshopcode, string capunitcode,string captplanid=null,string capsetupcode=null,string captplantype=null)
+        public HttpResponseMessage CapacityPlanSubmit(string wkshopcode, string capunitcode, string captplanid = null, string capsetupcode = null, string captplantype = null)
         {
             string type = ""; //鎻愪氦绫诲瀷
             if (captplanid == "" || captplanid == null)
@@ -910,7 +910,7 @@
                 type = "Update";
             }
             var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
-            mes = ProductionManagementBLL.CapacityPlanSubmit(type,captplanid,wkshopcode,capunitcode,capsetupcode, captplantype,username);
+            mes = ProductionManagementBLL.CapacityPlanSubmit(type, captplanid, wkshopcode, capunitcode, capsetupcode, captplantype, username);
             return TJson.toJson(mes);
         }
         #endregion
@@ -939,7 +939,7 @@
         /// <returns></returns>
         [Route(template: "CapacityPlanningOnclickSelect")]
         [HttpGet]
-        public HttpResponseMessage CapacityPlanningOnclickSelect(string captplanid,string datetime)
+        public HttpResponseMessage CapacityPlanningOnclickSelect(string captplanid, string datetime)
         {
             mes = ProductionManagementBLL.CapacityPlanningOnclickSelect(captplanid, datetime);
             return TJson.toJson(mes);
@@ -973,7 +973,7 @@
                 type = "Update";
             }
             var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
-            mes = ProductionManagementBLL.CapacityPlanningGivePlanSubmit(captplanid, wkshopcode, capunitcode, capsetupcode, captplantype, objs,type, username);
+            mes = ProductionManagementBLL.CapacityPlanningGivePlanSubmit(captplanid, wkshopcode, capunitcode, capsetupcode, captplantype, objs, type, username);
             return TJson.toJson(mes);
         }
         #endregion
@@ -996,7 +996,7 @@
         /// <returns></returns>
         [Route(template: "AdvancedSchedulingSearch")]
         [HttpGet]
-        public HttpResponseMessage AdvancedSchedulingSearch(int page, int rows, string prop, string order, string workshop = null, string wocode = null, string partcode = null,string partname=null)
+        public HttpResponseMessage AdvancedSchedulingSearch(int page, int rows, string prop, string order, string workshop = null, string wocode = null, string partcode = null, string partname = null)
         {
             int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
             int endNum = rows * page;   //缁撴潫璁板綍 rowNum
@@ -1018,7 +1018,7 @@
         /// <returns></returns>
         [Route(template: "OnclickAdvancedSchedulingDevice")]
         [HttpGet]
-        public HttpResponseMessage OnclickAdvancedSchedulingDevice(string wocode,string wkshpcode,string partcode,string botproccode,string startdate,string enddate)
+        public HttpResponseMessage OnclickAdvancedSchedulingDevice(string wocode, string wkshpcode, string partcode, string botproccode, string startdate, string enddate)
         {
             List<AdvancedSchedulingDevice> list = new List<AdvancedSchedulingDevice>();
             List<AdvancedSchedAlready> list1 = new List<AdvancedSchedAlready>();
@@ -1033,6 +1033,29 @@
         }
         #endregion
 
+        #region[NEW楂樼骇鎺掔▼鐐瑰嚮宸ュ崟浠诲姟甯﹀嚭鐡堕宸ュ簭璁惧銆佸凡鎺掔▼浠诲姟鏁版嵁]
+        /// <summary>
+        /// NEW楂樼骇鎺掔▼鐐瑰嚮宸ュ崟浠诲姟甯﹀嚭鐡堕宸ュ簭璁惧銆佸凡鎺掔▼浠诲姟鏁版嵁
+        /// </summary>
+        /// <param name="json">鏌ヨ鏁版嵁</param>
+        /// <returns></returns>
+        [Route(template: "NewOnclickAdvancedSchedulingDevice")]
+        [HttpPost]
+        public HttpResponseMessage NewOnclickAdvancedSchedulingDevice(List<ApsOrderSerch> json)
+        {
+            List<AdvancedSchedulingDevice> list = new List<AdvancedSchedulingDevice>();
+            List<AdvancedSchedAlready> list1 = new List<AdvancedSchedAlready>();
+            list = ProductionManagementBLL.NewOnclickAdvancedSchedulingDevice(json, ref mes); //鎺掍骇璁惧淇℃伅
+            List<DataTable> dt = ProductionManagementBLL.NewAlreadyScheduling(json);   //璁惧宸叉帓绋嬩俊鎭�
+
+            Dictionary<object, object> dList = new Dictionary<object, object>();
+            dList.Add("rus", mes);
+            dList.Add("rows", list);
+            dList.Add("Cont", dt);
+            return TJson.toJson(dList);
+        }
+        #endregion
+
         #region[鎺掔▼鏁版嵁鎻愪氦]
         /// <summary>
         /// 鎺掔▼鏁版嵁鎻愪氦
diff --git a/VueWebApi/Controllers/PurchaseOrderController.cs b/VueWebApi/Controllers/PurchaseOrderController.cs
index ad8bf78..0d331bd 100644
--- a/VueWebApi/Controllers/PurchaseOrderController.cs
+++ b/VueWebApi/Controllers/PurchaseOrderController.cs
@@ -138,5 +138,97 @@
             return TJson.toJson(mes);
         }
         #endregion
+
+
+
+        #region[閲囪喘鍒拌揣鍗曟煡璇
+        /// <summary>
+        /// 閲囪喘鍒拌揣鍗曟煡璇�
+        /// </summary>
+        /// <param name="orderstatus">鍗曟嵁鐘舵��(榛樿鍏ㄩ儴)</param>
+        /// <param name="mesordercode">鍒拌揣鍗曞彿</param>
+        /// <param name="departmentcode">閮ㄩ棬缂栫爜</param>
+        /// <param name="customercode">渚涘簲鍟嗙紪鐮�</param>
+        /// <param name="orderdate">鍗曟嵁鏃ユ湡</param>
+        /// <param name="sourceorder">婧愬崟鍗曞彿(閲囪喘璁㈠崟鍙�)</param>
+        /// <param name="creatuser">鍒涘缓浜哄憳</param>
+        /// <param name="arrivaldate">棰勮鍒拌揣鏃ユ湡</param>
+        /// <param name="page">椤电爜</param>
+        /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+        /// <param name="prop">鎺掑簭瀛楁</param>
+        /// <param name="order">鎺掑簭瑙勫垯</param>
+        /// <returns></returns>
+        [Route(template: "PurchaseArrivalOrderSearch")]
+        [HttpGet]
+        public HttpResponseMessage PurchaseArrivalOrderSearch(string orderstatus=null, string mesordercode = null,string departmentcode=null, string customercode = null, string orderdate = null, string sourceorder = null, string creatuser = null, string arrivaldate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+        {
+            string orderdateopendate = "";   //鍗曟嵁寮�濮嬫椂闂�
+            string orderdateclosedate = "";  //鍗曟嵁缁撴潫鏃堕棿
+            string arrivalopendate = "";      //鍒涘缓寮�濮嬫椂闂�
+            string arrivalclosedate = "";     //鍒涘缓缁撴潫鏃堕棿
+            if (orderdate != "" && orderdate != null)
+            {
+                orderdateopendate = orderdate.Split('~')[0].ToString();
+                orderdateclosedate = orderdate.Split('~')[1].ToString();
+            }
+            if (arrivaldate != "" && arrivaldate != null)
+            {
+                arrivalopendate = arrivaldate.Split('~')[0].ToString();
+                arrivalclosedate = arrivaldate.Split('~')[1].ToString();
+            }
+            int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
+            int endNum = rows * page;   //缁撴潫璁板綍 rowNum
+            mes = PurchaseOrderBLL.PurchaseArrivalOrderSearch(orderstatus, mesordercode, departmentcode,customercode, orderdateopendate, orderdateclosedate, sourceorder, creatuser, arrivalopendate, arrivalclosedate, startNum, endNum, prop, order);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[閲囪喘鍒拌揣鍗曟槑缁哴
+        /// <summary>
+        /// 閲囪喘鍒拌揣鍗曟槑缁�
+        /// </summary>
+        /// <param name="arrivelodercode">鍒拌揣鍗曞彿</param>
+        /// <returns></returns>
+        [Route(template: "PurchaseArrivalOrderSubSearch")]
+        [HttpGet]
+        public HttpResponseMessage PurchaseArrivalOrderSubSearch(string arrivelodercode)
+        {
+            mes = PurchaseOrderBLL.PurchaseArrivalOrderSubSearch(arrivelodercode);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[閲囪喘鍒拌揣鍗曞叧闂璢
+        /// <summary>
+        /// 閲囪喘鍒拌揣鍗曞叧闂�
+        /// </summary>
+        /// <param name="arrivelodercode">鍒拌揣鍗曞彿</param>
+        /// <returns></returns>
+        [Route(template: "ClosedPurchaseArrivalOrder")]
+        [HttpPost]
+        public HttpResponseMessage ClosedPurchaseArrivalOrder(string arrivelodercode)
+        {
+            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+            mes = PurchaseOrderBLL.ClosedPurchaseArrivalOrder(arrivelodercode, username);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[閲囪喘鍒拌揣鍗曟槑缁嗘煡鐪嬫潯鐮佽鎯匽
+        /// <summary>
+        /// 閲囪喘鍒拌揣鍗曟槑缁嗘煡鐪嬫潯鐮佽鎯�
+        /// </summary>
+        /// <param name="sourceorder">婧愬崟鍗曞彿</param>
+        /// <param name="arrivelodercode">鍒拌揣鍗曞彿</param>
+        /// <param name="partcode">鐗╂枡缂栫爜</param>
+        /// <returns></returns>
+        [Route(template: "PurchaseArrivalOrderSubLabDetails")]
+        [HttpGet]
+        public HttpResponseMessage PurchaseArrivalOrderSubLabDetails(string sourceorder, string arrivelodercode,string partcode)
+        {
+            mes = PurchaseOrderBLL.PurchaseArrivalOrderSubLabDetails(sourceorder,arrivelodercode, partcode);
+            return TJson.toJson(mes);
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
index 74e81f0..0e9ee35 100644
--- a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
+++ b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
@@ -376,6 +376,20 @@
         }
         #endregion
 
+        #region[NEW鎺掍骇璁惧淇℃伅]
+        public static List<AdvancedSchedulingDevice> NewOnclickAdvancedSchedulingDevice(List<ApsOrderSerch> json, ref ToMessage mes)
+        {
+            return ProductionManagementDAL.NewOnclickAdvancedSchedulingDevice(json, ref mes);
+        }
+        #endregion
+
+        #region[NEW璁惧宸叉帓绋嬩俊鎭痌
+        public static List<DataTable> NewAlreadyScheduling(List<ApsOrderSerch> json)
+        {
+            return ProductionManagementDAL.NewAlreadyScheduling(json);
+        }
+        #endregion
+
         #region[鎺掔▼鏁版嵁鎻愪氦]
         public static ToMessage SubmitAlreadyScheduling(string username, string wocode, string botprocecode, List<AlreadyScheduling> objs)
         {
diff --git a/VueWebApi/DLL/BLL/PurchaseOrderBLL.cs b/VueWebApi/DLL/BLL/PurchaseOrderBLL.cs
index eb4876b..63a2a4e 100644
--- a/VueWebApi/DLL/BLL/PurchaseOrderBLL.cs
+++ b/VueWebApi/DLL/BLL/PurchaseOrderBLL.cs
@@ -50,5 +50,34 @@
             return PurchaseOrderDAL.ClosedPurchaseOrder(po, username);
         }
         #endregion
+
+
+        #region[閲囪喘鍒拌揣鍗曟煡璇
+        public static ToMessage PurchaseArrivalOrderSearch(string orderstatus, string mesordercode, string departmentcode, string customercode, string orderdateopendate, string orderdateclosedate, string sourceorder, string creatuser, string arrivalopendate, string arrivalclosedate, int startNum, int endNum, string prop, string order)
+        {
+            return PurchaseOrderDAL.PurchaseArrivalOrderSearch(orderstatus,mesordercode, departmentcode, customercode, orderdateopendate, orderdateclosedate, sourceorder, creatuser, arrivalopendate, arrivalclosedate, startNum, endNum, prop, order);
+        }
+        #endregion
+
+        #region[閲囪喘鍒拌揣鍗曟槑缁哴
+        public static ToMessage PurchaseArrivalOrderSubSearch(string arrivelodercode)
+        {
+            return PurchaseOrderDAL.PurchaseArrivalOrderSubSearch(arrivelodercode);
+        }
+        #endregion
+
+        #region[閲囪喘鍒拌揣鍗曞叧闂璢
+        public static ToMessage ClosedPurchaseArrivalOrder(string arrivelodercode, string username)
+        {
+            return PurchaseOrderDAL.ClosedPurchaseArrivalOrder(arrivelodercode,username);
+        }
+        #endregion
+
+        #region[閲囪喘鍒拌揣鍗曟槑缁嗘煡鐪嬫潯鐮佽鎯匽
+        public static ToMessage PurchaseArrivalOrderSubLabDetails(string sourceorder, string arrivelodercode, string partcode)
+        {
+            return PurchaseOrderDAL.PurchaseArrivalOrderSubLabDetails(sourceorder,arrivelodercode, partcode);
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/VueWebApi/DLL/DAL/AppPurchManagementDAL.cs b/VueWebApi/DLL/DAL/AppPurchManagementDAL.cs
index 5897eb7..a380e1f 100644
--- a/VueWebApi/DLL/DAL/AppPurchManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/AppPurchManagementDAL.cs
@@ -356,9 +356,22 @@
             try
             {
                 //鍒ゆ柇鏉＄爜鐘舵��
-                mes = LabCodeStatusMessage.LabCodeStatus("2060", "1103", labcode);//鍔熻兘缂栧彿銆佸崟鎹被鍨嬬紪鐮併�佹爣绛剧紪鐮�
+                mes = LabCodeStatusMessage.LabCodeStatus("2060", "1103", labcode);//鍔熻兘缂栧彿(閲囪喘鍒拌揣)銆佸崟鎹被鍨嬬紪鐮�(閲囪喘鍒拌揣鍗�)銆佹爣绛剧紪鐮�
                 if (mes.code == "300")
                 {
+                    return mes;
+                }
+                //鍒ゆ柇鏍囩鐘舵��(鏄惁宸插叆搴�(涓嶈兘鍐嶅叆))
+                sql = @"select * from TK_WMS_Inwh_Sub  where labcode like '%'+@labcode+'%'";
+                dynamicParams.Add("@labcode", "labcode");
+                dynamicParams.Add("@labcode", labcode);
+                var dt = DapperHelper.selectdata(sql, dynamicParams);
+                if (dt.Rows.Count > 0)
+                {
+                    mes.code = "300";
+                    mes.count = 0;
+                    mes.Message = "褰撳墠鏉＄爜宸插叆搴�!";
+                    mes.data = null;
                     return mes;
                 }
                 //鍒ゆ柇鎵弿鏍囩鏄惁涓哄綋鍓嶉�夋嫨閲囪喘璁㈠崟涓嬬殑鍒拌揣鍗曟墍鐢熸垚鏍囩
@@ -697,6 +710,25 @@
             var dynamicParams = new DynamicParameters();
             try
             {
+                //鍒ゆ柇鏉＄爜鐘舵��
+                mes = LabCodeStatusMessage.LabCodeStatus("2060", "1103", labcode);//鍔熻兘缂栧彿(閲囪喘鍒拌揣)銆佸崟鎹被鍨嬬紪鐮�(閲囪喘鍒拌揣鍗�)銆佹爣绛剧紪鐮�
+                if (mes.code == "300")
+                {
+                    return mes;
+                }
+                //鍒ゆ柇鏍囩鐘舵��(鏄惁宸插叆搴�(涓嶈兘閫�璐�))
+                sql = @"select * from TK_WMS_Inwh_Sub  where labcode like '%'+@labcode+'%'";
+                dynamicParams.Add("@labcode", "labcode");
+                dynamicParams.Add("@labcode", labcode);
+                var data0 = DapperHelper.selectdata(sql, dynamicParams);
+                if (data0.Rows.Count > 0)
+                {
+                    mes.code = "300";
+                    mes.count = 0;
+                    mes.Message = "褰撳墠鏉＄爜宸插叆搴�!";
+                    mes.data = null;
+                    return mes;
+                }
                 //鏍规嵁閲囪喘璁㈠崟鍙枫�佺墿鏂欑紪鐮併�佹爣绛炬潯鐮佹煡鎵炬爣绛句俊鎭�
                 sql = @"select A.hbarcode,A.hcustomercode,C.name as hcustomercode,
                        A.hbatchno,A.qualitystatus,A.location_code,L.name as location_name,A.hqty  
@@ -804,6 +836,18 @@
                     //鏌ヨ姹囨�绘爣绛句俊鎭�
                     for (int j = 0; j < arra[i]["labcont"].Count(); j++)//寰幆鑾峰彇鏍囩淇℃伅
                     {
+                        //鏇存柊鏉＄爜鐘舵��
+                        sql = @"update T_BarCodeBill set hbarcodestatus=@hbarcodestatus where hsourcebillno=@hsourcebillno and hbarcode=@hbarcode";
+                        list.Add(new
+                        {
+                            str = sql,
+                            parm = new
+                            {
+                                hbarcodestatus="N",
+                                hsourcebillno = ordercode,
+                                hbarcode = arra[i]["labcont"][j]["labcode"].ToString()
+                            }
+                        });
                         //鏇存柊鍒拌揣鍗曞瓙琛ㄩ��璐ф暟閲�
                         sql = @"update T_PurchaseArrivalOrder_sub set hreturnqty=isnull(hreturnqty,0)+@inqty where hbillno=@hbillno and hpartcode=@hpartcode";
                         list.Add(new
diff --git a/VueWebApi/DLL/DAL/BaseDateDAL.cs b/VueWebApi/DLL/DAL/BaseDateDAL.cs
index 18d71e6..f49b050 100644
--- a/VueWebApi/DLL/DAL/BaseDateDAL.cs
+++ b/VueWebApi/DLL/DAL/BaseDateDAL.cs
@@ -26,7 +26,7 @@
             try
             {
                 sql = @"select code,name  from TCustomer
-                        where type in('226','228') and is_delete='0'";
+                        where type in('211','228') and is_delete='0'";
                 var data = DapperHelper.selecttable(sql);
                 mes.code = "200";
                 mes.Message = "鏌ヨ鎴愬姛!";
diff --git a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
index f2336c9..1c339a1 100644
--- a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -629,7 +629,7 @@
                     dynamicParams.Add("@step_code", dtck1.Rows[i]["step_code"].ToString());
                     var dtck2 = DapperHelper.selectdata(sql, dynamicParams);
                     int query = dtck2.AsEnumerable().Where<DataRow>(a => a["enable"].ToString() =="N").Count();
-                    if (dtck1.Rows.Count == query) 
+                    if (dtck2.Rows.Count == query) 
                     {
                         mes.code = "300";
                         mes.count = 0;
@@ -4010,6 +4010,254 @@
         }
         #endregion
 
+        #region[NEW鎺掍骇璁惧淇℃伅]
+        public static List<AdvancedSchedulingDevice> NewOnclickAdvancedSchedulingDevice(List<ApsOrderSerch> json, ref ToMessage mes)
+        {
+            string sql = "", sql0 = "";
+            var dynamicParams = new DynamicParameters();
+            List<AdvancedSchedulingDevice> list = new List<AdvancedSchedulingDevice>();
+            DataTable dt, dt1;
+            //List<ApsOrderSerch> json = new List<ApsOrderSerch>();
+            try
+            {
+                for (int w = 0; w < json.Count; w++)
+                {
+
+
+                    DateTime beginDate = Convert.ToDateTime(json[w].startdate);
+                    DateTime endDate = DateTime.Parse(json[w].enddate);
+                    if (beginDate > endDate)
+                    {
+                        mes.code = "300";
+                        mes.count = 0;
+                        mes.Message = "瑕佹眰浜や粯鏃堕棿涓嶈兘灏忎簬褰撳墠绯荤粺鏃堕棿锛�";
+                        mes.data = null;
+                        return list;
+                    }
+                    bool IsCap = false;    //鏄惁璁剧疆浜ц兘
+                                           //閫氳繃宸ュ崟鏌ユ壘瀵瑰簲杞﹂棿宸ヨ壓璺嚎涓嬪叧閿伐搴忔墍鍏宠仈鐨勮澶囨槸鍚﹀彲鐢�
+                    sql = @"select distinct C.eqp_code ,D.Enable  from TK_Wrk_Man A
+                       left join TFlw_Rout K on A.route_code=K.code
+                       left join TFlw_Rtdt B on K.code=B.rout_code and B.first_choke='Y'
+                       left join TFlw_Rteqp C on B.step_code= C.step_code
+                       left join TEqpInfo D on C.eqp_code=D.code
+                       where A.wo_code=@wocode and A.materiel_code=@partcode and D.wksp_code=@wkshpcode";
+                    dynamicParams.Add("@wocode", json[w].wocode);
+                    dynamicParams.Add("@partcode", json[w].partcode);
+                    dynamicParams.Add("@wkshpcode", json[w].wkshpcode);
+                    var dt_0 = DapperHelper.selectdata(sql, dynamicParams);
+                    if (dt_0.Rows.Count > 0)
+                    {
+                        int cout = dt_0.Rows.Count;
+                        int num = 0;
+                        for (int m = 0; m < dt_0.Rows.Count; m++)
+                        {
+                            if (dt_0.Rows[m]["Enable"].ToString() == "N")
+                            {
+                                num = num + 1;
+                            }
+                        }
+                        if (num == cout)
+                        {
+                            mes.code = "300";
+                            mes.count = 0;
+                            mes.Message = "璁惧涓嶅彲鐢紒";
+                            mes.data = null;
+                            return list;
+                        }
+                    }
+                    else
+                    {
+                        mes.code = "300";
+                        mes.count = 0;
+                        mes.Message = "宸ヨ壓璺嚎鏈叧鑱旇澶囷紒";
+                        mes.data = null;
+                        return list;
+                    }
+
+                    //閫氳繃宸ュ崟鏌ユ壘宸ヨ壓璺嚎瀵瑰簲鍏抽敭宸ュ簭鎵�鍏宠仈鐨勮澶囨墍灞炶溅闂�
+                    sql0 = @"select distinct D.wksp_code  from TK_Wrk_Man A
+                         left join TFlw_Rout K on A.route_code=K.code
+                         left join TFlw_Rtdt B on K.code=B.rout_code and B.first_choke='Y'
+                         left join TFlw_Rteqp C on B.step_code= C.step_code
+                         left join TEqpInfo D on C.eqp_code=D.code
+                         where A.wo_code=@wocode and A.materiel_code=@partcode ";
+                    dynamicParams.Add("@wocode", json[w].wocode);
+                    dynamicParams.Add("@partcode", json[w].partcode);
+                    var dt0 = DapperHelper.selectdata(sql0, dynamicParams);
+                    if (dt0.Rows.Count > 0)
+                    {
+                        string sy = "0";
+                        for (int i = 0; i < dt0.Rows.Count; i++)
+                        {
+                            if (dt0.Rows[i]["WKSP_CODE"].ToString() == json[w].wkshpcode)  //宸ュ崟鍒涘缓杞﹂棿鏄惁绛変簬鎺掍骇璁惧 杞﹂棿
+                            {
+                                sy = "1";
+                                break;
+                            }
+                            else
+                            {
+                                sy = "0";
+                            }
+                        }
+                        if (sy == "0")
+                        {
+                            mes.code = "300";
+                            mes.count = 0;
+                            mes.Message = "鎺掍骇璁惧杞﹂棿涓庡伐鍗曞垱寤虹殑杞﹂棿涓嶅悓锛�";
+                            mes.data = null;
+                            return list;
+                        }
+                        else
+                        {
+                            List<APSList> listData = SchedulingMethod.SchedulingMethodTF(json[w].wocode, json[w].wkshpcode, json[w].partcode);
+                            for (DateTime date = beginDate; date <= endDate; date = date.AddDays(1))
+                            {
+                                AdvancedSchedulingDevice tbj = new AdvancedSchedulingDevice();
+                                tbj.wo_code = json[w].wocode;
+                                tbj.YearDate = date.ToString("yyyy-MM-dd");
+                                tbj.children = new List<AdvancedSchedulingDeviceCont>();
+                                for (int j = 0; j < listData.Count; j++)
+                                {
+                                    if (listData[j].AdvaDevicCropMob.ToString() == "0" || listData[j].AdvaDevicRhythm.ToString() == "")
+                                    {
+                                        mes.code = "300";
+                                        mes.count = 0;
+                                        mes.Message = "鎺掔▼璁惧" + listData[j].eqp_id.ToString() + "绋煎姩鐜囦笉鑳戒负0鎴栦负绌猴紒";
+                                        mes.data = null;
+                                        return list;
+                                    }
+                                    if (listData[j].AdvaDevicRhythm.ToString() == "0" || listData[j].AdvaDevicRhythm.ToString() == "")
+                                    {
+                                        mes.code = "300";
+                                        mes.count = 0;
+                                        mes.Message = "鎺掔▼璁惧" + listData[j].eqp_id.ToString() + "鏈缃妭鎷嶏紒";
+                                        mes.data = null;
+                                        return list;
+                                    }
+                                    string sql1 = @"select wktme1_start,wktme2_start,wktme3_start,wktme4_start,wktme5_start,G.name  
+		                                        from  TWkm_capac_plan  E 
+                                                left join TWkm_capac_plan_sub F on E.id=F.m_id
+                                                left join TBas_wkshift_info G on F.wkshift_code=G.code
+                                                where E.wkshop=@wkshop and E.eqp_typecode=@eqp_typecode  and E.ClassType=@classtype
+		                                        and CONVERT(varchar(100), F.wkdate, 23)=@wkdate and E.enable='Y'";
+                                    dynamicParams.Add("@wkshop", json[w].wkshpcode);
+                                    dynamicParams.Add("@eqp_typecode", listData[j].Style.ToString());
+                                    dynamicParams.Add("@classtype", listData[j].ClassType.ToString());
+                                    dynamicParams.Add("@wkdate", date.ToString("yyyy-MM-dd"));
+                                    dt1 = DapperHelper.selectdata(sql1, dynamicParams);
+
+                                    AdvancedSchedulingDeviceCont tbjson = new AdvancedSchedulingDeviceCont();
+                                    tbjson.AdvaDevicNumber = listData[j].eqp_id.ToString();
+                                    tbjson.AdvaDevicName = listData[j].name.ToString();
+                                    tbjson.AdvaDevicCropMob = listData[j].AdvaDevicCropMob.ToString();  //绋煎姩鐜�
+                                    tbjson.AdvaDevicRhythm = listData[j].AdvaDevicRhythm.ToString();    //鐢熶骇鑺傛媿
+                                    if (dt1.Rows.Count > 0)
+                                    {
+                                        tbjson.OneStartDate = dt1.Rows[0]["wktme1_start"].ToString();
+                                        tbjson.TwoStartDate = dt1.Rows[0]["wktme2_start"].ToString();
+                                        tbjson.ThreeStartDate = dt1.Rows[0]["wktme3_start"].ToString();
+                                        tbjson.FourStartDate = dt1.Rows[0]["wktme4_start"].ToString();
+                                        tbjson.FiveStartDate = dt1.Rows[0]["wktme5_start"].ToString();
+                                        tbj.children.Add(tbjson);
+                                        IsCap = true;
+                                    }
+                                    else
+                                    {
+
+                                        tbjson.OneStartDate = "";
+                                        tbjson.TwoStartDate = "";
+                                        tbjson.ThreeStartDate = "";
+                                        tbjson.FourStartDate = "";
+                                        tbjson.FiveStartDate = "";
+                                        tbj.children.Add(tbjson);
+                                    }
+                                }
+
+                                list.Add(tbj);
+                            }
+                            if (list.Select(p => p.children).ToList().Count > 0)
+                            {
+                                int one = list.Where(t => t.children.Select(s => s.OneStartDate).Any(x => x != "")).ToList().Count;
+                                int two = list.Where(t => t.children.Select(s => s.TwoStartDate).Any(x => x != "")).ToList().Count;
+                                int three = list.Where(t => t.children.Select(s => s.ThreeStartDate).Any(x => x != "")).ToList().Count;
+                                int four = list.Where(t => t.children.Select(s => s.FourStartDate).Any(x => x != "")).ToList().Count;
+                                int five = list.Where(t => t.children.Select(s => s.FiveStartDate).Any(x => x != "")).ToList().Count;
+                                if (one <= 0 && two <= 0 && three <= 0 && four <= 0 && five <= 0)
+                                {
+                                    mes.code = "300";
+                                    mes.count = 0;
+                                    mes.Message = "褰撳墠宸ュ崟鍔犲伐浜у搧瀵瑰簲宸ヨ壓璺嚎璁惧鏈缃骇鑳芥垨鏈缃敓浜ц妭鎷嶏紒";
+                                    mes.data = null;
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        mes.code = "300";
+                        mes.count = 0;
+                        mes.Message = "璁惧娌℃湁鍏宠仈杞﹂棿锛�";
+                        mes.data = null;
+                    }
+                }
+                return list;
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.count = 0;
+                mes.Message = e.Message;
+                mes.data = null;
+            }
+            return list;
+        }
+        #endregion
+
+        #region[New璁惧宸叉帓绋嬩俊鎭痌
+        public static List<DataTable> NewAlreadyScheduling(List<ApsOrderSerch> json)
+        {
+            var dynamicParams = new DynamicParameters();
+            DataTable dt;
+            List<DataTable> list = new List<DataTable>();
+            try
+            {
+                for (int i = 0; i < json.Count; i++)
+                {
+                    List<APSList> listData = SchedulingMethod.SchedulingMethodTF(json[i].wocode, json[i].wkshpcode, json[i].partcode);
+                    string[] empIds = listData.Select(a => a.eqp_id).ToArray();
+                    string str = string.Join(",", empIds);
+                    string[] s1 = Array.ConvertAll<string, string>(str.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[] 
+                                                                                                                                                             //string s1 = string.Format("'{0}'", str.Replace(",", "','"));
+
+                    string sql = @"select B.wo_code,  B.eqp_code,B.time_start,B.time_end, 'S' status , B.alloc_qty,D.partcode as part_code,D.partname as part_name,T.name as uom_name
+	                           from TK_Wrk_EqpAps B 
+                               left join TK_Wrk_Man C on B.wo_code=C.wo_code
+                               left join  TMateriel_Info D on C.materiel_code=D.partcode
+                               left join TUom T on D.uom_code=T.code
+                               where  B.eqp_code in @eqpcode
+	                           and convert(varchar(100),B.Time_Start,21)>=@startdate and convert(varchar(100),B.Time_End,21)<=@enddate order by time_end";
+                    dt = DapperHelper.selectlist(sql, new { eqpcode = s1.ToArray(), startdate = json[i].startdate + " 00:00:00", enddate = json[i].enddate + " 23:59:59" });
+                    //dynamicParams.Add("@s1", new { shopcode = s1.ToArray() });
+                    //dynamicParams.Add("@startdate", startdate + " 00:00:00");
+                    //dynamicParams.Add("@enddate", enddate + " 23:59:59");
+                    //var dt_0 = DapperHelper.selectdata(sql, dynamicParams);
+                    if (dt == null || dt.Rows.Count == 0)
+                    {
+                        return null;
+                    }
+                    list.Add(dt);
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new Exception(ex.Message);
+            }
+
+            return list;
+        }
+        #endregion
+
         #region[鎺掔▼鏁版嵁鎻愪氦]
         public static ToMessage SubmitAlreadyScheduling(string username, string wocode, string botprocecode, List<AlreadyScheduling> objs)
         {
diff --git a/VueWebApi/DLL/DAL/PurchaseOrderDAL.cs b/VueWebApi/DLL/DAL/PurchaseOrderDAL.cs
index ce53afb..e905881 100644
--- a/VueWebApi/DLL/DAL/PurchaseOrderDAL.cs
+++ b/VueWebApi/DLL/DAL/PurchaseOrderDAL.cs
@@ -311,5 +311,189 @@
             return mes;
         }
         #endregion
+
+
+
+        #region[閲囪喘鍒拌揣鍗曟煡璇
+        public static ToMessage PurchaseArrivalOrderSearch(string orderstatus, string mesordercode, string departmentcode, string customercode, string orderdateopendate, string orderdateclosedate, string sourceorder, string creatuser, string arrivalopendate, string arrivalclosedate, int startNum, int endNum, string prop, string order)
+        {
+            var dynamicParams = new DynamicParameters();
+            string search = "";
+            try
+            {
+                if (orderstatus != "" && orderstatus != null)
+                {
+                    search += "and A.hbillstaus=@orderstatus ";
+                    dynamicParams.Add("@orderstatus", orderstatus);
+                }
+                if (mesordercode != "" && mesordercode != null)
+                {
+                    search += "and A.hbillno like '%'+@mesordercode+'%' ";
+                    dynamicParams.Add("@mesordercode", mesordercode);
+                }
+                if (departmentcode != "" && departmentcode != null)
+                {
+                    search += "and A.hdepartmentcode=@departmentcode ";
+                    dynamicParams.Add("@departmentcode", departmentcode);
+                }
+                if (customercode != "" && customercode != null)
+                {
+                    search += "and A.hcustomercode=@customercode ";
+                    dynamicParams.Add("@customercode", customercode);
+                }
+                if (sourceorder != "" && sourceorder != null)
+                {
+                    search += "and A.hsourcebillno like '%'+@sourceorder+'%' ";
+                    dynamicParams.Add("@sourceorder", sourceorder);
+                }
+                if (orderdateopendate != "" && orderdateopendate != null)
+                {
+                    search += "and A.hdate between @orderdateopendate and @orderdateclosedate ";
+                    dynamicParams.Add("@orderdateopendate", orderdateopendate + " 00:00:00");
+                    dynamicParams.Add("@orderdateclosedate", orderdateclosedate + " 23:59:59");
+                }
+                if (creatuser != "" && creatuser != null)
+                {
+                    search += "and A.lm_user like '%'+@creatuser+'%' ";
+                    dynamicParams.Add("@creatuser", creatuser);
+                }
+                if (arrivalopendate != "" && arrivalopendate != null)
+                {
+                    search += "and A.hacceptdate between @arrivalopendate and @arrivalclosedate ";
+                    dynamicParams.Add("@arrivalopendate", arrivalopendate + " 00:00:00");
+                    dynamicParams.Add("@arrivalclosedate", arrivalclosedate + " 23:59:59");
+                }
+                if (search == "")
+                {
+                    search = "and 1=1 ";
+                }
+                // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+                var total = 0; //鎬绘潯鏁�
+                var sql = @"select A.hbillstaus,A.hdate,A.hbillno,A.hdepartmentcode,T.org_name as hdepartmentname,A.hcustomercode,C.name as hcustomername,
+                            A.hsourcebillno,A.hacceptdate,A.lm_user as usercode,U.username
+                            from T_PurchaseArrivalOrder A
+                            left join TCustomer C on A.hcustomercode=C.code 
+                            left join TOrganization T on A.hdepartmentcode=T.org_code
+                            left join TUser U on A.lm_user=U.usercode
+                            where  1=1 " + search;
+                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+                mes.code = "200";
+                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.count = total;
+                mes.data = data.ToList();
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.count = 0;
+                mes.Message = e.Message;
+                mes.data = null;
+            }
+            return mes;
+        }
+        #endregion
+
+        #region[閲囪喘鍒拌揣鍗曟槑缁哴
+        public static ToMessage PurchaseArrivalOrderSubSearch(string arrivelodercode)
+        {
+            string sql = "";
+            var dynamicParams = new DynamicParameters();
+            try
+            {
+                //鑾峰彇閲囪喘鍒拌揣鍗曠墿鏂欎俊鎭�
+                sql = @"select  S.hpartcode as partcode,M.partname,M.partspec,M.uom_code,T.name as uom_name,
+                        S.hqty,S.hqty,S.hreturnqty,S.hacceptdate,S.hstorehousecode,K.name as hstorehousename,S.hcheckstaus
+                        from T_PurchaseArrivalOrder A
+                        left join T_PurchaseArrivalOrder_sub S on A.hbillno=S.hbillno
+                        left join TMateriel_Info M on S.hpartcode=M.partcode
+                        left join TUom T on M.uom_code=T.code
+                        left join T_Sec_Stck K on S.hstorehousecode=K.code
+                        where A.hbillno=@arrivelodercode";
+                dynamicParams.Add("@arrivelodercode", arrivelodercode);
+                var data = DapperHelper.selectdata(sql, dynamicParams);
+                mes.code = "200";
+                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.data = data;
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.count = 0;
+                mes.Message = e.Message;
+                mes.data = null;
+            }
+            return mes;
+        }
+        #endregion
+
+        #region[閲囪喘鍒拌揣鍗曞叧闂璢
+        public static ToMessage ClosedPurchaseArrivalOrder(string arrivelodercode, string username)
+        {
+            var sql = "";
+            List<object> list = new List<object>();
+            var dynamicParams = new DynamicParameters();
+            try
+            {
+                //鏇存柊鍒拌揣鍗曠姸鎬�
+                sql = @"update T_PurchaseArrivalOrder set hbillstaus='CLOSED'  where hbillno=@arrivelodercode";
+                list.Add(new { str = sql, parm = new { arrivelodercode = arrivelodercode } });
+                bool aa = DapperHelper.DoTransaction(list);
+                if (aa)
+                {
+                    mes.code = "200";
+                    mes.count = 0;
+                    mes.Message = "鎿嶄綔鎴愬姛!";
+                    mes.data = null;
+                }
+                else
+                {
+                    mes.code = "300";
+                    mes.count = 0;
+                    mes.Message = "鎿嶄綔澶辫触!";
+                    mes.data = null;
+                }
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.count = 0;
+                mes.Message = e.Message;
+                mes.data = null;
+            }
+            return mes;
+        }
+        #endregion
+
+        #region[閲囪喘鍒拌揣鍗曟槑缁嗘煡鐪嬫潯鐮佽鎯匽
+        public static ToMessage PurchaseArrivalOrderSubLabDetails(string sourceorder, string arrivelodercode, string partcode)
+        {
+            string sql = "";
+            var dynamicParams = new DynamicParameters();
+            try
+            {
+                //鑾峰彇鍒拌揣鐗╂枡瀵瑰簲鏍囩淇℃伅
+                sql = @"select C.hbarcode,A.hbillno,A.hsourcebillno,C.qualitystatus,C.hqty,C.hbatchno   
+                        from T_PurchaseArrivalOrder A
+                        inner join T_PurchaseArrivalOrder_sub B on A.hbillno=B.hbillno
+                        left  join  T_BarCodeBill C on A.hsourcebillno=C.hsourcebillno and A.hbillno=C.hbillno and B.hpartcode=C.hmaterialcode
+                        where A.hsourcebillno=@hsourcebillno and A.hbillno=@hbillno and B.hpartcode=@hpartcode";
+                dynamicParams.Add("@hsourcebillno", sourceorder);
+                dynamicParams.Add("@hbillno", arrivelodercode);
+                dynamicParams.Add("@hpartcode", partcode);
+                var data = DapperHelper.selectdata(sql, dynamicParams);
+                mes.code = "200";
+                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.data = data;
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.count = 0;
+                mes.Message = e.Message;
+                mes.data = null;
+            }
+            return mes;
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/VueWebApi/Logs/2023-04-13.TXT b/VueWebApi/Logs/2023-04-13.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2023-04-13.TXT
diff --git a/VueWebApi/Logs/2023-04-19.TXT b/VueWebApi/Logs/2023-04-19.TXT
new file mode 100644
index 0000000..f648022
--- /dev/null
+++ b/VueWebApi/Logs/2023-04-19.TXT
@@ -0,0 +1,30 @@
+ 【时间】:2023-04-19 08:34:39,523
+ 【级别】:ERROR
+ 【类名】:日志记录
+ 【线程ID】: 7 
+ 【文件地址】:D:\新凯迪MES\MES产品\VueWebApi\VueWebApi\Tools\LogHelper.cs 第25行
+ 【日志内容】:
+消息类型：SqlException
+消息内容：“,”附近有语法错误。
+“,”附近有语法错误。
+引发异常路径：/api/PurchaseOrder/PurchaseArrivalOrderSearch
+引发异常的方法：OnError
+引发异常源：.Net SqlClient Data Provider   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 Dapper.SqlMapper.ExecuteReaderWithFlagsFallback(IDbCommand cmd, Boolean wasClosed, CommandBehavior behavior)
+   在 Dapper.SqlMapper.QueryMultipleImpl(IDbConnection cnn, CommandDefinition& command)
+   在 Dapper.SqlMapper.QueryMultiple(IDbConnection cnn, String sql, Object param, IDbTransaction transaction, Nullable`1 commandTimeout, Nullable`1 commandType)
+   在 VueWebApi.Tools.DapperHelper.GetPageList[T](String sql, Object parm, String orderBy, String sort, Int32 pageIndex, Int32 pageSize, Int32& total) 位置 D:\新凯迪MES\MES产品\VueWebApi\VueWebApi\Tools\DapperHelper.cs:行号 160
+ 【日记详细】： 
+---------------------------------------------------------------------------------------------------------------
diff --git a/VueWebApi/Models/AdvancedSchedulingDevice.cs b/VueWebApi/Models/AdvancedSchedulingDevice.cs
index c75f9c6..f68812e 100644
--- a/VueWebApi/Models/AdvancedSchedulingDevice.cs
+++ b/VueWebApi/Models/AdvancedSchedulingDevice.cs
@@ -7,6 +7,7 @@
 {
     public class AdvancedSchedulingDevice
     {
+        public string wo_code { get; set; }
         public string YearDate { get; set; }
         public List<AdvancedSchedulingDeviceCont> children { get; set; }
 
diff --git a/VueWebApi/Models/ApsOrderSerch.cs b/VueWebApi/Models/ApsOrderSerch.cs
new file mode 100644
index 0000000..d0ae314
--- /dev/null
+++ b/VueWebApi/Models/ApsOrderSerch.cs
@@ -0,0 +1,35 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace VueWebApi.Models
+{
+    public class ApsOrderSerch
+    {
+        /// <summary>
+        /// 宸ュ崟鍙�
+        /// </summary>
+       public string wocode { get; set; }
+       /// <summary>
+       /// 杞﹂棿缂栫爜
+       /// </summary>
+       public string wkshpcode { get; set; }
+        /// <summary>
+        /// 浜у搧缂栧彿
+        /// </summary>
+        public string partcode { get; set; }
+        /// <summary>
+        /// 鐡堕宸ュ簭缂栫爜(棣栭亾宸ュ簭)
+        /// </summary>
+        public string botproccode { get; set; }
+        /// <summary>
+        /// 寮�濮嬫棩鏈�
+        /// </summary>
+        public string startdate { get; set; }
+        /// <summary>
+        /// 缁撴潫鏃ユ湡
+        /// </summary>
+        public string enddate { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
index 2cf8197..7cac530 100644
--- a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>D:\缃戠珯鍙戝竷\XKDMesApi</_PublishTargetUrl>
-    <History>True|2023-04-12T08:23:35.3177339Z;True|2023-04-11T12:49:48.0246851+08:00;True|2023-04-11T12:46:56.0293166+08:00;True|2023-04-11T11:13:00.9841554+08:00;True|2023-04-10T16:53:41.8964649+08:00;True|2023-04-07T08:30:18.4653189+08:00;True|2023-04-06T17:29:55.4388629+08:00;True|2023-04-06T16:45:39.5573964+08:00;True|2023-04-04T15:41:18.1582540+08:00;True|2023-04-04T15:33:47.4319210+08:00;True|2023-04-04T15:24:23.0417772+08:00;True|2023-04-04T15:05:34.8694589+08:00;True|2023-04-04T13:51:06.6709099+08:00;True|2023-04-04T08:51:53.0379573+08:00;True|2023-04-04T08:26:14.1581736+08:00;True|2023-04-04T08:09:40.3919185+08:00;True|2023-04-04T08:03:47.3773358+08:00;True|2023-03-29T10:59:42.8557249+08:00;True|2023-03-29T10:32:37.1829423+08:00;True|2023-03-24T15:23:09.2950637+08:00;True|2023-03-22T17:52:59.0162624+08:00;True|2023-03-22T17:44:51.7892593+08:00;True|2023-03-22T17:41:41.7366750+08:00;True|2023-03-22T17:30:45.1983751+08:00;True|2023-03-22T17:25:48.0681920+08:00;True|2023-03-22T17:16:16.5578143+08:00;True|2023-03-22T16:36:15.7695476+08:00;True|2023-03-22T10:21:58.5145068+08:00;True|2023-03-20T17:21:47.4459321+08:00;True|2023-03-20T17:21:27.0468975+08:00;True|2023-03-20T16:58:02.8681774+08:00;True|2023-03-20T16:34:42.1058692+08:00;True|2023-03-20T16:23:47.7801897+08:00;True|2023-03-03T08:56:05.4730255+08:00;True|2023-03-02T16:23:31.6756396+08:00;True|2023-03-01T15:52:28.2849007+08:00;True|2023-03-01T15:35:55.8647024+08:00;True|2023-03-01T15:21:23.8133690+08:00;True|2023-02-28T16:00:01.5165754+08:00;True|2023-02-28T14:53:18.0954404+08:00;True|2023-02-28T14:45:14.0183407+08:00;True|2023-02-15T15:10:18.1493103+08:00;True|2023-02-15T14:45:42.3134512+08:00;True|2023-02-15T14:38:34.6207896+08:00;True|2023-02-15T14:28:47.3494779+08:00;True|2023-02-15T14:06:19.8843387+08:00;True|2023-02-15T12:37:06.8372351+08:00;True|2023-02-15T09:18:28.2740085+08:00;True|2023-02-14T16:38:24.2037803+08:00;False|2023-02-14T16:35:10.9291528+08:00;True|2023-02-13T14:56:38.5856100+08:00;True|2023-02-13T12:50:51.9358444+08:00;True|2023-02-11T10:08:39.6831781+08:00;True|2023-02-11T09:54:32.8160454+08:00;True|2023-02-11T09:54:21.9971913+08:00;True|2023-02-11T02:11:17.5904204+08:00;True|2023-02-11T02:04:19.4213456+08:00;True|2023-02-10T13:03:57.4443981+08:00;True|2023-02-09T21:55:13.8322950+08:00;True|2023-02-09T21:34:49.3120350+08:00;True|2023-02-07T10:08:39.5582710+08:00;True|2023-02-03T08:25:45.7718782+08:00;True|2023-01-30T12:40:37.6820386+08:00;True|2023-01-30T08:45:34.0836363+08:00;True|2023-01-11T10:13:36.4366183+08:00;True|2023-01-11T09:37:39.6235517+08:00;True|2023-01-11T09:37:05.7608583+08:00;True|2023-01-11T09:14:36.0337347+08:00;True|2023-01-10T16:29:20.9791940+08:00;True|2023-01-10T16:09:20.2950245+08:00;True|2023-01-10T14:43:30.8069585+08:00;True|2023-01-10T14:43:14.0392269+08:00;True|2023-01-10T13:30:42.7077204+08:00;True|2023-01-10T13:09:48.9547948+08:00;True|2023-01-10T12:18:02.7207328+08:00;True|2023-01-06T16:33:28.2963933+08:00;True|2023-01-06T16:27:31.9342782+08:00;True|2023-01-06T16:23:33.0323708+08:00;True|2023-01-06T14:06:25.7389071+08:00;True|2023-01-06T13:50:39.1399992+08:00;True|2023-01-06T11:55:24.5609585+08:00;True|2023-01-06T11:08:53.3862603+08:00;True|2023-01-06T10:35:25.4696330+08:00;True|2023-01-06T10:27:54.7687528+08:00;True|2023-01-06T09:34:11.0798818+08:00;True|2023-01-05T16:47:28.7063631+08:00;True|2023-01-04T15:09:12.6813075+08:00;True|2023-01-04T15:06:20.1259155+08:00;True|2022-12-27T15:22:00.8719157+08:00;True|2022-12-27T15:18:56.4183337+08:00;True|2022-12-27T11:13:35.0250651+08:00;True|2022-12-26T14:12:52.3868526+08:00;True|2022-12-26T10:35:25.9712626+08:00;True|2022-12-20T09:02:47.7097031+08:00;True|2022-12-19T14:40:38.5851369+08:00;True|2022-12-14T12:51:44.0399559+08:00;True|2022-12-14T10:59:36.5250039+08:00;True|2022-12-14T10:54:23.0704819+08:00;True|2022-12-14T10:54:11.5744699+08:00;True|2022-12-14T10:53:33.7127244+08:00;True|2022-12-14T10:47:34.9597966+08:00;True|2022-12-08T15:06:12.8416810+08:00;True|2022-12-07T16:44:49.7931793+08:00;True|2022-11-26T11:05:21.2315179+08:00;True|2022-11-26T10:56:49.3021067+08:00;True|2022-11-25T13:00:54.9138172+08:00;True|2022-11-25T12:43:01.0212012+08:00;True|2022-11-25T12:36:22.2745198+08:00;True|2022-11-25T12:33:27.1942331+08:00;True|2022-11-25T11:07:23.5860394+08:00;True|2022-11-25T10:36:26.1052993+08:00;True|2022-11-24T16:50:49.0061385+08:00;True|2022-11-24T16:47:23.6152654+08:00;True|2022-11-24T15:36:20.0275278+08:00;True|2022-11-24T15:25:29.2391337+08:00;True|2022-11-24T15:25:19.7988304+08:00;True|2022-11-24T15:06:48.3860466+08:00;True|2022-11-24T14:52:24.7879819+08:00;True|2022-11-24T10:12:41.0992839+08:00;True|2022-11-21T15:13:29.3527873+08:00;True|2022-11-21T10:42:28.8298039+08:00;True|2022-11-18T11:10:34.9917493+08:00;True|2022-11-18T11:10:11.7210670+08:00;True|2022-11-18T10:59:20.7515137+08:00;True|2022-11-18T10:52:33.2724652+08:00;True|2022-11-18T09:22:10.0215858+08:00;True|2022-11-18T09:16:35.0644453+08:00;True|2022-11-16T10:30:33.9013342+08:00;True|2022-11-16T09:55:08.7555656+08:00;True|2022-10-29T11:48:17.9164445+08:00;True|2022-10-29T10:27:39.6224331+08:00;True|2022-10-29T09:25:19.4865788+08:00;True|2022-10-29T09:01:58.2237798+08:00;True|2022-10-29T08:57:17.1749942+08:00;True|2022-10-28T14:44:10.4595607+08:00;True|2022-10-28T14:41:10.8050513+08:00;True|2022-10-28T14:39:02.0096359+08:00;True|2022-10-28T14:27:52.1679095+08:00;True|2022-10-28T14:19:07.6073425+08:00;True|2022-10-28T14:16:46.4140421+08:00;True|2022-10-28T14:06:54.5820895+08:00;True|2022-10-28T14:06:20.4765666+08:00;True|2022-10-28T14:00:01.8073205+08:00;True|2022-10-28T13:56:40.6320465+08:00;True|2022-10-28T12:52:46.3086338+08:00;True|2022-10-28T11:31:08.7626713+08:00;True|2022-10-28T11:28:25.3391022+08:00;True|2022-10-27T17:13:49.3276407+08:00;True|2022-10-27T17:09:49.3362372+08:00;True|2022-10-27T14:49:20.9922482+08:00;True|2022-10-27T11:08:32.7803317+08:00;True|2022-10-27T09:19:17.9537933+08:00;True|2022-10-27T09:14:00.6751533+08:00;True|2022-10-27T09:08:05.5814368+08:00;True|2022-10-27T09:04:21.1435873+08:00;True|2022-10-26T16:47:26.8255243+08:00;True|2022-10-26T16:29:26.3405800+08:00;False|2022-10-26T16:28:18.6237074+08:00;True|2022-10-26T14:29:39.8852546+08:00;True|2022-10-26T14:11:14.0537705+08:00;True|2022-10-26T10:56:16.7897290+08:00;True|2022-10-26T10:29:02.5303566+08:00;True|2022-10-26T10:28:29.9192643+08:00;True|2022-10-26T10:28:16.5901050+08:00;True|2022-10-26T10:22:02.2019236+08:00;True|2022-10-26T10:17:08.3009992+08:00;True|2022-10-20T18:19:28.0452517+08:00;True|2022-10-20T18:14:36.1031080+08:00;True|2022-10-20T16:49:08.1312509+08:00;True|2022-10-20T10:11:30.3988252+08:00;True|2022-10-20T09:52:55.2879279+08:00;True|2022-10-20T09:07:20.5119842+08:00;True|2022-10-20T08:55:23.9003542+08:00;True|2022-10-19T17:56:47.0600040+08:00;True|2022-10-19T17:26:22.4420642+08:00;True|2022-10-19T17:15:09.2591171+08:00;True|2022-10-19T17:00:58.0407123+08:00;True|2022-10-19T16:53:20.8393084+08:00;True|2022-10-19T16:49:09.6859302+08:00;True|2022-10-19T16:40:53.2090492+08:00;True|2022-10-19T16:35:02.0381742+08:00;True|2022-10-19T16:30:49.8415090+08:00;True|2022-10-19T16:05:14.3522346+08:00;True|2022-10-19T15:50:08.9509925+08:00;True|2022-10-19T15:36:28.6015003+08:00;True|2022-10-19T15:33:26.7861204+08:00;True|2022-10-19T15:27:02.8006070+08:00;True|2022-10-19T15:16:31.4065993+08:00;True|2022-10-19T15:14:34.8724996+08:00;True|2022-10-18T18:12:15.5930366+08:00;True|2022-10-18T18:06:54.1679240+08:00;True|2022-10-18T18:02:12.3473981+08:00;True|2022-10-18T17:39:10.7104222+08:00;True|2022-10-18T17:35:14.3679319+08:00;True|2022-10-18T17:32:18.8020932+08:00;True|2022-10-18T17:09:35.5170795+08:00;True|2022-10-18T17:02:58.3933082+08:00;True|2022-10-18T16:46:19.9647705+08:00;True|2022-10-18T11:28:23.1151472+08:00;True|2022-10-17T16:44:34.9653103+08:00;True|2022-10-16T01:53:49.3818533+08:00;True|2022-10-16T01:46:58.7626854+08:00;True|2022-10-16T01:35:19.3037353+08:00;True|2022-10-15T14:31:57.4587818+08:00;True|2022-10-15T14:22:52.4245457+08:00;True|2022-10-14T15:32:59.8175195+08:00;True|2022-10-14T15:24:23.9954226+08:00;True|2022-10-14T15:24:02.4438281+08:00;True|2022-10-14T11:07:04.2629220+08:00;True|2022-10-13T16:44:07.8507864+08:00;True|2022-10-13T16:34:20.4037866+08:00;True|2022-10-13T15:07:55.6527739+08:00;True|2022-10-12T14:59:51.4425162+08:00;True|2022-10-12T11:14:22.2463823+08:00;True|2022-10-12T08:53:16.5351204+08:00;True|2022-10-12T08:24:28.2157523+08:00;False|2022-10-12T08:23:56.2743080+08:00;True|2022-10-12T08:12:38.4791356+08:00;False|2022-10-12T08:12:14.9860966+08:00;True|2022-10-12T08:08:31.1437091+08:00;True|2022-10-11T18:10:13.8327911+08:00;True|2022-10-10T16:21:33.7622381+08:00;True|2022-10-10T09:56:53.1134309+08:00;False|2022-10-10T09:56:18.9153013+08:00;True|2022-10-10T08:46:48.2842004+08:00;True|2022-10-09T16:25:10.1147763+08:00;True|2022-10-08T16:54:50.7779806+08:00;True|2022-10-08T16:35:23.1960956+08:00;True|2022-10-08T16:06:16.5635598+08:00;True|2022-10-08T16:01:24.5889763+08:00;True|2022-10-08T13:11:34.8631266+08:00;True|2022-09-29T15:59:52.7749027+08:00;True|2022-09-28T18:13:25.7208132+08:00;True|2022-09-27T14:01:52.5493804+08:00;True|2022-09-27T08:32:48.3460557+08:00;True|2022-09-23T16:12:28.0271396+08:00;True|2022-09-23T13:50:16.4039745+08:00;True|2022-09-23T13:49:02.0464589+08:00;True|2022-09-23T13:47:12.4458913+08:00;True|2022-09-23T13:42:58.0795715+08:00;True|2022-09-23T13:32:34.2909297+08:00;True|2022-09-23T13:31:14.5573692+08:00;True|2022-09-23T13:27:32.1842906+08:00;True|2022-09-23T12:50:51.2811202+08:00;True|2022-09-22T17:31:41.3605592+08:00;True|2022-09-22T17:25:44.2386416+08:00;True|2022-09-22T09:47:22.9767826+08:00;True|2022-09-16T14:31:58.5334673+08:00;True|2022-09-16T09:04:53.3449040+08:00;True|2022-09-15T15:15:18.3159768+08:00;True|2022-09-14T17:46:23.0171281+08:00;True|2022-09-14T17:43:44.4370239+08:00;True|2022-09-14T17:34:30.3167863+08:00;True|2022-09-14T17:33:00.5148855+08:00;True|2022-09-14T17:06:32.0879029+08:00;True|2022-09-14T16:50:12.7189783+08:00;True|2022-09-14T16:47:48.3868826+08:00;True|2022-09-14T16:42:35.3830356+08:00;True|2022-09-14T16:41:37.8545801+08:00;True|2022-09-14T16:36:47.0944090+08:00;True|2022-09-14T16:26:00.8638173+08:00;True|2022-09-14T16:13:43.6329252+08:00;True|2022-09-14T16:04:16.8093275+08:00;True|2022-09-14T16:02:54.4702614+08:00;True|2022-09-14T15:57:15.9623104+08:00;True|2022-09-14T15:54:23.8745601+08:00;True|2022-09-14T15:49:40.1730864+08:00;True|2022-09-14T15:42:08.2811334+08:00;True|2022-09-14T15:26:40.0417771+08:00;True|2022-09-14T15:24:30.2187269+08:00;True|2022-09-14T15:16:30.3856771+08:00;True|2022-09-14T15:09:22.4313367+08:00;True|2022-09-14T14:59:14.3795036+08:00;True|2022-09-14T14:53:26.8923244+08:00;True|2022-09-14T14:44:00.6688344+08:00;True|2022-09-14T14:41:53.3908108+08:00;True|2022-09-14T14:40:40.3787118+08:00;True|2022-09-14T14:28:39.2273279+08:00;True|2022-09-14T14:27:13.3566861+08:00;True|2022-09-14T14:25:25.4360688+08:00;True|2022-09-14T14:20:42.9734032+08:00;True|2022-09-14T13:51:39.1303401+08:00;True|2022-09-14T13:25:34.8906041+08:00;True|2022-09-14T13:19:28.9172079+08:00;True|2022-09-14T13:18:09.5900815+08:00;True|2022-09-14T10:58:58.0910068+08:00;True|2022-09-14T10:57:11.4834444+08:00;True|2022-09-14T10:45:39.8943674+08:00;True|2022-09-14T10:38:15.2282286+08:00;True|2022-09-14T10:36:54.8259640+08:00;True|2022-09-14T10:14:12.1218790+08:00;True|2022-09-14T10:13:20.0625618+08:00;True|2022-09-14T10:10:15.3538379+08:00;True|2022-09-14T10:07:09.4796434+08:00;True|2022-09-14T10:06:02.0382235+08:00;True|2022-09-14T09:57:12.0082796+08:00;True|2022-09-14T09:52:29.4689029+08:00;True|2022-09-14T09:47:26.7205193+08:00;True|2022-09-14T09:38:56.4089520+08:00;True|2022-09-14T09:32:34.9863473+08:00;True|2022-09-12T13:07:40.5119225+08:00;True|2022-09-09T15:21:48.4251654+08:00;True|2022-09-09T14:45:54.9315147+08:00;True|2022-09-09T11:01:18.2619729+08:00;True|2022-09-09T09:35:40.9779148+08:00;True|2022-09-09T09:26:51.9854326+08:00;True|2022-09-09T09:11:48.8023373+08:00;True|2022-09-09T09:05:45.5528883+08:00;True|2022-09-08T17:47:35.2628987+08:00;True|2022-09-08T17:43:32.6700813+08:00;True|2022-09-08T17:01:23.6259930+08:00;True|2022-09-08T16:55:57.2305777+08:00;True|2022-09-08T16:35:37.3631720+08:00;True|2022-09-08T16:19:13.9122228+08:00;True|2022-09-08T16:04:07.7348285+08:00;True|2022-09-08T16:00:49.9961701+08:00;True|2022-09-08T15:16:03.0110619+08:00;True|2022-09-08T10:19:46.2872822+08:00;True|2022-09-08T10:11:15.5386438+08:00;True|2022-09-08T08:19:02.5242539+08:00;True|2022-09-08T08:18:11.7308721+08:00;True|2022-09-07T11:39:27.2463573+08:00;True|2022-09-07T10:40:57.8877369+08:00;True|2022-09-07T10:37:10.1517098+08:00;True|2022-09-07T10:30:08.7782107+08:00;True|2022-09-07T10:23:52.8534200+08:00;True|2022-09-07T10:09:31.6994230+08:00;True|2022-09-07T10:01:16.2683112+08:00;True|2022-09-07T09:51:47.6282546+08:00;True|2022-09-06T19:11:45.1701913+08:00;True|2022-09-06T18:29:29.2671862+08:00;True|2022-09-06T16:41:04.2719822+08:00;True|2022-09-06T14:17:31.6896132+08:00;True|2022-09-06T13:14:39.9657702+08:00;True|2022-09-05T13:34:47.0627238+08:00;True|2022-09-05T11:07:59.2835592+08:00;True|2022-09-02T14:01:56.1233378+08:00;True|2022-08-31T23:40:49.5468281+08:00;True|2022-08-31T22:15:50.0388123+08:00;True|2022-08-31T19:20:24.7693742+08:00;True|2022-08-31T19:00:06.8271626+08:00;True|2022-08-31T18:45:08.6483670+08:00;True|2022-08-31T16:59:34.8244511+08:00;True|2022-08-31T15:39:51.0653019+08:00;True|2022-08-31T15:25:32.5277796+08:00;True|2022-08-31T13:31:48.5734692+08:00;True|2022-08-31T12:59:02.1022191+08:00;True|2022-08-31T10:06:03.2043884+08:00;True|2022-08-30T17:36:34.5932064+08:00;True|2022-08-30T17:18:12.4582841+08:00;True|2022-08-30T12:55:16.4084322+08:00;True|2022-08-30T10:12:08.0975252+08:00;True|2022-08-30T09:12:46.2845546+08:00;True|2022-08-30T08:58:47.8389468+08:00;True|2022-08-29T17:21:17.7779579+08:00;True|2022-08-29T17:17:49.5334583+08:00;True|2022-08-29T16:53:46.6019453+08:00;True|2022-08-29T16:46:50.8158231+08:00;True|2022-08-29T12:25:19.0140888+08:00;True|2022-08-26T17:02:52.4614637+08:00;True|2022-08-26T16:52:47.8585471+08:00;True|2022-08-26T16:47:02.5766798+08:00;True|2022-08-26T16:36:15.5793109+08:00;True|2022-08-26T16:15:55.1795297+08:00;True|2022-08-26T16:00:22.2697361+08:00;False|2022-08-26T15:58:16.7347649+08:00;True|2022-08-26T15:22:29.6367466+08:00;True|2022-08-25T20:02:24.4685508+08:00;True|2022-08-25T19:50:42.8601696+08:00;True|2022-08-25T15:56:20.3615518+08:00;True|2022-08-25T15:48:16.9923580+08:00;True|2022-08-25T15:27:07.9474640+08:00;True|2022-08-25T13:11:36.9626131+08:00;True|2022-08-24T14:10:58.2790665+08:00;True|2022-08-24T11:43:10.4463552+08:00;True|2022-08-24T08:02:17.9871411+08:00;True|2022-08-23T22:50:41.0238571+08:00;True|2022-08-23T22:16:20.9249814+08:00;True|2022-08-23T21:59:21.1909300+08:00;True|2022-08-23T21:50:40.8106496+08:00;True|2022-08-23T21:06:55.6611505+08:00;True|2022-08-23T19:49:07.0507418+08:00;True|2022-08-23T19:03:15.9808046+08:00;True|2022-08-23T18:58:57.1700899+08:00;True|2022-08-23T18:54:26.8058591+08:00;True|2022-08-23T18:45:39.1928602+08:00;True|2022-08-23T17:32:10.6125039+08:00;True|2022-08-23T15:58:34.9205174+08:00;True|2022-08-23T15:49:21.3383764+08:00;True|2022-08-23T15:14:21.0775398+08:00;True|2022-08-23T15:04:07.8829410+08:00;True|2022-08-23T14:59:17.5143895+08:00;True|2022-08-23T14:55:17.0069050+08:00;True|2022-08-23T14:41:41.0884731+08:00;True|2022-08-23T14:41:06.5045325+08:00;True|2022-08-23T14:28:54.7390570+08:00;True|2022-08-23T13:56:59.3670549+08:00;True|2022-08-23T13:56:38.8588174+08:00;True|2022-08-22T20:48:56.2180227+08:00;True|2022-08-22T19:07:12.1093584+08:00;True|2022-08-22T19:04:07.7837887+08:00;True|2022-08-22T14:38:00.9342884+08:00;True|2022-08-22T10:59:23.2073567+08:00;True|2022-08-22T10:53:58.0920733+08:00;True|2022-08-22T10:53:10.2446944+08:00;True|2022-08-22T10:43:35.3791396+08:00;True|2022-08-18T09:45:46.4643950+08:00;True|2022-08-18T09:40:55.2601145+08:00;True|2022-08-16T16:17:14.3399134+08:00;True|2022-08-15T17:58:16.1460123+08:00;True|2022-08-15T17:55:55.7137518+08:00;True|2022-08-15T17:44:37.6024482+08:00;True|2022-08-15T17:44:21.9583041+08:00;True|2022-08-15T17:43:23.1305690+08:00;True|2022-08-15T17:29:31.1670490+08:00;True|2022-08-15T17:26:42.9269470+08:00;True|2022-08-15T17:23:27.0940168+08:00;True|2022-08-15T17:07:32.9192045+08:00;True|2022-08-15T16:47:03.8611076+08:00;True|2022-08-15T16:41:50.6843705+08:00;True|2022-08-15T16:38:26.7407413+08:00;True|2022-08-15T16:31:49.0805578+08:00;True|2022-08-15T16:27:33.6712012+08:00;True|2022-08-15T16:24:35.1042794+08:00;True|2022-08-15T16:21:57.2757683+08:00;True|2022-08-15T16:18:17.3545368+08:00;True|2022-08-15T16:15:04.2645412+08:00;True|2022-08-15T14:44:09.3078026+08:00;True|2022-08-15T11:20:09.2930712+08:00;True|2022-08-15T10:42:12.2991587+08:00;True|2022-08-15T10:41:38.3711025+08:00;True|2022-08-15T10:19:06.9974383+08:00;True|2022-08-12T17:15:09.2133281+08:00;True|2022-08-12T10:48:05.8776009+08:00;True|2022-08-12T10:26:16.4183447+08:00;True|2022-08-12T08:33:01.9502005+08:00;True|2022-08-11T09:06:08.8394009+08:00;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;True|2022-08-04T15:11:16.7054147+08:00;True|2022-08-04T14:53:52.7239932+08:00;True|2022-08-04T14:48:35.6115863+08:00;True|2022-08-04T14:39:16.1113507+08:00;True|2022-08-04T12:26:39.4998322+08:00;True|2022-08-04T10:34:23.9626503+08:00;True|2022-08-04T08:12:51.4305728+08:00;True|2022-08-03T15:43:09.2317512+08:00;True|2022-08-02T19:17:55.0460145+08:00;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
+    <History>True|2023-04-21T02:10:47.7408362Z;True|2023-04-19T10:05:32.2323010+08:00;True|2023-04-19T08:47:02.1943920+08:00;True|2023-04-19T08:36:23.7737952+08:00;True|2023-04-19T08:27:33.3238877+08:00;True|2023-04-13T16:59:39.7958192+08:00;True|2023-04-13T16:34:45.9951848+08:00;True|2023-04-13T16:27:59.7386867+08:00;False|2023-04-13T16:23:36.7558189+08:00;True|2023-04-12T16:31:46.6724339+08:00;True|2023-04-12T16:23:35.3177339+08:00;True|2023-04-11T12:49:48.0246851+08:00;True|2023-04-11T12:46:56.0293166+08:00;True|2023-04-11T11:13:00.9841554+08:00;True|2023-04-10T16:53:41.8964649+08:00;True|2023-04-07T08:30:18.4653189+08:00;True|2023-04-06T17:29:55.4388629+08:00;True|2023-04-06T16:45:39.5573964+08:00;True|2023-04-04T15:41:18.1582540+08:00;True|2023-04-04T15:33:47.4319210+08:00;True|2023-04-04T15:24:23.0417772+08:00;True|2023-04-04T15:05:34.8694589+08:00;True|2023-04-04T13:51:06.6709099+08:00;True|2023-04-04T08:51:53.0379573+08:00;True|2023-04-04T08:26:14.1581736+08:00;True|2023-04-04T08:09:40.3919185+08:00;True|2023-04-04T08:03:47.3773358+08:00;True|2023-03-29T10:59:42.8557249+08:00;True|2023-03-29T10:32:37.1829423+08:00;True|2023-03-24T15:23:09.2950637+08:00;True|2023-03-22T17:52:59.0162624+08:00;True|2023-03-22T17:44:51.7892593+08:00;True|2023-03-22T17:41:41.7366750+08:00;True|2023-03-22T17:30:45.1983751+08:00;True|2023-03-22T17:25:48.0681920+08:00;True|2023-03-22T17:16:16.5578143+08:00;True|2023-03-22T16:36:15.7695476+08:00;True|2023-03-22T10:21:58.5145068+08:00;True|2023-03-20T17:21:47.4459321+08:00;True|2023-03-20T17:21:27.0468975+08:00;True|2023-03-20T16:58:02.8681774+08:00;True|2023-03-20T16:34:42.1058692+08:00;True|2023-03-20T16:23:47.7801897+08:00;True|2023-03-03T08:56:05.4730255+08:00;True|2023-03-02T16:23:31.6756396+08:00;True|2023-03-01T15:52:28.2849007+08:00;True|2023-03-01T15:35:55.8647024+08:00;True|2023-03-01T15:21:23.8133690+08:00;True|2023-02-28T16:00:01.5165754+08:00;True|2023-02-28T14:53:18.0954404+08:00;True|2023-02-28T14:45:14.0183407+08:00;True|2023-02-15T15:10:18.1493103+08:00;True|2023-02-15T14:45:42.3134512+08:00;True|2023-02-15T14:38:34.6207896+08:00;True|2023-02-15T14:28:47.3494779+08:00;True|2023-02-15T14:06:19.8843387+08:00;True|2023-02-15T12:37:06.8372351+08:00;True|2023-02-15T09:18:28.2740085+08:00;True|2023-02-14T16:38:24.2037803+08:00;False|2023-02-14T16:35:10.9291528+08:00;True|2023-02-13T14:56:38.5856100+08:00;True|2023-02-13T12:50:51.9358444+08:00;True|2023-02-11T10:08:39.6831781+08:00;True|2023-02-11T09:54:32.8160454+08:00;True|2023-02-11T09:54:21.9971913+08:00;True|2023-02-11T02:11:17.5904204+08:00;True|2023-02-11T02:04:19.4213456+08:00;True|2023-02-10T13:03:57.4443981+08:00;True|2023-02-09T21:55:13.8322950+08:00;True|2023-02-09T21:34:49.3120350+08:00;True|2023-02-07T10:08:39.5582710+08:00;True|2023-02-03T08:25:45.7718782+08:00;True|2023-01-30T12:40:37.6820386+08:00;True|2023-01-30T08:45:34.0836363+08:00;True|2023-01-11T10:13:36.4366183+08:00;True|2023-01-11T09:37:39.6235517+08:00;True|2023-01-11T09:37:05.7608583+08:00;True|2023-01-11T09:14:36.0337347+08:00;True|2023-01-10T16:29:20.9791940+08:00;True|2023-01-10T16:09:20.2950245+08:00;True|2023-01-10T14:43:30.8069585+08:00;True|2023-01-10T14:43:14.0392269+08:00;True|2023-01-10T13:30:42.7077204+08:00;True|2023-01-10T13:09:48.9547948+08:00;True|2023-01-10T12:18:02.7207328+08:00;True|2023-01-06T16:33:28.2963933+08:00;True|2023-01-06T16:27:31.9342782+08:00;True|2023-01-06T16:23:33.0323708+08:00;True|2023-01-06T14:06:25.7389071+08:00;True|2023-01-06T13:50:39.1399992+08:00;True|2023-01-06T11:55:24.5609585+08:00;True|2023-01-06T11:08:53.3862603+08:00;True|2023-01-06T10:35:25.4696330+08:00;True|2023-01-06T10:27:54.7687528+08:00;True|2023-01-06T09:34:11.0798818+08:00;True|2023-01-05T16:47:28.7063631+08:00;True|2023-01-04T15:09:12.6813075+08:00;True|2023-01-04T15:06:20.1259155+08:00;True|2022-12-27T15:22:00.8719157+08:00;True|2022-12-27T15:18:56.4183337+08:00;True|2022-12-27T11:13:35.0250651+08:00;True|2022-12-26T14:12:52.3868526+08:00;True|2022-12-26T10:35:25.9712626+08:00;True|2022-12-20T09:02:47.7097031+08:00;True|2022-12-19T14:40:38.5851369+08:00;True|2022-12-14T12:51:44.0399559+08:00;True|2022-12-14T10:59:36.5250039+08:00;True|2022-12-14T10:54:23.0704819+08:00;True|2022-12-14T10:54:11.5744699+08:00;True|2022-12-14T10:53:33.7127244+08:00;True|2022-12-14T10:47:34.9597966+08:00;True|2022-12-08T15:06:12.8416810+08:00;True|2022-12-07T16:44:49.7931793+08:00;True|2022-11-26T11:05:21.2315179+08:00;True|2022-11-26T10:56:49.3021067+08:00;True|2022-11-25T13:00:54.9138172+08:00;True|2022-11-25T12:43:01.0212012+08:00;True|2022-11-25T12:36:22.2745198+08:00;True|2022-11-25T12:33:27.1942331+08:00;True|2022-11-25T11:07:23.5860394+08:00;True|2022-11-25T10:36:26.1052993+08:00;True|2022-11-24T16:50:49.0061385+08:00;True|2022-11-24T16:47:23.6152654+08:00;True|2022-11-24T15:36:20.0275278+08:00;True|2022-11-24T15:25:29.2391337+08:00;True|2022-11-24T15:25:19.7988304+08:00;True|2022-11-24T15:06:48.3860466+08:00;True|2022-11-24T14:52:24.7879819+08:00;True|2022-11-24T10:12:41.0992839+08:00;True|2022-11-21T15:13:29.3527873+08:00;True|2022-11-21T10:42:28.8298039+08:00;True|2022-11-18T11:10:34.9917493+08:00;True|2022-11-18T11:10:11.7210670+08:00;True|2022-11-18T10:59:20.7515137+08:00;True|2022-11-18T10:52:33.2724652+08:00;True|2022-11-18T09:22:10.0215858+08:00;True|2022-11-18T09:16:35.0644453+08:00;True|2022-11-16T10:30:33.9013342+08:00;True|2022-11-16T09:55:08.7555656+08:00;True|2022-10-29T11:48:17.9164445+08:00;True|2022-10-29T10:27:39.6224331+08:00;True|2022-10-29T09:25:19.4865788+08:00;True|2022-10-29T09:01:58.2237798+08:00;True|2022-10-29T08:57:17.1749942+08:00;True|2022-10-28T14:44:10.4595607+08:00;True|2022-10-28T14:41:10.8050513+08:00;True|2022-10-28T14:39:02.0096359+08:00;True|2022-10-28T14:27:52.1679095+08:00;True|2022-10-28T14:19:07.6073425+08:00;True|2022-10-28T14:16:46.4140421+08:00;True|2022-10-28T14:06:54.5820895+08:00;True|2022-10-28T14:06:20.4765666+08:00;True|2022-10-28T14:00:01.8073205+08:00;True|2022-10-28T13:56:40.6320465+08:00;True|2022-10-28T12:52:46.3086338+08:00;True|2022-10-28T11:31:08.7626713+08:00;True|2022-10-28T11:28:25.3391022+08:00;True|2022-10-27T17:13:49.3276407+08:00;True|2022-10-27T17:09:49.3362372+08:00;True|2022-10-27T14:49:20.9922482+08:00;True|2022-10-27T11:08:32.7803317+08:00;True|2022-10-27T09:19:17.9537933+08:00;True|2022-10-27T09:14:00.6751533+08:00;True|2022-10-27T09:08:05.5814368+08:00;True|2022-10-27T09:04:21.1435873+08:00;True|2022-10-26T16:47:26.8255243+08:00;True|2022-10-26T16:29:26.3405800+08:00;False|2022-10-26T16:28:18.6237074+08:00;True|2022-10-26T14:29:39.8852546+08:00;True|2022-10-26T14:11:14.0537705+08:00;True|2022-10-26T10:56:16.7897290+08:00;True|2022-10-26T10:29:02.5303566+08:00;True|2022-10-26T10:28:29.9192643+08:00;True|2022-10-26T10:28:16.5901050+08:00;True|2022-10-26T10:22:02.2019236+08:00;True|2022-10-26T10:17:08.3009992+08:00;True|2022-10-20T18:19:28.0452517+08:00;True|2022-10-20T18:14:36.1031080+08:00;True|2022-10-20T16:49:08.1312509+08:00;True|2022-10-20T10:11:30.3988252+08:00;True|2022-10-20T09:52:55.2879279+08:00;True|2022-10-20T09:07:20.5119842+08:00;True|2022-10-20T08:55:23.9003542+08:00;True|2022-10-19T17:56:47.0600040+08:00;True|2022-10-19T17:26:22.4420642+08:00;True|2022-10-19T17:15:09.2591171+08:00;True|2022-10-19T17:00:58.0407123+08:00;True|2022-10-19T16:53:20.8393084+08:00;True|2022-10-19T16:49:09.6859302+08:00;True|2022-10-19T16:40:53.2090492+08:00;True|2022-10-19T16:35:02.0381742+08:00;True|2022-10-19T16:30:49.8415090+08:00;True|2022-10-19T16:05:14.3522346+08:00;True|2022-10-19T15:50:08.9509925+08:00;True|2022-10-19T15:36:28.6015003+08:00;True|2022-10-19T15:33:26.7861204+08:00;True|2022-10-19T15:27:02.8006070+08:00;True|2022-10-19T15:16:31.4065993+08:00;True|2022-10-19T15:14:34.8724996+08:00;True|2022-10-18T18:12:15.5930366+08:00;True|2022-10-18T18:06:54.1679240+08:00;True|2022-10-18T18:02:12.3473981+08:00;True|2022-10-18T17:39:10.7104222+08:00;True|2022-10-18T17:35:14.3679319+08:00;True|2022-10-18T17:32:18.8020932+08:00;True|2022-10-18T17:09:35.5170795+08:00;True|2022-10-18T17:02:58.3933082+08:00;True|2022-10-18T16:46:19.9647705+08:00;True|2022-10-18T11:28:23.1151472+08:00;True|2022-10-17T16:44:34.9653103+08:00;True|2022-10-16T01:53:49.3818533+08:00;True|2022-10-16T01:46:58.7626854+08:00;True|2022-10-16T01:35:19.3037353+08:00;True|2022-10-15T14:31:57.4587818+08:00;True|2022-10-15T14:22:52.4245457+08:00;True|2022-10-14T15:32:59.8175195+08:00;True|2022-10-14T15:24:23.9954226+08:00;True|2022-10-14T15:24:02.4438281+08:00;True|2022-10-14T11:07:04.2629220+08:00;True|2022-10-13T16:44:07.8507864+08:00;True|2022-10-13T16:34:20.4037866+08:00;True|2022-10-13T15:07:55.6527739+08:00;True|2022-10-12T14:59:51.4425162+08:00;True|2022-10-12T11:14:22.2463823+08:00;True|2022-10-12T08:53:16.5351204+08:00;True|2022-10-12T08:24:28.2157523+08:00;False|2022-10-12T08:23:56.2743080+08:00;True|2022-10-12T08:12:38.4791356+08:00;False|2022-10-12T08:12:14.9860966+08:00;True|2022-10-12T08:08:31.1437091+08:00;True|2022-10-11T18:10:13.8327911+08:00;True|2022-10-10T16:21:33.7622381+08:00;True|2022-10-10T09:56:53.1134309+08:00;False|2022-10-10T09:56:18.9153013+08:00;True|2022-10-10T08:46:48.2842004+08:00;True|2022-10-09T16:25:10.1147763+08:00;True|2022-10-08T16:54:50.7779806+08:00;True|2022-10-08T16:35:23.1960956+08:00;True|2022-10-08T16:06:16.5635598+08:00;True|2022-10-08T16:01:24.5889763+08:00;True|2022-10-08T13:11:34.8631266+08:00;True|2022-09-29T15:59:52.7749027+08:00;True|2022-09-28T18:13:25.7208132+08:00;True|2022-09-27T14:01:52.5493804+08:00;True|2022-09-27T08:32:48.3460557+08:00;True|2022-09-23T16:12:28.0271396+08:00;True|2022-09-23T13:50:16.4039745+08:00;True|2022-09-23T13:49:02.0464589+08:00;True|2022-09-23T13:47:12.4458913+08:00;True|2022-09-23T13:42:58.0795715+08:00;True|2022-09-23T13:32:34.2909297+08:00;True|2022-09-23T13:31:14.5573692+08:00;True|2022-09-23T13:27:32.1842906+08:00;True|2022-09-23T12:50:51.2811202+08:00;True|2022-09-22T17:31:41.3605592+08:00;True|2022-09-22T17:25:44.2386416+08:00;True|2022-09-22T09:47:22.9767826+08:00;True|2022-09-16T14:31:58.5334673+08:00;True|2022-09-16T09:04:53.3449040+08:00;True|2022-09-15T15:15:18.3159768+08:00;True|2022-09-14T17:46:23.0171281+08:00;True|2022-09-14T17:43:44.4370239+08:00;True|2022-09-14T17:34:30.3167863+08:00;True|2022-09-14T17:33:00.5148855+08:00;True|2022-09-14T17:06:32.0879029+08:00;True|2022-09-14T16:50:12.7189783+08:00;True|2022-09-14T16:47:48.3868826+08:00;True|2022-09-14T16:42:35.3830356+08:00;True|2022-09-14T16:41:37.8545801+08:00;True|2022-09-14T16:36:47.0944090+08:00;True|2022-09-14T16:26:00.8638173+08:00;True|2022-09-14T16:13:43.6329252+08:00;True|2022-09-14T16:04:16.8093275+08:00;True|2022-09-14T16:02:54.4702614+08:00;True|2022-09-14T15:57:15.9623104+08:00;True|2022-09-14T15:54:23.8745601+08:00;True|2022-09-14T15:49:40.1730864+08:00;True|2022-09-14T15:42:08.2811334+08:00;True|2022-09-14T15:26:40.0417771+08:00;True|2022-09-14T15:24:30.2187269+08:00;True|2022-09-14T15:16:30.3856771+08:00;True|2022-09-14T15:09:22.4313367+08:00;True|2022-09-14T14:59:14.3795036+08:00;True|2022-09-14T14:53:26.8923244+08:00;True|2022-09-14T14:44:00.6688344+08:00;True|2022-09-14T14:41:53.3908108+08:00;True|2022-09-14T14:40:40.3787118+08:00;True|2022-09-14T14:28:39.2273279+08:00;True|2022-09-14T14:27:13.3566861+08:00;True|2022-09-14T14:25:25.4360688+08:00;True|2022-09-14T14:20:42.9734032+08:00;True|2022-09-14T13:51:39.1303401+08:00;True|2022-09-14T13:25:34.8906041+08:00;True|2022-09-14T13:19:28.9172079+08:00;True|2022-09-14T13:18:09.5900815+08:00;True|2022-09-14T10:58:58.0910068+08:00;True|2022-09-14T10:57:11.4834444+08:00;True|2022-09-14T10:45:39.8943674+08:00;True|2022-09-14T10:38:15.2282286+08:00;True|2022-09-14T10:36:54.8259640+08:00;True|2022-09-14T10:14:12.1218790+08:00;True|2022-09-14T10:13:20.0625618+08:00;True|2022-09-14T10:10:15.3538379+08:00;True|2022-09-14T10:07:09.4796434+08:00;True|2022-09-14T10:06:02.0382235+08:00;True|2022-09-14T09:57:12.0082796+08:00;True|2022-09-14T09:52:29.4689029+08:00;True|2022-09-14T09:47:26.7205193+08:00;True|2022-09-14T09:38:56.4089520+08:00;True|2022-09-14T09:32:34.9863473+08:00;True|2022-09-12T13:07:40.5119225+08:00;True|2022-09-09T15:21:48.4251654+08:00;True|2022-09-09T14:45:54.9315147+08:00;True|2022-09-09T11:01:18.2619729+08:00;True|2022-09-09T09:35:40.9779148+08:00;True|2022-09-09T09:26:51.9854326+08:00;True|2022-09-09T09:11:48.8023373+08:00;True|2022-09-09T09:05:45.5528883+08:00;True|2022-09-08T17:47:35.2628987+08:00;True|2022-09-08T17:43:32.6700813+08:00;True|2022-09-08T17:01:23.6259930+08:00;True|2022-09-08T16:55:57.2305777+08:00;True|2022-09-08T16:35:37.3631720+08:00;True|2022-09-08T16:19:13.9122228+08:00;True|2022-09-08T16:04:07.7348285+08:00;True|2022-09-08T16:00:49.9961701+08:00;True|2022-09-08T15:16:03.0110619+08:00;True|2022-09-08T10:19:46.2872822+08:00;True|2022-09-08T10:11:15.5386438+08:00;True|2022-09-08T08:19:02.5242539+08:00;True|2022-09-08T08:18:11.7308721+08:00;True|2022-09-07T11:39:27.2463573+08:00;True|2022-09-07T10:40:57.8877369+08:00;True|2022-09-07T10:37:10.1517098+08:00;True|2022-09-07T10:30:08.7782107+08:00;True|2022-09-07T10:23:52.8534200+08:00;True|2022-09-07T10:09:31.6994230+08:00;True|2022-09-07T10:01:16.2683112+08:00;True|2022-09-07T09:51:47.6282546+08:00;True|2022-09-06T19:11:45.1701913+08:00;True|2022-09-06T18:29:29.2671862+08:00;True|2022-09-06T16:41:04.2719822+08:00;True|2022-09-06T14:17:31.6896132+08:00;True|2022-09-06T13:14:39.9657702+08:00;True|2022-09-05T13:34:47.0627238+08:00;True|2022-09-05T11:07:59.2835592+08:00;True|2022-09-02T14:01:56.1233378+08:00;True|2022-08-31T23:40:49.5468281+08:00;True|2022-08-31T22:15:50.0388123+08:00;True|2022-08-31T19:20:24.7693742+08:00;True|2022-08-31T19:00:06.8271626+08:00;True|2022-08-31T18:45:08.6483670+08:00;True|2022-08-31T16:59:34.8244511+08:00;True|2022-08-31T15:39:51.0653019+08:00;True|2022-08-31T15:25:32.5277796+08:00;True|2022-08-31T13:31:48.5734692+08:00;True|2022-08-31T12:59:02.1022191+08:00;True|2022-08-31T10:06:03.2043884+08:00;True|2022-08-30T17:36:34.5932064+08:00;True|2022-08-30T17:18:12.4582841+08:00;True|2022-08-30T12:55:16.4084322+08:00;True|2022-08-30T10:12:08.0975252+08:00;True|2022-08-30T09:12:46.2845546+08:00;True|2022-08-30T08:58:47.8389468+08:00;True|2022-08-29T17:21:17.7779579+08:00;True|2022-08-29T17:17:49.5334583+08:00;True|2022-08-29T16:53:46.6019453+08:00;True|2022-08-29T16:46:50.8158231+08:00;True|2022-08-29T12:25:19.0140888+08:00;True|2022-08-26T17:02:52.4614637+08:00;True|2022-08-26T16:52:47.8585471+08:00;True|2022-08-26T16:47:02.5766798+08:00;True|2022-08-26T16:36:15.5793109+08:00;True|2022-08-26T16:15:55.1795297+08:00;True|2022-08-26T16:00:22.2697361+08:00;False|2022-08-26T15:58:16.7347649+08:00;True|2022-08-26T15:22:29.6367466+08:00;True|2022-08-25T20:02:24.4685508+08:00;True|2022-08-25T19:50:42.8601696+08:00;True|2022-08-25T15:56:20.3615518+08:00;True|2022-08-25T15:48:16.9923580+08:00;True|2022-08-25T15:27:07.9474640+08:00;True|2022-08-25T13:11:36.9626131+08:00;True|2022-08-24T14:10:58.2790665+08:00;True|2022-08-24T11:43:10.4463552+08:00;True|2022-08-24T08:02:17.9871411+08:00;True|2022-08-23T22:50:41.0238571+08:00;True|2022-08-23T22:16:20.9249814+08:00;True|2022-08-23T21:59:21.1909300+08:00;True|2022-08-23T21:50:40.8106496+08:00;True|2022-08-23T21:06:55.6611505+08:00;True|2022-08-23T19:49:07.0507418+08:00;True|2022-08-23T19:03:15.9808046+08:00;True|2022-08-23T18:58:57.1700899+08:00;True|2022-08-23T18:54:26.8058591+08:00;True|2022-08-23T18:45:39.1928602+08:00;True|2022-08-23T17:32:10.6125039+08:00;True|2022-08-23T15:58:34.9205174+08:00;True|2022-08-23T15:49:21.3383764+08:00;True|2022-08-23T15:14:21.0775398+08:00;True|2022-08-23T15:04:07.8829410+08:00;True|2022-08-23T14:59:17.5143895+08:00;True|2022-08-23T14:55:17.0069050+08:00;True|2022-08-23T14:41:41.0884731+08:00;True|2022-08-23T14:41:06.5045325+08:00;True|2022-08-23T14:28:54.7390570+08:00;True|2022-08-23T13:56:59.3670549+08:00;True|2022-08-23T13:56:38.8588174+08:00;True|2022-08-22T20:48:56.2180227+08:00;True|2022-08-22T19:07:12.1093584+08:00;True|2022-08-22T19:04:07.7837887+08:00;True|2022-08-22T14:38:00.9342884+08:00;True|2022-08-22T10:59:23.2073567+08:00;True|2022-08-22T10:53:58.0920733+08:00;True|2022-08-22T10:53:10.2446944+08:00;True|2022-08-22T10:43:35.3791396+08:00;True|2022-08-18T09:45:46.4643950+08:00;True|2022-08-18T09:40:55.2601145+08:00;True|2022-08-16T16:17:14.3399134+08:00;True|2022-08-15T17:58:16.1460123+08:00;True|2022-08-15T17:55:55.7137518+08:00;True|2022-08-15T17:44:37.6024482+08:00;True|2022-08-15T17:44:21.9583041+08:00;True|2022-08-15T17:43:23.1305690+08:00;True|2022-08-15T17:29:31.1670490+08:00;True|2022-08-15T17:26:42.9269470+08:00;True|2022-08-15T17:23:27.0940168+08:00;True|2022-08-15T17:07:32.9192045+08:00;True|2022-08-15T16:47:03.8611076+08:00;True|2022-08-15T16:41:50.6843705+08:00;True|2022-08-15T16:38:26.7407413+08:00;True|2022-08-15T16:31:49.0805578+08:00;True|2022-08-15T16:27:33.6712012+08:00;True|2022-08-15T16:24:35.1042794+08:00;True|2022-08-15T16:21:57.2757683+08:00;True|2022-08-15T16:18:17.3545368+08:00;True|2022-08-15T16:15:04.2645412+08:00;True|2022-08-15T14:44:09.3078026+08:00;True|2022-08-15T11:20:09.2930712+08:00;True|2022-08-15T10:42:12.2991587+08:00;True|2022-08-15T10:41:38.3711025+08:00;True|2022-08-15T10:19:06.9974383+08:00;True|2022-08-12T17:15:09.2133281+08:00;True|2022-08-12T10:48:05.8776009+08:00;True|2022-08-12T10:26:16.4183447+08:00;True|2022-08-12T08:33:01.9502005+08:00;True|2022-08-11T09:06:08.8394009+08:00;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;True|2022-08-04T15:11:16.7054147+08:00;True|2022-08-04T14:53:52.7239932+08:00;True|2022-08-04T14:48:35.6115863+08:00;True|2022-08-04T14:39:16.1113507+08:00;True|2022-08-04T12:26:39.4998322+08:00;True|2022-08-04T10:34:23.9626503+08:00;True|2022-08-04T08:12:51.4305728+08:00;True|2022-08-03T15:43:09.2317512+08:00;True|2022-08-02T19:17:55.0460145+08:00;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
   </PropertyGroup>
   <ItemGroup>
     <File Include="Areas/HelpPage/HelpPage.css">
@@ -729,16 +729,16 @@
       <publishTime>12/24/2021 15:38:29</publishTime>
     </File>
     <File Include="bin/VueWebApi.dll">
-      <publishTime>04/12/2023 16:23:26</publishTime>
+      <publishTime>04/21/2023 10:10:40</publishTime>
     </File>
     <File Include="bin/VueWebApi.dll.config">
       <publishTime>06/15/2022 15:31:43</publishTime>
     </File>
     <File Include="bin/VueWebApi.pdb">
-      <publishTime>04/12/2023 16:23:26</publishTime>
+      <publishTime>04/21/2023 10:10:40</publishTime>
     </File>
     <File Include="bin/VueWebApi.xml">
-      <publishTime>04/12/2023 16:23:25</publishTime>
+      <publishTime>04/21/2023 10:10:40</publishTime>
     </File>
     <File Include="bin/WebActivatorEx.dll">
       <publishTime>02/08/2013 16:42:28</publishTime>
@@ -1560,7 +1560,7 @@
       <publishTime>06/10/2022 08:20:24</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>04/12/2023 16:23:33</publishTime>
+      <publishTime>04/21/2023 10:10:47</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/VueWebApi/Tools/LabCodeStatusMessage.cs b/VueWebApi/Tools/LabCodeStatusMessage.cs
index fde90e8..b5337de 100644
--- a/VueWebApi/Tools/LabCodeStatusMessage.cs
+++ b/VueWebApi/Tools/LabCodeStatusMessage.cs
@@ -28,7 +28,21 @@
             mes.code = "200";
             try
             {
-
+                //0.鍒ゆ柇鏉＄爜鏄惁涓哄綋鍓嶅姛鑳芥壂鎻忔潯鐮�
+                sql = @"select rightcode,hbilltype  from T_BarCodeBill where hbarcode=@hbarcode";
+                dynamicParams.Add("@hbarcode", hbarcode);
+                dt = DapperHelper.selectdata(sql, dynamicParams);
+                if (dt.Rows.Count>0)
+                {
+                    if (dt.Rows[0]["rightcode"].ToString() != rightcode && dt.Rows[0]["hbilltype"].ToString() != hbilltype) 
+                    {
+                        mes.code = "300";
+                        mes.count = 0;
+                        mes.Message = "褰撳墠鏉＄爜鐘舵�佷笉婊¤冻姝ゅ姛鑳�!";
+                        mes.data = null;
+                        return mes;
+                    }
+                }
                 //1.鍒ゆ柇褰撳墠鍔熻兘鏉＄爜鏄惁涓虹郴缁熺敓鎴愭湁鏁堟潯鐮�
                 sql = @"select *   from T_BarCodeBill where hbarcode=@hbarcode";
                 dynamicParams.Add("@hbarcode", hbarcode);
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index 82e97b3..aef16f3 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -399,6 +399,7 @@
     <Compile Include="Models\AppLabCode.cs" />
     <Compile Include="Models\AppPurchOrderSave.cs" />
     <Compile Include="Models\APSList.cs" />
+    <Compile Include="Models\ApsOrderSerch.cs" />
     <Compile Include="Models\BomSub.cs" />
     <Compile Include="Models\CapacityPlanningSetup.cs" />
     <Compile Include="Models\CapacityPlanSect.cs" />
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index 355286c..75eeb3d 100644
--- a/VueWebApi/bin/VueWebApi.pdb
+++ b/VueWebApi/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/bin/VueWebApi.xml b/VueWebApi/bin/VueWebApi.xml
index 3684fc1..9777390 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -808,6 +808,47 @@
             <param name="po">閲囪喘璁㈠崟鍙�</param>
             <returns></returns>
         </member>
+        <member name="M:VueWebApi.Controllers.PurchaseOrderController.PurchaseArrivalOrderSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
+            <summary>
+            閲囪喘鍒拌揣鍗曟煡璇�
+            </summary>
+            <param name="orderstatus">鍗曟嵁鐘舵��(榛樿鍏ㄩ儴)</param>
+            <param name="mesordercode">鍒拌揣鍗曞彿</param>
+            <param name="departmentcode">閮ㄩ棬缂栫爜</param>
+            <param name="customercode">渚涘簲鍟嗙紪鐮�</param>
+            <param name="orderdate">鍗曟嵁鏃ユ湡</param>
+            <param name="sourceorder">婧愬崟鍗曞彿(閲囪喘璁㈠崟鍙�)</param>
+            <param name="creatuser">鍒涘缓浜哄憳</param>
+            <param name="arrivaldate">棰勮鍒拌揣鏃ユ湡</param>
+            <param name="page">椤电爜</param>
+            <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+            <param name="prop">鎺掑簭瀛楁</param>
+            <param name="order">鎺掑簭瑙勫垯</param>
+            <returns></returns>
+        </member>
+        <member name="M:VueWebApi.Controllers.PurchaseOrderController.PurchaseArrivalOrderSubSearch(System.String)">
+            <summary>
+            閲囪喘鍒拌揣鍗曟槑缁�
+            </summary>
+            <param name="arrivelodercode">鍒拌揣鍗曞彿</param>
+            <returns></returns>
+        </member>
+        <member name="M:VueWebApi.Controllers.PurchaseOrderController.ClosedPurchaseArrivalOrder(System.String)">
+            <summary>
+            閲囪喘鍒拌揣鍗曞叧闂�
+            </summary>
+            <param name="arrivelodercode">鍒拌揣鍗曞彿</param>
+            <returns></returns>
+        </member>
+        <member name="M:VueWebApi.Controllers.PurchaseOrderController.PurchaseArrivalOrderSubLabDetails(System.String,System.String,System.String)">
+            <summary>
+            閲囪喘鍒拌揣鍗曟槑缁嗘煡鐪嬫潯鐮佽鎯�
+            </summary>
+            <param name="sourceorder">婧愬崟鍗曞彿</param>
+            <param name="arrivelodercode">鍒拌揣鍗曞彿</param>
+            <param name="partcode">鐗╂枡缂栫爜</param>
+            <returns></returns>
+        </member>
         <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
             <summary>
             濮斿鎶ヨ〃璁板綍鏌ヨ
@@ -2713,6 +2754,13 @@
             <param name="enddate">缁撴潫鏃ユ湡</param>
             <returns></returns>
         </member>
+        <member name="M:VueWebApi.Controllers.ProductionManagementController.NewOnclickAdvancedSchedulingDevice(System.Collections.Generic.List{VueWebApi.Models.ApsOrderSerch})">
+            <summary>
+            NEW楂樼骇鎺掔▼鐐瑰嚮宸ュ崟浠诲姟甯﹀嚭鐡堕宸ュ簭璁惧銆佸凡鎺掔▼浠诲姟鏁版嵁
+            </summary>
+            <param name="json">鏌ヨ鏁版嵁</param>
+            <returns></returns>
+        </member>
         <member name="M:VueWebApi.Controllers.ProductionManagementController.SubmitAlreadyScheduling">
             <summary>
             鎺掔▼鏁版嵁鎻愪氦
@@ -3454,6 +3502,36 @@
             鏉＄爜淇℃伅
             </summary>
         </member>
+        <member name="P:VueWebApi.Models.ApsOrderSerch.wocode">
+            <summary>
+            宸ュ崟鍙�
+            </summary>
+        </member>
+        <member name="P:VueWebApi.Models.ApsOrderSerch.wkshpcode">
+            <summary>
+            杞﹂棿缂栫爜
+            </summary>
+        </member>
+        <member name="P:VueWebApi.Models.ApsOrderSerch.partcode">
+            <summary>
+            浜у搧缂栧彿
+            </summary>
+        </member>
+        <member name="P:VueWebApi.Models.ApsOrderSerch.botproccode">
+            <summary>
+            鐡堕宸ュ簭缂栫爜(棣栭亾宸ュ簭)
+            </summary>
+        </member>
+        <member name="P:VueWebApi.Models.ApsOrderSerch.startdate">
+            <summary>
+            寮�濮嬫棩鏈�
+            </summary>
+        </member>
+        <member name="P:VueWebApi.Models.ApsOrderSerch.enddate">
+            <summary>
+            缁撴潫鏃ユ湡
+            </summary>
+        </member>
         <member name="M:VueWebApi.Tools.AppLableBarCode.EncodingSeach(System.String,System.String,System.String,System.String)">
             <summary>
             鏍规嵁鍔熻兘缂栫爜鑾峰彇鏈�鏂拌鍒欑紪鐮�
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index 355286c..75eeb3d 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
index 3684fc1..9777390 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -808,6 +808,47 @@
             <param name="po">閲囪喘璁㈠崟鍙�</param>
             <returns></returns>
         </member>
+        <member name="M:VueWebApi.Controllers.PurchaseOrderController.PurchaseArrivalOrderSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
+            <summary>
+            閲囪喘鍒拌揣鍗曟煡璇�
+            </summary>
+            <param name="orderstatus">鍗曟嵁鐘舵��(榛樿鍏ㄩ儴)</param>
+            <param name="mesordercode">鍒拌揣鍗曞彿</param>
+            <param name="departmentcode">閮ㄩ棬缂栫爜</param>
+            <param name="customercode">渚涘簲鍟嗙紪鐮�</param>
+            <param name="orderdate">鍗曟嵁鏃ユ湡</param>
+            <param name="sourceorder">婧愬崟鍗曞彿(閲囪喘璁㈠崟鍙�)</param>
+            <param name="creatuser">鍒涘缓浜哄憳</param>
+            <param name="arrivaldate">棰勮鍒拌揣鏃ユ湡</param>
+            <param name="page">椤电爜</param>
+            <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+            <param name="prop">鎺掑簭瀛楁</param>
+            <param name="order">鎺掑簭瑙勫垯</param>
+            <returns></returns>
+        </member>
+        <member name="M:VueWebApi.Controllers.PurchaseOrderController.PurchaseArrivalOrderSubSearch(System.String)">
+            <summary>
+            閲囪喘鍒拌揣鍗曟槑缁�
+            </summary>
+            <param name="arrivelodercode">鍒拌揣鍗曞彿</param>
+            <returns></returns>
+        </member>
+        <member name="M:VueWebApi.Controllers.PurchaseOrderController.ClosedPurchaseArrivalOrder(System.String)">
+            <summary>
+            閲囪喘鍒拌揣鍗曞叧闂�
+            </summary>
+            <param name="arrivelodercode">鍒拌揣鍗曞彿</param>
+            <returns></returns>
+        </member>
+        <member name="M:VueWebApi.Controllers.PurchaseOrderController.PurchaseArrivalOrderSubLabDetails(System.String,System.String,System.String)">
+            <summary>
+            閲囪喘鍒拌揣鍗曟槑缁嗘煡鐪嬫潯鐮佽鎯�
+            </summary>
+            <param name="sourceorder">婧愬崟鍗曞彿</param>
+            <param name="arrivelodercode">鍒拌揣鍗曞彿</param>
+            <param name="partcode">鐗╂枡缂栫爜</param>
+            <returns></returns>
+        </member>
         <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
             <summary>
             濮斿鎶ヨ〃璁板綍鏌ヨ
@@ -2713,6 +2754,13 @@
             <param name="enddate">缁撴潫鏃ユ湡</param>
             <returns></returns>
         </member>
+        <member name="M:VueWebApi.Controllers.ProductionManagementController.NewOnclickAdvancedSchedulingDevice(System.Collections.Generic.List{VueWebApi.Models.ApsOrderSerch})">
+            <summary>
+            NEW楂樼骇鎺掔▼鐐瑰嚮宸ュ崟浠诲姟甯﹀嚭鐡堕宸ュ簭璁惧銆佸凡鎺掔▼浠诲姟鏁版嵁
+            </summary>
+            <param name="json">鏌ヨ鏁版嵁</param>
+            <returns></returns>
+        </member>
         <member name="M:VueWebApi.Controllers.ProductionManagementController.SubmitAlreadyScheduling">
             <summary>
             鎺掔▼鏁版嵁鎻愪氦
@@ -3454,6 +3502,36 @@
             鏉＄爜淇℃伅
             </summary>
         </member>
+        <member name="P:VueWebApi.Models.ApsOrderSerch.wocode">
+            <summary>
+            宸ュ崟鍙�
+            </summary>
+        </member>
+        <member name="P:VueWebApi.Models.ApsOrderSerch.wkshpcode">
+            <summary>
+            杞﹂棿缂栫爜
+            </summary>
+        </member>
+        <member name="P:VueWebApi.Models.ApsOrderSerch.partcode">
+            <summary>
+            浜у搧缂栧彿
+            </summary>
+        </member>
+        <member name="P:VueWebApi.Models.ApsOrderSerch.botproccode">
+            <summary>
+            鐡堕宸ュ簭缂栫爜(棣栭亾宸ュ簭)
+            </summary>
+        </member>
+        <member name="P:VueWebApi.Models.ApsOrderSerch.startdate">
+            <summary>
+            寮�濮嬫棩鏈�
+            </summary>
+        </member>
+        <member name="P:VueWebApi.Models.ApsOrderSerch.enddate">
+            <summary>
+            缁撴潫鏃ユ湡
+            </summary>
+        </member>
         <member name="M:VueWebApi.Tools.AppLableBarCode.EncodingSeach(System.String,System.String,System.String,System.String)">
             <summary>
             鏍规嵁鍔熻兘缂栫爜鑾峰彇鏈�鏂拌鍒欑紪鐮�
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
index f5e894a..69639ca 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
index 6580c52..238261e 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-22a47c785d83e477d6a823f6450b32cc120baa70
+9bd16e027aa07e26d1e64517440b4123af2a3466
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index 355286c..75eeb3d 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ

--
Gitblit v1.9.3