From 1483d0e74b4dde9eb22e022276390bfa1f24495b Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期五, 30 五月 2025 08:58:53 +0800
Subject: [PATCH] wsdl文件替换 大屏接口开发

---
 models/CntrItemRel.cs                                              |    1 
 api/ZSCM2_CXPZ.cs                                                  |  123 +-
 enc_temp_folder/d910702ef84a263576574cba1cbe589/WebService.asmx.cs |  841 +++++++++++++++++++++
 api/ZSCM2_SCFL.cs                                                  |  123 +-
 api/ApiModel.cs                                                    |    2 
 HH.WCS.Mobox3.pinggao.csproj                                       |    1 
 api/WmsSpaHelper.cs                                                |  122 +-
 api/ZSCM2_SCFLJHW.cs                                               |  123 +-
 models/DAPING.cs                                                   |   47 +
 api/ZSCM_WC.cs                                                     |  279 +++---
 process/TaskProcess.cs                                             |  435 ++++++----
 api/ZSCM2_CBZX.cs                                                  |  123 +-
 models/SapRoot.cs                                                  |    2 
 api/ZCCM_NC.cs                                                     |    5 
 api/WmsSapController.cs                                            |  147 +++
 core/WMSCore.cs                                                    |    7 
 16 files changed, 1,789 insertions(+), 592 deletions(-)

diff --git a/HH.WCS.Mobox3.pinggao.csproj b/HH.WCS.Mobox3.pinggao.csproj
index 889b72e..5b83381 100644
--- a/HH.WCS.Mobox3.pinggao.csproj
+++ b/HH.WCS.Mobox3.pinggao.csproj
@@ -189,6 +189,7 @@
     <Compile Include="HH\WCS\Mobox3\pinggao\models\SapRo1ot.cs" />
     <Compile Include="models\BaseModel.cs" />
     <Compile Include="models\Area.cs" />
+    <Compile Include="models\DAPING.cs" />
     <Compile Include="models\MaterialVoucher.cs" />
     <Compile Include="models\OutboundRecord.cs" />
     <Compile Include="models\SapReturn.cs" />
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index 828d8cf..5e134dd 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -340,6 +340,7 @@
         /// </summary>
         public class MPSorting
         {
+            public string cntr_type { get; set; }
             public string cntr_code { get; set; }
             public string start { get; set; }
          
@@ -370,6 +371,7 @@
         public class FJSorting
         {
             public string cntr_code { get; set; }//瀹瑰櫒
+            public string cntr_type { get; set; }//瀹瑰櫒
 
             public string start { get; set; }//瀹瑰櫒
             public bool IsHK { get; set; }//瀹瑰櫒
diff --git a/api/WmsSapController.cs b/api/WmsSapController.cs
index a504c9e..ea23188 100644
--- a/api/WmsSapController.cs
+++ b/api/WmsSapController.cs
@@ -17,11 +17,156 @@
 using static HH.WCS.Mobox3.pinggao.api.OtherModel;
 using static HH.WCS.Mobox3.pinggao.api.ApibackModel;
 using HH.WCS.Mobox3.pinggao.models;
+using static HH.WCS.Mobox3.pinggao.models.DAPING;
+using HH.WCS.Mobox3.pinggao.util;
+using SqlSugar;
 
 namespace HH.WCS.Mobox3.pinggao.api
 {
     public class WmsSapController : System.Web.Http.ApiController
     {
+
+        #region 澶у睆鏁版嵁鎺ュ彛
+        /// <summary>
+        /// 澶у睆鏁版嵁
+        /// </summary>
+        /// <returns></returns>
+        public BarChartResponse InOut(){
+
+            var response = new BarChartResponse
+            {
+                OutboundData = new List<BarChartData>
+                {
+                },
+                InboundData = new List<BarChartData>
+                {
+
+                },
+                CKNData = new List<NB> { },
+                ListTask = new List<Tasks> { },
+                Inttbounddjcount = 0,
+                Outtbounddjcount=0,
+                IntodayCount = 0,
+                OuttodayCount = 0
+
+            };
+
+            var db = new SqlHelper<object>().GetInstance();
+            #region 鍑哄簱
+            // 1. 鑾峰彇褰撳墠骞翠唤锛堟垨鎸囧畾骞翠唤锛�+            int year = DateTime.Now.Year; // 濡�023
+
+            // 2. 鐢熸垚1-12鏈堟墍鏈夋湀浠斤紙纭繚瀹屾暣鎬э級
+            var allMonths = Enumerable.Range(1, 12)
+                .Select(m => new DateTime(year, m, 1).ToString("MM"))
+                .ToList();
+
+            //var allMonths = Enumerable.Range(1, 12).ToList();
+            // 3. 鏌ヨ鏁版嵁搴撹幏鍙栧嚭搴撴暟鎹紙鎸夋湀浠藉垎缁勭粺璁★級
+            var outboundCounts = db.Queryable<WCSTask>()
+                .Where(a => a.S_TYPE.Contains("鍑哄簱") &&a.N_B_STATE==3&& a.T_END_TIME != null&&a.T_END_TIME.Value.Year== year)
+                .ToList() // 鍔犺浇鍒板唴瀛�+                .GroupBy(a => a.T_END_TIME.Value.ToString("MM")) // 鎸夋湀浠藉垎缁�+                .ToDictionary(g => g.Key, g => g.Count()); // 杞负瀛楀吀锛堟湀浠�璁板綍鏁帮級
+
+            // 3. 鏋勫缓瀹屾暣1-12鏈堟暟鎹紙缂哄け鏈堜唤琛�锛�+            var outboundData = allMonths.Select(month => new BarChartData
+            {
+                Month = int.Parse(month),
+                Count = outboundCounts.TryGetValue(month, out var count) ? count : 0
+            }).ToList();
+            response.OutboundData = outboundData;
+            #endregion
+            #region 鍏ュ簱
+            var inttboundCounts = db.Queryable<WCSTask>()
+           .Where(a => a.S_TYPE.Contains("鍏ュ簱") && a.N_B_STATE == 3 && a.T_END_TIME != null && a.T_END_TIME.Value.Year == year)
+           .ToList() // 鍔犺浇鍒板唴瀛�+           .GroupBy(a => a.T_END_TIME.Value.ToString("MM")) // 鎸夋湀浠藉垎缁�+           .ToDictionary(g => g.Key, g => g.Count()); // 杞负瀛楀吀锛堟湀浠�璁板綍鏁帮級
+            var intboundData = allMonths.Select(month => new BarChartData
+            {
+                Month = int.Parse(month),
+                Count = inttboundCounts.TryGetValue(month, out var count) ? count : 0
+            }).ToList();
+            response.InboundData = intboundData;
+            #endregion
+            #region 鏈畬鎴愬崟鎹噺
+            var Inttbounddjcount = db.Queryable<TN_Inbound_Order>().Where(s=>s.N_B_STATE==0).Count();
+            var Outtbounddjcount = db.Queryable<TN_Ll_Order>().Where(s=>s.N_B_STATE==0).Count();
+            var today = DateTime.Today;
+            var tomorrow = today.AddDays(1);
+
+            var IntodayCount = db.Queryable<WCSTask>()
+                .Where(s => s.N_B_STATE == 3 && s.S_TYPE.Contains("鍏ュ簱")&&
+                            s.T_END_TIME >= today &&
+                            s.T_END_TIME < tomorrow).Count();
+            var OuttodayCount = db.Queryable<WCSTask>()
+            .Where(s => s.N_B_STATE == 3 && s.S_TYPE.Contains("鍑哄簱") &&
+                        s.T_END_TIME >= today &&
+                        s.T_END_TIME < tomorrow).Count();
+            response.Inttbounddjcount = Inttbounddjcount;
+            response.Outtbounddjcount = Outtbounddjcount;
+            response.OuttodayCount = OuttodayCount;
+            response.IntodayCount = IntodayCount;
+            #endregion
+            #region 浠诲姟鍒楄〃
+            var tasklist = db.Queryable<WCSTask>().Where(s => s.N_B_STATE != 2).Select(s => new { s.S_CNTR_CODE, s.S_START_AREA, s.S_END_AREA, s.S_B_STATE }).Take(5).ToList() ;
+            var tasksList = tasklist.Select(t => new Tasks
+            {
+                S_CNTR_CODE = t.S_CNTR_CODE,
+                S_START_AREA = t.S_START_AREA,
+                S_END_AREA = t.S_END_AREA,
+                S_B_STATE = t.S_B_STATE
+            }).ToList();
+            response.ListTask = tasksList;
+            #endregion
+
+
+            #region 浠撳簱搴撳唴瀹℃牳
+            var ManCount = db.Queryable<CntrItemRel>()
+                           .Where(s => s.S_CNTR_TYPE == "婊℃墭")
+                           .GroupBy(s => s.S_CNTR_CODE)
+                           .Select(s => new { s.S_CNTR_CODE })
+                           .Count();
+            var ManName = "婊℃墭鐩�;
+
+            var BanCount = db.Queryable<CntrItemRel>()
+                           .Where(s => s.S_CNTR_TYPE == "鍗婃墭")
+                           .GroupBy(s => s.S_CNTR_CODE)
+                           .Select(s => new { s.S_CNTR_CODE })
+                           .Count();
+            var BanName = "鍗婃墭鐩�;
+            //鎵�湁瀹瑰櫒鐨勬暟閲�+            int allCntrcout = db.Queryable<LocCntrRel>().Count();
+            //鎵�湁瀹瑰櫒鐗╂枡鏁伴噺
+            int alltprcout = db.Queryable<CntrItemRel>()
+                     .GroupBy(s => s.S_CNTR_CODE)
+                     .Select(s => new { s.S_CNTR_CODE })
+                     .Count();
+
+            var KTCount = allCntrcout - alltprcout;
+            var KTName = "绌烘墭鐩�;
+
+            int alllocationcout = db.Queryable<Location>().Count();
+            var KHWCount = alllocationcout - allCntrcout;
+            var KHWName = "绌鸿揣浣�;
+
+            var list = new List<NB>
+        {
+            new NB { Name = ManName, Count = ManCount },
+            new NB { Name = BanName, Count = BanCount },
+            new NB { Name = KTName, Count = KTCount },
+            new NB { Name = KHWName, Count = KHWCount }
+        };
+            response.CKNData = list;
+            #endregion
+            return response;
+        
+        }
+
+            
+        #endregion
+
         /// <summary>
         /// 渚涘簲鍟嗘帴鏀舵帴鍙ｈ幏鍙�         /// </summary>
@@ -326,7 +471,7 @@
             {
                 OtherReturnRoot.ITEM wcReturnRoot = new OtherReturnRoot.ITEM();
                 wcReturnRoot.WLPZBH = item.WLPZBH;
-                wcReturnRoot.WLPZND = item.WLPZND;
+                wcReturnRoot.ND = item.WLPZND;
                 wcReturnRoot.MSGCODE = item.resultCode;
                 wcReturnRoot.MSGDESP = item.resultMsg;
                 wcReturnRoots.Add(wcReturnRoot);
diff --git a/api/WmsSpaHelper.cs b/api/WmsSpaHelper.cs
index b054b44..1db82f5 100644
--- a/api/WmsSpaHelper.cs
+++ b/api/WmsSpaHelper.cs
@@ -30,7 +30,6 @@
 using System.Security.Policy;
 using HH.WCS.Mobox3.pinggao.models;
 using static HH.WCS.Mobox3.pinggao.wms.WMSHelper;
-using WHTest;
 using System.Net;
 using SqlSugar;
 using static HH.WCS.Mobox3.pinggao.models.SapRoot.GYSDto;
@@ -1134,9 +1133,9 @@
 
                                             result.resultCode = 1;
                                             result.resultMsg = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
-                                            result.resultMsg = "澶辫触";
                                             result.WLPZBH = itemwlpz.HEAD.WLPZH;
                                             result.WLPZND = itemwlpz.HEAD.ND;
+                                            simpleResults.Add(result);
                                             continue;
                                             /*  throw new Exception($"鐗╂枡{a.WLH}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�)*/
                                             ;
@@ -1261,12 +1260,13 @@
                             }
                         }
                     }
-                    result.resultMsg = "鎴愬姛";
-                    result.WLPZBH = itemwlpz.HEAD.WLPZH;
-                    result.WLPZND = itemwlpz.HEAD.ND;
-                    result.resultCode = 0;
-                    result.resultMsg = "";
-                    simpleResults.Add(result);
+
+                    var result2 = new SimpleResult();
+                    result2.resultMsg = "鎴愬姛";
+                    result2.WLPZBH = itemwlpz.HEAD.WLPZH;
+                    result2.WLPZND = itemwlpz.HEAD.ND;
+                    result2.resultCode = 0;
+                    simpleResults.Add(result2);
                     db.CommitTran();
                 }
             }
@@ -1756,7 +1756,7 @@
                 result.resultMsg = "鎴愬姛";
                 result.resultCode = 0;
                 //鏍￠獙鍏ュ簱鍗曟暟閲忥紝涓嶅彲浠ヨ秴锛屾垚鍔熷悗鎻掑叆鎵樼洏鐗╂枡琛紝鏇存柊鍏ュ簱鍗曠疮璁℃暟閲�-                result = AddInboundOrder(model.MaterList, model.cntr_code);
+                result = AddInboundOrder(model.MaterList, model.cntr_code,model.cntr_type);
                 #region MyRegion
 
 
@@ -2087,7 +2087,11 @@
                     }
 
                     //閫氱敤鎺ュ彛 瀵瑰鍣ㄨ揣鍝佺殑鍒犲噺 鍜岀敓鎴愬洖搴撳崟 閮借鐢ㄧ殑鎺ュ彛
-                    result = await TYAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.IsHK, model.start, po.S_OUT_TYPE);
+                    result = await TYAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.IsHK, model.start, po.S_OUT_TYPE,model.cntr_type);
+                    if (result.resultCode==1)
+                    {
+                        return result;
+                    }
                     #region 鍗囬檷閲� 
                     bool adds = true;
@@ -2184,7 +2188,7 @@
                             LogHelper.Info($"mobox 搴撳尯闄嶉噺鎺ュ彛杩斿洖涓虹┖");
 
                         }
-                        if (adds) addOnShelves(po, model.cntr_code, 2);
+                        //if (adds) addOnShelves(po, model.cntr_code, 2);
 
                     }
                     else LogHelper.Info($"鎵樼洏{model.cntr_code}鏃犻渶瑕佸崌闄嶉噺鐨勭墿鏂�);
@@ -2195,6 +2199,7 @@
                 }
                 catch (Exception e)
                 {
+                    LogHelper.Info($"鎶ラ敊{e.Message}");
                     result.resultMsg = e.Message;
                     db.RollbackTran();
                     return result;
@@ -2203,7 +2208,7 @@
             }
 
         }
-        public static async Task<SimpleResult> TYAddOutboundOrder(SqlSugarClient db, List<Mater> MaterList, string arrival_no, string cntr_code, bool isHK, string start, string S_OUT_TYPE)
+        public static async Task<SimpleResult> TYAddOutboundOrder(SqlSugarClient db, List<Mater> MaterList, string arrival_no, string cntr_code, bool isHK, string start, string S_OUT_TYPE,string cntr_type)
         {
             // var db = new SqlHelper<object>().GetInstance();
             //using (var db = new SqlHelper<object>().GetInstance())
@@ -2234,6 +2239,7 @@
                         if (cir != null)
                         {
                             cir.F_QTY -= item.qty;
+                            cir.S_CNTR_TYPE = cntr_type;
                             cir.F_ALLOC_QTY -= item.qty;
                             cir.T_MODIFY = DateTime.Now;
                             if (cir.F_QTY == 0)
@@ -2242,10 +2248,8 @@
                             }
                             else
                             {
-                                db.Updateable(cir).UpdateColumns(it => new { it.F_QTY, it.F_ALLOC_QTY, it.T_MODIFY }).ExecuteCommand();
+                                db.Updateable(cir).UpdateColumns(it => new { it.F_QTY,it.S_CNTR_TYPE, it.F_ALLOC_QTY, it.T_MODIFY }).ExecuteCommand();
                                 //娣诲姞鍥炲簱浣滀笟
-
-
                             }
                         }
                         else
@@ -2256,31 +2260,7 @@
                             LogHelper.Info($"鐗╂枡涓嶅瓨鍦▄item.item_code}");
                             return result;
                         }
-                        if (isHK)
-                        {
-                            var wmsTask = new WMSTask
-                            {
-                                S_CNTR_CODE = cntr_code,
-                                S_CODE = WMSHelper.GenerateTaskNo(),
-                                S_START_LOC = start,
-                                S_START_AREA = startinfo.S_AREA_CODE,
-                                S_START_WH = startinfo.S_WH_CODE,
-                                S_END_LOC = startinfo.S_CODE,
-                                S_END_AREA = startinfo.S_AREA_CODE,
-                                S_END_WH = startinfo.S_WH_CODE,
-
-                                N_TYPE = 1,
-                                // S_TYPE = WMSTask.GetTypeStr(1),
-                                S_TYPE = "鍥炲簱",
-                                S_OP_DEF_CODE = "",
-                                S_OP_DEF_NAME = "pda鍏ュ簱"
-                            };
-                            if (WMSHelper.CreateWmsTask(wmsTask))
-                            {
-                                LocationHelper.LockLoc(start, 1);
-                                result.resultMsg = $"鍒涘缓浣滀笟鎴愬姛锛屼綔涓氬彿{wmsTask.S_CODE}";
-                            }
-                        }
+                      
                         OutboundRecord outboundRecord = new OutboundRecord();
                         outboundRecord.S_WLPZBH = pz?.S_WLPZBH;
                         outboundRecord.S_WLPZND = pz?.S_WLPZND;
@@ -2300,14 +2280,65 @@
                         return result;
                     }
                 }
-                db.Insertable<OutboundRecord>(records).ExecuteCommand();
+                if (isHK)
+                {
+                    var locs= db.Queryable<WCSTask>().Where(a =>a.S_TYPE.Contains("鍑哄簱")&& a.S_CNTR_CODE == cntr_code&&a.N_B_STATE==3).OrderByDescending(s=>s.T_END_TIME).First();
+                    if (locs!=null)
+                    {
+                        var cntr= db.Queryable<TN_Distribution_CNTR>().Where(a => a.S_DC_NO== locs.S_BS_NO).First();
+                        if (cntr!=null)
+                        {
+                            cntr.S_SORT_TYPE = "宸插垎鎷�;
+                            db.Updateable(cntr).UpdateColumns(it => new { it.S_SORT_TYPE }).ExecuteCommand();
+                        }
+                        else
+                        {
+                            result.resultCode = 1;
+                            result.resultMsg += $"浠诲姟{locs.S_CODE}鏉ユ簮鍙穥locs.S_BS_NO}鎵句笉鍒伴厤鐩樹俊鎭�;
+                            return result;
+                        }
+                            //var location = db.Queryable<Location>().Where(a => a.S_CODE == locs.S_LOC_CODE).First();
+                            var wmsTask = new WMSTask
+                            {
+                                S_CNTR_CODE = cntr_code,
+                                S_CODE = WMSHelper.GenerateTaskNo(),
+                                S_START_LOC = start,
+                                S_START_AREA = startinfo.S_AREA_CODE,
+                                S_START_WH = startinfo.S_WH_CODE,
+                                S_END_LOC = locs?.S_START_LOC,
+                                S_END_AREA = locs?.S_START_AREA,
+                                S_END_WH = locs?.S_START_WH,
 
+                                N_TYPE = 1,
+                                // S_TYPE = WMSTask.GetTypeStr(1),
+                                S_TYPE = "鍥炲簱",
+                                S_OP_DEF_CODE = "",
+                                S_OP_DEF_NAME = "pda鍏ュ簱"
+                            };
+                        if (WMSHelper.CreateWmsTask(wmsTask))
+                        {
+                            LocationHelper.LockLoc(start, 1);
+                            result.resultMsg = $"鍒涘缓浣滀笟鎴愬姛锛屼綔涓氬彿{wmsTask.S_CODE}";
+                        }
+                    }
+                    else
+                    {
+                        result.resultCode = 1;
+                        result.resultMsg += $"鎵句笉鍒板鍣ㄥ搴斾换鍔′俊鎭瘂cntr_code}";
+                        return result;
+                    }
+                  
+                }
+               var sss= db.Insertable<OutboundRecord>(records).ExecuteCommand();
+              
                 //db.CommitTran();
             }
             catch (Exception ex)
             {
                 //db.RollbackTran();
                 LogHelper.Info("鐗╂枡淇℃伅缁戝畾鍒版弧瀹瑰櫒涓� + ex.Message);
+                result.resultCode = 1;
+                result.resultMsg += ex.Message;
                 Console.WriteLine(ex.Message);
 
                 throw;
@@ -3055,7 +3086,7 @@
         /// <param name="cntr_code"></param>
         /// <returns></returns>
         [ApiExplorerSettings(IgnoreApi = true)]
-        public static SimpleResult AddInboundOrder(List<Mater> MaterList, string cntr_code)
+        public static SimpleResult AddInboundOrder(List<Mater> MaterList, string cntr_code,string S_CNTR_TYPE)
         {
             var result = new SimpleResult();
             //  var db = new SqlHelper<object>().GetInstance();
@@ -3100,12 +3131,13 @@
                                     if (cir != null)
                                     {
                                         cir.F_QTY += item.qty;
-                                        db.Updateable(cir).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
+                                        cir.S_CNTR_TYPE = S_CNTR_TYPE;
+                                        db.Updateable(cir).UpdateColumns(it => new { it.F_QTY,it.S_CNTR_TYPE }).ExecuteCommand();
                                     }
                                     else
                                     {
                                         //2.鎻掑叆鏂扮殑瀹瑰櫒鐗╂枡淇℃伅锛堝鍣ㄥ彿涓嶅彉S_SERIAL_NO = item.S_SERIAL_NO,锛�-                                        cir = new CntrItemRel { S_CNTR_CODE = cntr.S_CODE.Trim(), S_UOM = info.S_UOM, S_BATCH_NO = item.S_BATCH_NO, N_BS_ROW_NO = item.N_ROW_NO, F_QTY = item.qty, S_ITEM_CODE = item.item_code, S_BS_NO = item.arrival_no };
+                                        cir = new CntrItemRel { S_CNTR_TYPE= S_CNTR_TYPE, S_CNTR_CODE = cntr.S_CODE.Trim(), S_UOM = info.S_UOM, S_BATCH_NO = item.S_BATCH_NO, N_BS_ROW_NO = item.N_ROW_NO, F_QTY = item.qty, S_ITEM_CODE = item.item_code, S_BS_NO = item.arrival_no };
                                         db.Insertable<CntrItemRel>(cir).ExecuteCommand();
                                     }
                                     var count = db.Queryable<CntrItemRel>().Count(a => a.S_CNTR_CODE == cntr.S_CODE);
@@ -4071,7 +4103,7 @@
                         // 鍑嗗璇锋眰鍙傛暟
                         ZscmNc request = new ZscmNc();
                         request.Input = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + xml;
-                        LogHelper.Info($"鍐呴噰SAP鍥炶皟");
+                        LogHelper.Info($"鍐呴噰SAP鍥炶皟{service.Url}");
                         // 璋冪敤Web Service
                         ZscmNcResponse responses = service.ZscmNc(request);
 
diff --git a/api/ZCCM_NC.cs b/api/ZCCM_NC.cs
index 341e564..647169c 100644
--- a/api/ZCCM_NC.cs
+++ b/api/ZCCM_NC.cs
@@ -33,9 +33,8 @@
 
     /// <remarks/>
     public ZSCM_NC()
-    { this.Url = "http://10.89.33.217:8000/sap/bc/srt/rfc/sap/zscm_nc/110/zscm_nc/binding";
-
-        // this.Url = "http://10.89.33.217:8000/sap/bc/srt/rfc/sap/zscm_wc/110/zscm_wc/binding";
+    {
+        this.Url = "http://10.89.33.201:8001/sap/bc/srt/rfc/sap/zscm_nc/800/zscm_nc/binding";
     }
 
     /// <remarks/>
diff --git a/api/ZSCM2_CBZX.cs b/api/ZSCM2_CBZX.cs
index 709a2a4..7b6c9ca 100644
--- a/api/ZSCM2_CBZX.cs
+++ b/api/ZSCM2_CBZX.cs
@@ -25,64 +25,75 @@
 [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.8.3928.0")]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
-[System.Web.Services.WebServiceBindingAttribute(Name="binding", Namespace="urn:sap-com:document:sap:soap:functions:mc-style")]
-public partial class ZSCM2_CBZX : System.Web.Services.Protocols.SoapHttpClientProtocol {
-    
+[System.Web.Services.WebServiceBindingAttribute(Name = "binding", Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")]
+public partial class ZSCM2_CBZX : System.Web.Services.Protocols.SoapHttpClientProtocol
+{
+
     private System.Threading.SendOrPostCallback ZfmScm2CbzxMm001OperationCompleted;
-    
+
     /// <remarks/>
-    public ZSCM2_CBZX() {
-        this.Url = "http://10.89.33.217:8000/sap/bc/srt/rfc/sap/zscm2_cbzx/110/zscm2_cbzx/bin" +
-            "ding";
+    public ZSCM2_CBZX()
+    {
+        this.Url = "http://10.89.33.201:8001/sap/bc/srt/rfc/sap/zscm2_cbzx/800/zscm2_cbzx/bind" +
+            "ing";
     }
-    
+
     /// <remarks/>
     public event ZfmScm2CbzxMm001CompletedEventHandler ZfmScm2CbzxMm001Completed;
-    
+
     /// <remarks/>
-    [System.Web.Services.Protocols.SoapDocumentMethodAttribute("", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Bare)]
-    [return: System.Xml.Serialization.XmlElementAttribute("ZfmScm2CbzxMm001Response", Namespace="urn:sap-com:document:sap:soap:functions:mc-style")]
-    public ZfmScm2CbzxMm001Response ZfmScm2CbzxMm001([System.Xml.Serialization.XmlElementAttribute("ZfmScm2CbzxMm001", Namespace="urn:sap-com:document:sap:soap:functions:mc-style")] ZfmScm2CbzxMm001 ZfmScm2CbzxMm0011) {
+    [System.Web.Services.Protocols.SoapDocumentMethodAttribute("", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Bare)]
+    [return: System.Xml.Serialization.XmlElementAttribute("ZfmScm2CbzxMm001Response", Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")]
+    public ZfmScm2CbzxMm001Response ZfmScm2CbzxMm001([System.Xml.Serialization.XmlElementAttribute("ZfmScm2CbzxMm001", Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")] ZfmScm2CbzxMm001 ZfmScm2CbzxMm0011)
+    {
         object[] results = this.Invoke("ZfmScm2CbzxMm001", new object[] {
                     ZfmScm2CbzxMm0011});
         return ((ZfmScm2CbzxMm001Response)(results[0]));
     }
-    
+
     /// <remarks/>
-    public System.IAsyncResult BeginZfmScm2CbzxMm001(ZfmScm2CbzxMm001 ZfmScm2CbzxMm0011, System.AsyncCallback callback, object asyncState) {
+    public System.IAsyncResult BeginZfmScm2CbzxMm001(ZfmScm2CbzxMm001 ZfmScm2CbzxMm0011, System.AsyncCallback callback, object asyncState)
+    {
         return this.BeginInvoke("ZfmScm2CbzxMm001", new object[] {
                     ZfmScm2CbzxMm0011}, callback, asyncState);
     }
-    
+
     /// <remarks/>
-    public ZfmScm2CbzxMm001Response EndZfmScm2CbzxMm001(System.IAsyncResult asyncResult) {
+    public ZfmScm2CbzxMm001Response EndZfmScm2CbzxMm001(System.IAsyncResult asyncResult)
+    {
         object[] results = this.EndInvoke(asyncResult);
         return ((ZfmScm2CbzxMm001Response)(results[0]));
     }
-    
+
     /// <remarks/>
-    public void ZfmScm2CbzxMm001Async(ZfmScm2CbzxMm001 ZfmScm2CbzxMm0011) {
+    public void ZfmScm2CbzxMm001Async(ZfmScm2CbzxMm001 ZfmScm2CbzxMm0011)
+    {
         this.ZfmScm2CbzxMm001Async(ZfmScm2CbzxMm0011, null);
     }
-    
+
     /// <remarks/>
-    public void ZfmScm2CbzxMm001Async(ZfmScm2CbzxMm001 ZfmScm2CbzxMm0011, object userState) {
-        if ((this.ZfmScm2CbzxMm001OperationCompleted == null)) {
+    public void ZfmScm2CbzxMm001Async(ZfmScm2CbzxMm001 ZfmScm2CbzxMm0011, object userState)
+    {
+        if ((this.ZfmScm2CbzxMm001OperationCompleted == null))
+        {
             this.ZfmScm2CbzxMm001OperationCompleted = new System.Threading.SendOrPostCallback(this.OnZfmScm2CbzxMm001OperationCompleted);
         }
         this.InvokeAsync("ZfmScm2CbzxMm001", new object[] {
                     ZfmScm2CbzxMm0011}, this.ZfmScm2CbzxMm001OperationCompleted, userState);
     }
-    
-    private void OnZfmScm2CbzxMm001OperationCompleted(object arg) {
-        if ((this.ZfmScm2CbzxMm001Completed != null)) {
+
+    private void OnZfmScm2CbzxMm001OperationCompleted(object arg)
+    {
+        if ((this.ZfmScm2CbzxMm001Completed != null))
+        {
             System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
             this.ZfmScm2CbzxMm001Completed(this, new ZfmScm2CbzxMm001CompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
         }
     }
-    
+
     /// <remarks/>
-    public new void CancelAsync(object userState) {
+    public new void CancelAsync(object userState)
+    {
         base.CancelAsync(userState);
     }
 }
@@ -92,18 +103,22 @@
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
-[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:sap-com:document:sap:soap:functions:mc-style")]
-public partial class ZfmScm2CbzxMm001 {
-    
+[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")]
+public partial class ZfmScm2CbzxMm001
+{
+
     private string inputField;
-    
+
     /// <remarks/>
-    [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-    public string Input {
-        get {
+    [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
+    public string Input
+    {
+        get
+        {
             return this.inputField;
         }
-        set {
+        set
+        {
             this.inputField = value;
         }
     }
@@ -114,18 +129,22 @@
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
-[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:sap-com:document:sap:soap:functions:mc-style")]
-public partial class ZfmScm2CbzxMm001Response {
-    
+[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")]
+public partial class ZfmScm2CbzxMm001Response
+{
+
     private string outputField;
-    
+
     /// <remarks/>
-    [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-    public string Output {
-        get {
+    [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
+    public string Output
+    {
+        get
+        {
             return this.outputField;
         }
-        set {
+        set
+        {
             this.outputField = value;
         }
     }
@@ -139,18 +158,22 @@
 [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.8.3928.0")]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
-public partial class ZfmScm2CbzxMm001CompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-    
+public partial class ZfmScm2CbzxMm001CompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+{
+
     private object[] results;
-    
-    internal ZfmScm2CbzxMm001CompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-            base(exception, cancelled, userState) {
+
+    internal ZfmScm2CbzxMm001CompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+    {
         this.results = results;
     }
-    
+
     /// <remarks/>
-    public ZfmScm2CbzxMm001Response Result {
-        get {
+    public ZfmScm2CbzxMm001Response Result
+    {
+        get
+        {
             this.RaiseExceptionIfNecessary();
             return ((ZfmScm2CbzxMm001Response)(this.results[0]));
         }
diff --git a/api/ZSCM2_CXPZ.cs b/api/ZSCM2_CXPZ.cs
index 6219ce9..a93372b 100644
--- a/api/ZSCM2_CXPZ.cs
+++ b/api/ZSCM2_CXPZ.cs
@@ -25,64 +25,75 @@
 [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.8.3928.0")]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
-[System.Web.Services.WebServiceBindingAttribute(Name="binding", Namespace="urn:sap-com:document:sap:soap:functions:mc-style")]
-public partial class ZSCM2_CXPZ : System.Web.Services.Protocols.SoapHttpClientProtocol {
-    
+[System.Web.Services.WebServiceBindingAttribute(Name = "binding", Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")]
+public partial class ZSCM2_CXPZ : System.Web.Services.Protocols.SoapHttpClientProtocol
+{
+
     private System.Threading.SendOrPostCallback ZfmScm2CxpzMm001OperationCompleted;
-    
+
     /// <remarks/>
-    public ZSCM2_CXPZ() {
-        this.Url = "http://10.89.33.217:8000/sap/bc/srt/rfc/sap/zscm2_cxpz/110/zscm2_cxpz/bin" +
-            "ding";
+    public ZSCM2_CXPZ()
+    {
+        this.Url = "http://10.89.33.201:8001/sap/bc/srt/rfc/sap/zscm2_cxpz/800/zscm2_cxpz/bind" +
+            "ing";
     }
-    
+
     /// <remarks/>
     public event ZfmScm2CxpzMm001CompletedEventHandler ZfmScm2CxpzMm001Completed;
-    
+
     /// <remarks/>
-    [System.Web.Services.Protocols.SoapDocumentMethodAttribute("", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Bare)]
-    [return: System.Xml.Serialization.XmlElementAttribute("ZfmScm2CxpzMm001Response", Namespace="urn:sap-com:document:sap:soap:functions:mc-style")]
-    public ZfmScm2CxpzMm001Response ZfmScm2CxpzMm001([System.Xml.Serialization.XmlElementAttribute("ZfmScm2CxpzMm001", Namespace="urn:sap-com:document:sap:soap:functions:mc-style")] ZfmScm2CxpzMm001 ZfmScm2CxpzMm0011) {
+    [System.Web.Services.Protocols.SoapDocumentMethodAttribute("", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Bare)]
+    [return: System.Xml.Serialization.XmlElementAttribute("ZfmScm2CxpzMm001Response", Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")]
+    public ZfmScm2CxpzMm001Response ZfmScm2CxpzMm001([System.Xml.Serialization.XmlElementAttribute("ZfmScm2CxpzMm001", Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")] ZfmScm2CxpzMm001 ZfmScm2CxpzMm0011)
+    {
         object[] results = this.Invoke("ZfmScm2CxpzMm001", new object[] {
                     ZfmScm2CxpzMm0011});
         return ((ZfmScm2CxpzMm001Response)(results[0]));
     }
-    
+
     /// <remarks/>
-    public System.IAsyncResult BeginZfmScm2CxpzMm001(ZfmScm2CxpzMm001 ZfmScm2CxpzMm0011, System.AsyncCallback callback, object asyncState) {
+    public System.IAsyncResult BeginZfmScm2CxpzMm001(ZfmScm2CxpzMm001 ZfmScm2CxpzMm0011, System.AsyncCallback callback, object asyncState)
+    {
         return this.BeginInvoke("ZfmScm2CxpzMm001", new object[] {
                     ZfmScm2CxpzMm0011}, callback, asyncState);
     }
-    
+
     /// <remarks/>
-    public ZfmScm2CxpzMm001Response EndZfmScm2CxpzMm001(System.IAsyncResult asyncResult) {
+    public ZfmScm2CxpzMm001Response EndZfmScm2CxpzMm001(System.IAsyncResult asyncResult)
+    {
         object[] results = this.EndInvoke(asyncResult);
         return ((ZfmScm2CxpzMm001Response)(results[0]));
     }
-    
+
     /// <remarks/>
-    public void ZfmScm2CxpzMm001Async(ZfmScm2CxpzMm001 ZfmScm2CxpzMm0011) {
+    public void ZfmScm2CxpzMm001Async(ZfmScm2CxpzMm001 ZfmScm2CxpzMm0011)
+    {
         this.ZfmScm2CxpzMm001Async(ZfmScm2CxpzMm0011, null);
     }
-    
+
     /// <remarks/>
-    public void ZfmScm2CxpzMm001Async(ZfmScm2CxpzMm001 ZfmScm2CxpzMm0011, object userState) {
-        if ((this.ZfmScm2CxpzMm001OperationCompleted == null)) {
+    public void ZfmScm2CxpzMm001Async(ZfmScm2CxpzMm001 ZfmScm2CxpzMm0011, object userState)
+    {
+        if ((this.ZfmScm2CxpzMm001OperationCompleted == null))
+        {
             this.ZfmScm2CxpzMm001OperationCompleted = new System.Threading.SendOrPostCallback(this.OnZfmScm2CxpzMm001OperationCompleted);
         }
         this.InvokeAsync("ZfmScm2CxpzMm001", new object[] {
                     ZfmScm2CxpzMm0011}, this.ZfmScm2CxpzMm001OperationCompleted, userState);
     }
-    
-    private void OnZfmScm2CxpzMm001OperationCompleted(object arg) {
-        if ((this.ZfmScm2CxpzMm001Completed != null)) {
+
+    private void OnZfmScm2CxpzMm001OperationCompleted(object arg)
+    {
+        if ((this.ZfmScm2CxpzMm001Completed != null))
+        {
             System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
             this.ZfmScm2CxpzMm001Completed(this, new ZfmScm2CxpzMm001CompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
         }
     }
-    
+
     /// <remarks/>
-    public new void CancelAsync(object userState) {
+    public new void CancelAsync(object userState)
+    {
         base.CancelAsync(userState);
     }
 }
@@ -92,18 +103,22 @@
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
-[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:sap-com:document:sap:soap:functions:mc-style")]
-public partial class ZfmScm2CxpzMm001 {
-    
+[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")]
+public partial class ZfmScm2CxpzMm001
+{
+
     private string inputField;
-    
+
     /// <remarks/>
-    [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-    public string Input {
-        get {
+    [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
+    public string Input
+    {
+        get
+        {
             return this.inputField;
         }
-        set {
+        set
+        {
             this.inputField = value;
         }
     }
@@ -114,18 +129,22 @@
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
-[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:sap-com:document:sap:soap:functions:mc-style")]
-public partial class ZfmScm2CxpzMm001Response {
-    
+[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")]
+public partial class ZfmScm2CxpzMm001Response
+{
+
     private string outputField;
-    
+
     /// <remarks/>
-    [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-    public string Output {
-        get {
+    [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
+    public string Output
+    {
+        get
+        {
             return this.outputField;
         }
-        set {
+        set
+        {
             this.outputField = value;
         }
     }
@@ -139,18 +158,22 @@
 [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.8.3928.0")]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
-public partial class ZfmScm2CxpzMm001CompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-    
+public partial class ZfmScm2CxpzMm001CompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+{
+
     private object[] results;
-    
-    internal ZfmScm2CxpzMm001CompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-            base(exception, cancelled, userState) {
+
+    internal ZfmScm2CxpzMm001CompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+    {
         this.results = results;
     }
-    
+
     /// <remarks/>
-    public ZfmScm2CxpzMm001Response Result {
-        get {
+    public ZfmScm2CxpzMm001Response Result
+    {
+        get
+        {
             this.RaiseExceptionIfNecessary();
             return ((ZfmScm2CxpzMm001Response)(this.results[0]));
         }
diff --git a/api/ZSCM2_SCFL.cs b/api/ZSCM2_SCFL.cs
index 5eb3285..217823e 100644
--- a/api/ZSCM2_SCFL.cs
+++ b/api/ZSCM2_SCFL.cs
@@ -25,64 +25,75 @@
 [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.8.3928.0")]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
-[System.Web.Services.WebServiceBindingAttribute(Name="binding", Namespace="urn:sap-com:document:sap:soap:functions:mc-style")]
-public partial class ZSCM2_SCFL : System.Web.Services.Protocols.SoapHttpClientProtocol {
-    
+[System.Web.Services.WebServiceBindingAttribute(Name = "binding", Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")]
+public partial class ZSCM2_SCFL : System.Web.Services.Protocols.SoapHttpClientProtocol
+{
+
     private System.Threading.SendOrPostCallback ZscmScflOperationCompleted;
-    
+
     /// <remarks/>
-    public ZSCM2_SCFL() {
-        this.Url = "http://10.89.33.217:8000/sap/bc/srt/rfc/sap/zscm2_scfl/110/zscm2_scfl/bin" +
-            "ding";
+    public ZSCM2_SCFL()
+    {
+        this.Url = "http://10.89.33.201:8001/sap/bc/srt/rfc/sap/zscm2_scfl/800/zscm2_scfl/bind" +
+            "ing";
     }
-    
+
     /// <remarks/>
     public event ZscmScflCompletedEventHandler ZscmScflCompleted;
-    
+
     /// <remarks/>
-    [System.Web.Services.Protocols.SoapDocumentMethodAttribute("", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Bare)]
-    [return: System.Xml.Serialization.XmlElementAttribute("ZscmScflResponse", Namespace="urn:sap-com:document:sap:soap:functions:mc-style")]
-    public ZscmScflResponse ZscmScfl([System.Xml.Serialization.XmlElementAttribute("ZscmScfl", Namespace="urn:sap-com:document:sap:soap:functions:mc-style")] ZscmScfl ZscmScfl1) {
+    [System.Web.Services.Protocols.SoapDocumentMethodAttribute("", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Bare)]
+    [return: System.Xml.Serialization.XmlElementAttribute("ZscmScflResponse", Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")]
+    public ZscmScflResponse ZscmScfl([System.Xml.Serialization.XmlElementAttribute("ZscmScfl", Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")] ZscmScfl ZscmScfl1)
+    {
         object[] results = this.Invoke("ZscmScfl", new object[] {
                     ZscmScfl1});
         return ((ZscmScflResponse)(results[0]));
     }
-    
+
     /// <remarks/>
-    public System.IAsyncResult BeginZscmScfl(ZscmScfl ZscmScfl1, System.AsyncCallback callback, object asyncState) {
+    public System.IAsyncResult BeginZscmScfl(ZscmScfl ZscmScfl1, System.AsyncCallback callback, object asyncState)
+    {
         return this.BeginInvoke("ZscmScfl", new object[] {
                     ZscmScfl1}, callback, asyncState);
     }
-    
+
     /// <remarks/>
-    public ZscmScflResponse EndZscmScfl(System.IAsyncResult asyncResult) {
+    public ZscmScflResponse EndZscmScfl(System.IAsyncResult asyncResult)
+    {
         object[] results = this.EndInvoke(asyncResult);
         return ((ZscmScflResponse)(results[0]));
     }
-    
+
     /// <remarks/>
-    public void ZscmScflAsync(ZscmScfl ZscmScfl1) {
+    public void ZscmScflAsync(ZscmScfl ZscmScfl1)
+    {
         this.ZscmScflAsync(ZscmScfl1, null);
     }
-    
+
     /// <remarks/>
-    public void ZscmScflAsync(ZscmScfl ZscmScfl1, object userState) {
-        if ((this.ZscmScflOperationCompleted == null)) {
+    public void ZscmScflAsync(ZscmScfl ZscmScfl1, object userState)
+    {
+        if ((this.ZscmScflOperationCompleted == null))
+        {
             this.ZscmScflOperationCompleted = new System.Threading.SendOrPostCallback(this.OnZscmScflOperationCompleted);
         }
         this.InvokeAsync("ZscmScfl", new object[] {
                     ZscmScfl1}, this.ZscmScflOperationCompleted, userState);
     }
-    
-    private void OnZscmScflOperationCompleted(object arg) {
-        if ((this.ZscmScflCompleted != null)) {
+
+    private void OnZscmScflOperationCompleted(object arg)
+    {
+        if ((this.ZscmScflCompleted != null))
+        {
             System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
             this.ZscmScflCompleted(this, new ZscmScflCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
         }
     }
-    
+
     /// <remarks/>
-    public new void CancelAsync(object userState) {
+    public new void CancelAsync(object userState)
+    {
         base.CancelAsync(userState);
     }
 }
@@ -92,18 +103,22 @@
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
-[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:sap-com:document:sap:soap:functions:mc-style")]
-public partial class ZscmScfl {
-    
+[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")]
+public partial class ZscmScfl
+{
+
     private string inputField;
-    
+
     /// <remarks/>
-    [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-    public string Input {
-        get {
+    [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
+    public string Input
+    {
+        get
+        {
             return this.inputField;
         }
-        set {
+        set
+        {
             this.inputField = value;
         }
     }
@@ -114,18 +129,22 @@
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
-[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:sap-com:document:sap:soap:functions:mc-style")]
-public partial class ZscmScflResponse {
-    
+[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")]
+public partial class ZscmScflResponse
+{
+
     private string outputField;
-    
+
     /// <remarks/>
-    [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-    public string Output {
-        get {
+    [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
+    public string Output
+    {
+        get
+        {
             return this.outputField;
         }
-        set {
+        set
+        {
             this.outputField = value;
         }
     }
@@ -139,18 +158,22 @@
 [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.8.3928.0")]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
-public partial class ZscmScflCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-    
+public partial class ZscmScflCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+{
+
     private object[] results;
-    
-    internal ZscmScflCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-            base(exception, cancelled, userState) {
+
+    internal ZscmScflCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+    {
         this.results = results;
     }
-    
+
     /// <remarks/>
-    public ZscmScflResponse Result {
-        get {
+    public ZscmScflResponse Result
+    {
+        get
+        {
             this.RaiseExceptionIfNecessary();
             return ((ZscmScflResponse)(this.results[0]));
         }
diff --git a/api/ZSCM2_SCFLJHW.cs b/api/ZSCM2_SCFLJHW.cs
index 0ae0afe..1d86fec 100644
--- a/api/ZSCM2_SCFLJHW.cs
+++ b/api/ZSCM2_SCFLJHW.cs
@@ -25,64 +25,75 @@
 [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.8.3928.0")]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
-[System.Web.Services.WebServiceBindingAttribute(Name="binding", Namespace="urn:sap-com:document:sap:soap:functions:mc-style")]
-public partial class ZSCM2_SCFLJHW : System.Web.Services.Protocols.SoapHttpClientProtocol {
-    
+[System.Web.Services.WebServiceBindingAttribute(Name = "binding", Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")]
+public partial class ZSCM2_SCFLJHW : System.Web.Services.Protocols.SoapHttpClientProtocol
+{
+
     private System.Threading.SendOrPostCallback ZscmScflJhwOperationCompleted;
-    
+
     /// <remarks/>
-    public ZSCM2_SCFLJHW() {
-        this.Url = "http://10.89.33.217:8000/sap/bc/srt/rfc/sap/zscm2_scfljhw/110/zscm2_scflj" +
-            "hw/binding";
+    public ZSCM2_SCFLJHW()
+    {
+        this.Url = "http://10.89.33.201:8001/sap/bc/srt/rfc/sap/zscm2_scfljhw/800/zscm2_scfljh" +
+            "w/binding";
     }
-    
+
     /// <remarks/>
     public event ZscmScflJhwCompletedEventHandler ZscmScflJhwCompleted;
-    
+
     /// <remarks/>
-    [System.Web.Services.Protocols.SoapDocumentMethodAttribute("", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Bare)]
-    [return: System.Xml.Serialization.XmlElementAttribute("ZscmScflJhwResponse", Namespace="urn:sap-com:document:sap:soap:functions:mc-style")]
-    public ZscmScflJhwResponse ZscmScflJhw([System.Xml.Serialization.XmlElementAttribute("ZscmScflJhw", Namespace="urn:sap-com:document:sap:soap:functions:mc-style")] ZscmScflJhw ZscmScflJhw1) {
+    [System.Web.Services.Protocols.SoapDocumentMethodAttribute("", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Bare)]
+    [return: System.Xml.Serialization.XmlElementAttribute("ZscmScflJhwResponse", Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")]
+    public ZscmScflJhwResponse ZscmScflJhw([System.Xml.Serialization.XmlElementAttribute("ZscmScflJhw", Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")] ZscmScflJhw ZscmScflJhw1)
+    {
         object[] results = this.Invoke("ZscmScflJhw", new object[] {
                     ZscmScflJhw1});
         return ((ZscmScflJhwResponse)(results[0]));
     }
-    
+
     /// <remarks/>
-    public System.IAsyncResult BeginZscmScflJhw(ZscmScflJhw ZscmScflJhw1, System.AsyncCallback callback, object asyncState) {
+    public System.IAsyncResult BeginZscmScflJhw(ZscmScflJhw ZscmScflJhw1, System.AsyncCallback callback, object asyncState)
+    {
         return this.BeginInvoke("ZscmScflJhw", new object[] {
                     ZscmScflJhw1}, callback, asyncState);
     }
-    
+
     /// <remarks/>
-    public ZscmScflJhwResponse EndZscmScflJhw(System.IAsyncResult asyncResult) {
+    public ZscmScflJhwResponse EndZscmScflJhw(System.IAsyncResult asyncResult)
+    {
         object[] results = this.EndInvoke(asyncResult);
         return ((ZscmScflJhwResponse)(results[0]));
     }
-    
+
     /// <remarks/>
-    public void ZscmScflJhwAsync(ZscmScflJhw ZscmScflJhw1) {
+    public void ZscmScflJhwAsync(ZscmScflJhw ZscmScflJhw1)
+    {
         this.ZscmScflJhwAsync(ZscmScflJhw1, null);
     }
-    
+
     /// <remarks/>
-    public void ZscmScflJhwAsync(ZscmScflJhw ZscmScflJhw1, object userState) {
-        if ((this.ZscmScflJhwOperationCompleted == null)) {
+    public void ZscmScflJhwAsync(ZscmScflJhw ZscmScflJhw1, object userState)
+    {
+        if ((this.ZscmScflJhwOperationCompleted == null))
+        {
             this.ZscmScflJhwOperationCompleted = new System.Threading.SendOrPostCallback(this.OnZscmScflJhwOperationCompleted);
         }
         this.InvokeAsync("ZscmScflJhw", new object[] {
                     ZscmScflJhw1}, this.ZscmScflJhwOperationCompleted, userState);
     }
-    
-    private void OnZscmScflJhwOperationCompleted(object arg) {
-        if ((this.ZscmScflJhwCompleted != null)) {
+
+    private void OnZscmScflJhwOperationCompleted(object arg)
+    {
+        if ((this.ZscmScflJhwCompleted != null))
+        {
             System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
             this.ZscmScflJhwCompleted(this, new ZscmScflJhwCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
         }
     }
-    
+
     /// <remarks/>
-    public new void CancelAsync(object userState) {
+    public new void CancelAsync(object userState)
+    {
         base.CancelAsync(userState);
     }
 }
@@ -92,18 +103,22 @@
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
-[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:sap-com:document:sap:soap:functions:mc-style")]
-public partial class ZscmScflJhw {
-    
+[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")]
+public partial class ZscmScflJhw
+{
+
     private string inputField;
-    
+
     /// <remarks/>
-    [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-    public string Input {
-        get {
+    [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
+    public string Input
+    {
+        get
+        {
             return this.inputField;
         }
-        set {
+        set
+        {
             this.inputField = value;
         }
     }
@@ -114,18 +129,22 @@
 [System.SerializableAttribute()]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
-[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:sap-com:document:sap:soap:functions:mc-style")]
-public partial class ZscmScflJhwResponse {
-    
+[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")]
+public partial class ZscmScflJhwResponse
+{
+
     private string outputField;
-    
+
     /// <remarks/>
-    [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-    public string Output {
-        get {
+    [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
+    public string Output
+    {
+        get
+        {
             return this.outputField;
         }
-        set {
+        set
+        {
             this.outputField = value;
         }
     }
@@ -139,18 +158,22 @@
 [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.8.3928.0")]
 [System.Diagnostics.DebuggerStepThroughAttribute()]
 [System.ComponentModel.DesignerCategoryAttribute("code")]
-public partial class ZscmScflJhwCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-    
+public partial class ZscmScflJhwCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
+{
+
     private object[] results;
-    
-    internal ZscmScflJhwCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-            base(exception, cancelled, userState) {
+
+    internal ZscmScflJhwCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+            base(exception, cancelled, userState)
+    {
         this.results = results;
     }
-    
+
     /// <remarks/>
-    public ZscmScflJhwResponse Result {
-        get {
+    public ZscmScflJhwResponse Result
+    {
+        get
+        {
             this.RaiseExceptionIfNecessary();
             return ((ZscmScflJhwResponse)(this.results[0]));
         }
diff --git a/api/ZSCM_WC.cs b/api/ZSCM_WC.cs
index 3a8e47b..84fbc0a 100644
--- a/api/ZSCM_WC.cs
+++ b/api/ZSCM_WC.cs
@@ -8,179 +8,150 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Web.Services;
+using System.Web.Services.Protocols;
+using System.Xml.Serialization;
+
 // 
 // 姝ゆ簮浠ｇ爜鐢�wsdl 鑷姩鐢熸垚, Version=4.8.3928.0銆� // 
-namespace WHTest
-{
-    using System;
-    using System.Web.Services;
-    using System.Diagnostics;
-    using System.Web.Services.Protocols;
-    using System.Xml.Serialization;
-    using System.ComponentModel;
-    using HH.WCS.Mobox3.pinggao.util;
 
 
+/// <remarks/>
+// CODEGEN: 鏈鐞嗗懡鍚嶇┖闂粹�http://schemas.xmlsoap.org/ws/2004/09/policy鈥濅腑鐨勫彲閫�WSDL 鎵╁睍鍏冪礌鈥淧olicy鈥濄�
+[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.8.3928.0")]
+[System.Diagnostics.DebuggerStepThroughAttribute()]
+[System.ComponentModel.DesignerCategoryAttribute("code")]
+[System.Web.Services.WebServiceBindingAttribute(Name="binding", Namespace="urn:sap-com:document:sap:soap:functions:mc-style")]
+public partial class ZSCM_WC : System.Web.Services.Protocols.SoapHttpClientProtocol {
+    
+    private System.Threading.SendOrPostCallback ZscmWcOperationCompleted;
+    
     /// <remarks/>
-    // CODEGEN: 鏈鐞嗗懡鍚嶇┖闂粹�http://schemas.xmlsoap.org/ws/2004/09/policy鈥濅腑鐨勫彲閫�WSDL 鎵╁睍鍏冪礌鈥淧olicy鈥濄�
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.8.3928.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Web.Services.WebServiceBindingAttribute(Name = "binding", Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")]
-    public partial class ZSCM_WC : System.Web.Services.Protocols.SoapHttpClientProtocol
-    {
-
-        private System.Threading.SendOrPostCallback ZscmWcOperationCompleted;
-
-        /// <remarks/>
-        public ZSCM_WC()
-        {
-            //  this.Url = "http://ceerptest.cee.com.cn:8000/sap/bc/srt/rfc/sap/zscm_wc/110/zscm_wc/binding";
-            this.Url = "http://10.89.33.217:8000/sap/bc/srt/rfc/sap/zscm_wc/110/zscm_wc/binding";
-
-
+    public ZSCM_WC() {
+        this.Url = "http://10.89.33.201:8001/sap/bc/srt/rfc/sap/zscm_wc/800/zscm_wc/binding";
+    }
+    
+    /// <remarks/>
+    public event ZscmWcCompletedEventHandler ZscmWcCompleted;
+    
+    /// <remarks/>
+    [System.Web.Services.Protocols.SoapDocumentMethodAttribute("", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Bare)]
+    [return: System.Xml.Serialization.XmlElementAttribute("ZscmWcResponse", Namespace="urn:sap-com:document:sap:soap:functions:mc-style")]
+    public ZscmWcResponse ZscmWc([System.Xml.Serialization.XmlElementAttribute("ZscmWc", Namespace="urn:sap-com:document:sap:soap:functions:mc-style")] ZscmWc ZscmWc1) {
+        object[] results = this.Invoke("ZscmWc", new object[] {
+                    ZscmWc1});
+        return ((ZscmWcResponse)(results[0]));
+    }
+    
+    /// <remarks/>
+    public System.IAsyncResult BeginZscmWc(ZscmWc ZscmWc1, System.AsyncCallback callback, object asyncState) {
+        return this.BeginInvoke("ZscmWc", new object[] {
+                    ZscmWc1}, callback, asyncState);
+    }
+    
+    /// <remarks/>
+    public ZscmWcResponse EndZscmWc(System.IAsyncResult asyncResult) {
+        object[] results = this.EndInvoke(asyncResult);
+        return ((ZscmWcResponse)(results[0]));
+    }
+    
+    /// <remarks/>
+    public void ZscmWcAsync(ZscmWc ZscmWc1) {
+        this.ZscmWcAsync(ZscmWc1, null);
+    }
+    
+    /// <remarks/>
+    public void ZscmWcAsync(ZscmWc ZscmWc1, object userState) {
+        if ((this.ZscmWcOperationCompleted == null)) {
+            this.ZscmWcOperationCompleted = new System.Threading.SendOrPostCallback(this.OnZscmWcOperationCompleted);
         }
-
-        /// <remarks/>
-        public event ZscmWcCompletedEventHandler ZscmWcCompleted;
-
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Bare)]
-        [return: System.Xml.Serialization.XmlElementAttribute("ZscmWcResponse", Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")]
-        public ZscmWcResponse ZscmWc([System.Xml.Serialization.XmlElementAttribute("ZscmWc", Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")] ZscmWc ZscmWc1)
-        {
-            object[] results = this.Invoke("ZscmWc", new object[] {
-                        ZscmWc1});
-            return ((ZscmWcResponse)(results[0]));
-        }
-
-        /// <remarks/>
-        public System.IAsyncResult BeginZscmWc(ZscmWc ZscmWc1, System.AsyncCallback callback, object asyncState)
-        {
-            return this.BeginInvoke("ZscmWc", new object[] {
-                        ZscmWc1}, callback, asyncState);
-        }
-
-        /// <remarks/>
-        public ZscmWcResponse EndZscmWc(System.IAsyncResult asyncResult)
-        {
-            object[] results = this.EndInvoke(asyncResult);
-            return ((ZscmWcResponse)(results[0]));
-        }
-
-        /// <remarks/>
-        public void ZscmWcAsync(ZscmWc ZscmWc1)
-        {
-            this.ZscmWcAsync(ZscmWc1, null);
-        }
-
-        /// <remarks/>
-        public void ZscmWcAsync(ZscmWc ZscmWc1, object userState)
-        {
-            if ((this.ZscmWcOperationCompleted == null))
-            {
-                this.ZscmWcOperationCompleted = new System.Threading.SendOrPostCallback(this.OnZscmWcOperationCompleted);
-            }
-            this.InvokeAsync("ZscmWc", new object[] {
-                        ZscmWc1}, this.ZscmWcOperationCompleted, userState);
-        }
-
-        private void OnZscmWcOperationCompleted(object arg)
-        {
-            if ((this.ZscmWcCompleted != null))
-            {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.ZscmWcCompleted(this, new ZscmWcCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-
-        /// <remarks/>
-        public new void CancelAsync(object userState)
-        {
-            base.CancelAsync(userState);
+        this.InvokeAsync("ZscmWc", new object[] {
+                    ZscmWc1}, this.ZscmWcOperationCompleted, userState);
+    }
+    
+    private void OnZscmWcOperationCompleted(object arg) {
+        if ((this.ZscmWcCompleted != null)) {
+            System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+            this.ZscmWcCompleted(this, new ZscmWcCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
         }
     }
-
+    
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.8.3928.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")]
-    public partial class ZscmWc
-    {
+    public new void CancelAsync(object userState) {
+        base.CancelAsync(userState);
+    }
+}
 
-        private string inputField;
-
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-        public string Input
-        {
-            get
-            {
-                return this.inputField;
-            }
-            set
-            {
-                this.inputField = value;
-            }
+/// <remarks/>
+[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.8.3928.0")]
+[System.SerializableAttribute()]
+[System.Diagnostics.DebuggerStepThroughAttribute()]
+[System.ComponentModel.DesignerCategoryAttribute("code")]
+[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:sap-com:document:sap:soap:functions:mc-style")]
+public partial class ZscmWc {
+    
+    private string inputField;
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
+    public string Input {
+        get {
+            return this.inputField;
+        }
+        set {
+            this.inputField = value;
         }
     }
+}
 
+/// <remarks/>
+[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.8.3928.0")]
+[System.SerializableAttribute()]
+[System.Diagnostics.DebuggerStepThroughAttribute()]
+[System.ComponentModel.DesignerCategoryAttribute("code")]
+[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:sap-com:document:sap:soap:functions:mc-style")]
+public partial class ZscmWcResponse {
+    
+    private string outputField;
+    
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.8.3928.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "urn:sap-com:document:sap:soap:functions:mc-style")]
-    public partial class ZscmWcResponse
-    {
-
-        private string outputField;
-
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-        public string Output
-        {
-            get
-            {
-                return this.outputField;
-            }
-            set
-            {
-                this.outputField = value;
-            }
+    [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
+    public string Output {
+        get {
+            return this.outputField;
+        }
+        set {
+            this.outputField = value;
         }
     }
+}
 
+/// <remarks/>
+[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.8.3928.0")]
+public delegate void ZscmWcCompletedEventHandler(object sender, ZscmWcCompletedEventArgs e);
+
+/// <remarks/>
+[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.8.3928.0")]
+[System.Diagnostics.DebuggerStepThroughAttribute()]
+[System.ComponentModel.DesignerCategoryAttribute("code")]
+public partial class ZscmWcCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+    
+    private object[] results;
+    
+    internal ZscmWcCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+            base(exception, cancelled, userState) {
+        this.results = results;
+    }
+    
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.8.3928.0")]
-    public delegate void ZscmWcCompletedEventHandler(object sender, ZscmWcCompletedEventArgs e);
-
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.8.3928.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class ZscmWcCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
-        private object[] results;
-
-        internal ZscmWcCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-                base(exception, cancelled, userState)
-        {
-            this.results = results;
-        }
-
-        /// <remarks/>
-        public ZscmWcResponse Result
-        {
-            get
-            {
-                this.RaiseExceptionIfNecessary();
-                return ((ZscmWcResponse)(this.results[0]));
-            }
+    public ZscmWcResponse Result {
+        get {
+            this.RaiseExceptionIfNecessary();
+            return ((ZscmWcResponse)(this.results[0]));
         }
     }
 }
diff --git a/core/WMSCore.cs b/core/WMSCore.cs
index e37ee07..81845a2 100644
--- a/core/WMSCore.cs
+++ b/core/WMSCore.cs
@@ -80,7 +80,8 @@
                                     LocationHelper.LockLoc(endloc.S_CODE, 1);
                                     item.N_B_STATE = 2;
                                     item.S_B_STATE = "浣滀笟鍚姩";
-                                    db.Updateable(item).UpdateColumns(it => new { it.S_B_STATE, it.N_B_STATE }).ExecuteCommand();
+                                    item.S_SORT_TYPE = "寰呭垎鎷�;
+                                    db.Updateable(item).UpdateColumns(it => new { it.S_B_STATE, it.N_B_STATE,it.S_SORT_TYPE }).ExecuteCommand();
                                 }
                             }
                             else
@@ -93,7 +94,9 @@
                         {
                              LogHelper.Info($"{item.S_BS_NO}閰嶇洏 搴撳尯{item.S_AREA_CODE}璐т綅鎵句笉鍒�);
                         }
-                        
+                    
+
+
                    }
                     else
                     {
diff --git a/enc_temp_folder/d910702ef84a263576574cba1cbe589/WebService.asmx.cs b/enc_temp_folder/d910702ef84a263576574cba1cbe589/WebService.asmx.cs
new file mode 100644
index 0000000..012bd87
--- /dev/null
+++ b/enc_temp_folder/d910702ef84a263576574cba1cbe589/WebService.asmx.cs
@@ -0,0 +1,841 @@
+锘縰sing pinggaoWebApi.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Configuration;
+using System.Linq;
+using System.Web;
+using System.Web.Services;
+using Newtonsoft.Json;
+using System.Web.Http;
+using System.Xml.Linq;
+using System.Xml.Serialization;
+using System.Net.Http;
+using System.Text;
+using System.Web.UI.WebControls;
+using pinggaoWebApi.Models;
+using static pinggaoWebApi.Controllers.SapRoot;
+using Newtonsoft.Json.Linq;
+using System.Web.Mvc;
+using System.Xml;
+using System.Data;
+using pinggaoWebApi.Controllers;
+using System.Threading.Tasks;
+using System.IO;
+using System.Data.SqlTypes;
+using System.Text.RegularExpressions;
+using System.Reflection;
+
+namespace pinggaoWebApi
+{
+
+    /// <summary>
+    /// WebService1 鐨勬憳瑕佽鏄�+    /// </summary>
+    [WebService(Namespace = "http://tempuri.org/")]
+    [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
+    [System.ComponentModel.ToolboxItem(false)]
+    // 鑻ヨ鍏佽浣跨敤 ASP.NET AJAX 浠庤剼鏈腑璋冪敤姝�Web 鏈嶅姟锛岃鍙栨秷娉ㄩ噴浠ヤ笅琛屻� 
+    // [System.Web.Script.Services.ScriptService]
+
+    public class WebService : System.Web.Services.WebService
+    {
+        public static void EnsureArrayFormats(JObject json, string name)
+        {
+            foreach (var property in json.Properties())
+            {
+                // 濡傛灉褰撳墠灞炴�鍚嶄笌鎸囧畾鍚嶇О鍖归厤
+                if (property.Name.Equals(name))
+                {
+                    // 濡傛灉灞炴�鍊兼槸 JObject锛屼笖涓嶆槸 JArray锛屽垯灏嗗叾鍖呰鎴愭暟缁�+                    if (property.Value is JObject)
+                    {
+                        JArray newArray = new JArray(property.Value);
+                        property.Value = newArray;
+                    }
+                    // 濡傛灉灞炴�鍊煎凡缁忔槸 JArray锛屽垯涓嶉渶瑕佽繘涓�鎿嶄綔
+                    else if (property.Value is JArray)
+                    {
+                        // 宸茬粡鏄暟缁勶紝鏃犻渶鎿嶄綔
+                    }
+                    // 濡傛灉灞炴�鍊兼槸鍏朵粬绫诲瀷锛屽垯灏嗗叾杞崲涓哄崟涓厓绱犵殑鏁扮粍
+                    else
+                    {
+                        JArray newArray = new JArray(property.Value);
+                        property.Value = newArray;
+                    }
+                }
+                // 濡傛灉灞炴�鍊兼槸 JObject锛岄�褰掓鏌ュ叾瀛愬睘鎬�+                else if (property.Value is JObject)
+                {
+                    EnsureArrayFormats((JObject)property.Value, name);
+                }
+            }
+        }
+        /// <summary>
+        /// 鏁版嵁
+        /// </summary>
+        /// <param name="json"></param>
+        /// <param name="name"></param>
+        /// <param name="name1"></param>
+        public static void EnsureArrayFormat(JObject json, string name, string name1)
+        {
+            foreach (var property in json.Properties())
+            {
+                if (property.Name == name || property.Name == name1)
+                {
+                    if (property.Value is JObject && !(property.Value is JArray))
+                    {
+                        // 鑻ヤ负鍗曚釜瀵硅薄锛屽寘瑁呮垚鏁扮粍
+                        property.Value = new JArray(property.Value);
+                    }
+                }
+                if (property.Value is JObject)
+                {
+                    // 閫掑綊澶勭悊瀛愬璞�+                    EnsureArrayFormat((JObject)property.Value, name, name1);
+                }
+                else if (property.Value is JArray)
+                {
+                    // 閫掑綊澶勭悊鏁扮粍涓殑姣忎釜鍏冪礌
+                    foreach (var item in (JArray)property.Value)
+                    {
+                        if (item is JObject)
+                        {
+                            EnsureArrayFormat((JObject)item, name, name1);
+                        }
+                    }
+                }
+            }
+        }
+        public static void EnsureArrayFormat(JObject json, string propertyName)
+        {
+            // 鏌ユ壘鍚嶄负 propertyName 鐨勫睘鎬�+            JProperty property = json.Property(propertyName);
+
+            if (property != null)
+            {
+                // 妫�煡灞炴�鍊兼槸鍚︿负 JObject 绫诲瀷锛堝嵆鍗曚釜瀵硅薄锛�+                if (property.Value is JObject)
+                {
+                    // 灏嗗崟涓璞″寘瑁呮垚鏁扮粍
+                    JArray newArray = new JArray(property.Value);
+                    property.Value = newArray;
+                }
+                else if (property.Value is JArray)
+                {
+                    // 濡傛灉灞炴�鍊煎凡缁忔槸 JArray锛屽垯涓嶉渶瑕佸仛浠讳綍鎿嶄綔
+                    // 浣嗗鏋滈渶瑕侀�褰掓鏌ユ暟缁勪腑鐨勬瘡涓厓绱狅紝鍙互鍦ㄨ繖閲屽疄鐜�+                }
+            }
+        }
+        /// <summary>
+        /// 鏁版嵁
+        /// </summary>
+        /// <param name="json"></param>
+        /// <param name="name"></param>
+        /// <param name="name1"></param>
+        public static void EnsureArrayFormat(JObject json, string name, string name1, string name2)
+        {
+            foreach (var property in json.Properties())
+            {
+                if (property.Name == name || property.Name == name2)
+                {
+                    if (property.Value is JObject && !(property.Value is JArray))
+                    {
+                        // 鑻ヤ负鍗曚釜瀵硅薄锛屽寘瑁呮垚鏁扮粍
+                        property.Value = new JArray(property.Value);
+                    }
+                }
+                if (property.Value is JObject)
+                {
+                    // 閫掑綊澶勭悊瀛愬璞�+                    EnsureArrayFormat((JObject)property.Value, name, name1, name2);
+                }
+                else if (property.Value is JArray)
+                {
+                    // 閫掑綊澶勭悊鏁扮粍涓殑姣忎釜鍏冪礌
+                    foreach (var item in (JArray)property.Value)
+                    {
+                        if (item is JObject)
+                        {
+                            EnsureArrayFormat((JObject)item, name, name1, name2);
+                        }
+                    }
+                }
+            }
+        }    
+        public static void EnsureArrayFormats(JObject json, string name, string name1, string name2)
+        {
+            foreach (var property in json.Properties())
+            {
+                if (property.Name == name || property.Name == name2 || property.Name == name1)
+                {
+                    if (property.Value is JObject && !(property.Value is JArray))
+                    {
+                        // 鑻ヤ负鍗曚釜瀵硅薄锛屽寘瑁呮垚鏁扮粍
+                        property.Value = new JArray(property.Value);
+                    }
+                }
+                if (property.Value is JObject)
+                {
+                    // 閫掑綊澶勭悊瀛愬璞�+                    EnsureArrayFormat((JObject)property.Value, name, name1, name2);
+                }
+                else if (property.Value is JArray)
+                {
+                    // 閫掑綊澶勭悊鏁扮粍涓殑姣忎釜鍏冪礌
+                    foreach (var item in (JArray)property.Value)
+                    {
+                        if (item is JObject)
+                        {
+                            EnsureArrayFormat((JObject)item, name, name1, name2);
+                        }
+                    }
+                }
+            }
+        }
+
+        [WebMethod]
+        public string InWorkArea(string data)
+        {
+            var result = "";
+            LogHelper.Info($"鎺ュ彛 InWorkArea 杈撳叆鍙傛暟{data}");
+
+           
+            return result;
+        }
+        /// <summary>
+        /// 澶栭噰鏀惰揣
+        /// </summary>
+        /// <param name="ROOT"></param>
+        /// <returns></returns>
+        [WebMethod]
+        [ValidateInput(false)] // 绂佺敤璇锋眰楠岃瘉
+        public string WCReceiveXmlData(string ROOT)
+        {
+
+            LogHelper.Info("澶栭噰鏀惰揣鎺ュ彛鍦板潃" + ConfigurationManager.AppSettings["URL"].ToString() + "WCReceiveXmlData");
+            var ss = ConfigurationManager.AppSettings["URL"].ToString();
+            //鎺ユ敹xml鏁版嵁
+            XmlDocument xmlDoc = new XmlDocument();
+            xmlDoc.LoadXml(ROOT.ToString());
+
+            //灏�XmlDocument 杞崲涓�JSON 瀛楃涓�+            JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
+
+            // 澶勭悊鐗瑰畾瀛楁锛屽己鍒惰浆鎹负鏁扮粍
+            EnsureArrayFormat(jsonObject, "WLPZ", "HEAD", "ITEM");
+            ///  鍙嶅簭鍒楀寲涓篟ootWithArray
+            var datas = JsonConvert.DeserializeObject<Root>(jsonObject.ToString());
+            var sdada = JsonConvert.SerializeObject(datas);
+
+            var feedinfo = HttpHelper.WebPost(ConfigurationManager.AppSettings["URL"].ToString() + "WCReceiveXmlData", JsonConvert.SerializeObject(datas), "application/json");
+            LogHelper.Info($"WCReceiveXmlData mobox杩斿洖鍙傛暟{feedinfo}");
+
+            var jsonObj = JsonConvert.DeserializeObject<WcReturnRoot.Root>(feedinfo);
+
+            var json = JsonConvert.SerializeObject(jsonObj);
+            string xml = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + JsonConvert.DeserializeXmlNode(json, "").OuterXml;
+
+            LogHelper.Info("  澶栭噰鏀惰揣" + xml);
+            return xml;
+
+        }
+
+
+        /// <summary>
+        /// 鍐呴噰鏀惰揣
+        /// </summary>
+        /// <param name="ROOT"></param>
+        /// <returns></returns>
+        [WebMethod]
+        [ValidateInput(false)] // 绂佺敤璇锋眰楠岃瘉
+        public  string NCReceiveXmlData(string ROOT)
+        {
+            LogHelper.Info("杩涙潵浜� + ROOT);
+            LogHelper.Info("鍐呴噰鏀惰揣" + ConfigurationManager.AppSettings["URL"].ToString() + "NCReceiveXmlData");
+
+            var ss = ConfigurationManager.AppSettings["URL"].ToString();
+            //鎺ユ敹xml鏁版嵁
+            XmlDocument xmlDoc = new XmlDocument();
+            xmlDoc.LoadXml(ROOT.ToString());
+
+            //灏�XmlDocument 杞崲涓�JSON 瀛楃涓�+            JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
+
+            // 澶勭悊鐗瑰畾瀛楁锛屽己鍒惰浆鎹负鏁扮粍
+            EnsureArrayFormat(jsonObject, "WLPZ", "HEAD", "ITEM");
+            ///  鍙嶅簭鍒楀寲涓篟ootWithArray
+            var datas = JsonConvert.DeserializeObject<NcDto.Root>(jsonObject.ToString());
+            var sdada = JsonConvert.SerializeObject(datas);
+
+            var feedinfo = HttpHelper.WebPost(ConfigurationManager.AppSettings["URL"].ToString() + "NCReceiveXmlData", JsonConvert.SerializeObject(datas), "application/json");
+            LogHelper.Info($"NCReceiveXmlData mobox杩斿洖鍙傛暟{feedinfo}");
+            var jsonObj = JsonConvert.DeserializeObject<WcReturnRoot.Root>(feedinfo);
+
+            var json = JsonConvert.SerializeObject(jsonObj);
+            string xml = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + JsonConvert.DeserializeXmlNode(json, "").OuterXml;
+
+            LogHelper.Info("  鍐呴噰鏀惰揣杩斿洖" + xml);
+            return xml;
+
+        }
+        /// <summary>
+        /// 鐢熶骇璁㈠崟棰嗘枡鍗�鐢熸垚棰嗘枡鍗�
+        /// </summary>
+        /// <param name="ROOT"></param>
+        /// <returns></returns>
+        [WebMethod]
+        [ValidateInput(false)] // 绂佺敤璇锋眰楠岃瘉
+        public string LLDReceiveXmlData(string ROOT)
+        {
+
+            LogHelper.Info("鐢熶骇璁㈠崟棰嗘枡鍗�鐢熸垚棰嗘枡鍗�" + ConfigurationManager.AppSettings["URL"].ToString() + "LLDReceiveXmlData");
+            var ss = ConfigurationManager.AppSettings["URL"].ToString();
+            //鎺ユ敹xml鏁版嵁
+            XmlDocument xmlDoc = new XmlDocument();
+            xmlDoc.LoadXml(ROOT.ToString());
+
+            //灏�XmlDocument 杞崲涓�JSON 瀛楃涓�+            JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
+
+            // 澶勭悊鐗瑰畾瀛楁锛屽己鍒惰浆鎹负鏁扮粍
+            EnsureArrayFormat(jsonObject, "SCDDLL", "ITEM", "");
+            //EnsureArrayFormat(jsonObject["ROOT"]["SCDDLL"] as JObject, "ITEM");
+            ///  鍙嶅簭鍒楀寲涓篟ootWithArray
+            var datas = JsonConvert.DeserializeObject<CKDdto.RootModel>(jsonObject.ToString());
+            var sdada = JsonConvert.SerializeObject(datas);
+
+            var feedinfo = HttpHelper.WebPost(ConfigurationManager.AppSettings["URL"].ToString() + "LLDReceiveXmlData", JsonConvert.SerializeObject(datas), "application/json");
+            LogHelper.Info($"LLDReceiveXmlData mobox杩斿洖鍙傛暟{feedinfo}");
+
+            var jsonObj = JsonConvert.DeserializeObject<LLDReturnRoot.Root>(feedinfo);
+
+            var json = JsonConvert.SerializeObject(jsonObj);
+
+            string xml = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + JsonConvert.DeserializeXmlNode(json, "").OuterXml;
+
+            LogHelper.Info("鐢熶骇璁㈠崟棰嗘枡鍗�鐢熸垚棰嗘枡鍗�" + xml);
+            return xml;
+
+        }
+
+        public static void EnsureArrayFormat2(JObject obj, string propertyName)
+        {
+            foreach (var prop in obj.Properties().ToList())
+            {
+                if (prop.Name == propertyName && prop.Value is JValue)
+                {
+                    obj[propertyName] = new JArray(prop.Value);
+                }
+                else if (prop.Value is JObject childObj)
+                {
+                    EnsureArrayFormat2(childObj, propertyName);
+                }
+                else if (prop.Value is JArray childArray)
+                {
+                    foreach (var item in childArray)
+                    {
+                        if (item is JObject itemObj)
+                        {
+                            EnsureArrayFormat2(itemObj, propertyName);
+                        }
+                    }
+                }
+            }
+        }
+        public class SingleOrArrayConverter<T> : JsonConverter
+        {
+            public override bool CanConvert(Type objectType)
+            {
+                return objectType == typeof(List<T>);
+            }
+
+            public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+            {
+                // 鍏堟鏌ユ槸鍚︿负null
+                if (reader.TokenType == JsonToken.Null)
+                {
+                    return new List<T>();
+                }
+
+                // 澶勭悊绌烘暟缁勬儏鍐�+                if (reader.TokenType == JsonToken.StartArray)
+                {
+                    try
+                    {
+                        var list = new List<T>();
+                        while (reader.Read() && reader.TokenType != JsonToken.EndArray)
+                        {
+                            if (reader.TokenType == JsonToken.Null)
+                            {
+                                list.Add(default(T));
+                            }
+                            else
+                            {
+                                list.Add(serializer.Deserialize<T>(reader));
+                            }
+                        }
+                        return list;
+                    }
+                    catch (JsonSerializationException)
+                    {
+                        // 濡傛灉鏁扮粍瑙ｆ瀽澶辫触锛岃繑鍥炵┖鍒楄〃
+                        return new List<T>();
+                    }
+                }
+
+                // 澶勭悊鍗曚釜鍊兼儏鍐�+                if (reader.TokenType == JsonToken.String ||
+                    reader.TokenType == JsonToken.Integer ||
+                    reader.TokenType == JsonToken.Float ||
+                    reader.TokenType == JsonToken.Boolean)
+                {
+                    try
+                    {
+                        return new List<T> { serializer.Deserialize<T>(reader) };
+                    }
+                    catch
+                    {
+                        return new List<T>();
+                    }
+                }
+
+                // 澶勭悊瀵硅薄鎯呭喌锛堝 { "XLH": "value" }锛�+                if (reader.TokenType == JsonToken.StartObject)
+                {
+                    reader.Read(); // 璺宠繃StartObject
+                    if (reader.TokenType == JsonToken.PropertyName)
+                    {
+                        reader.Read(); // 璺宠繃灞炴�鍚�+                        return ReadJson(reader, objectType, existingValue, serializer);
+                    }
+                }
+
+                // 鍏朵粬鎯呭喌杩斿洖绌哄垪琛�+                return new List<T>();
+            }
+
+            public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+            {
+                serializer.Serialize(writer, value);
+            }
+        }
+        /// <summary>
+        /// 鍏朵粬鍑哄叆搴�+        /// </summary>
+        /// <param name="ROOT"></param>
+        /// <returns></returns>
+        [WebMethod]
+        [ValidateInput(false)] // 绂佺敤璇锋眰楠岃瘉
+        public string OtherReceiveXmlData(string ROOT)
+        {
+            try
+            {
+
+               
+                LogHelper.Info($"ROOT{ROOT}");
+                LogHelper.Info("鍏朵粬鍑哄叆搴� + ConfigurationManager.AppSettings["URL"].ToString() + "OtherReceiveXmlData");
+                var ss = ConfigurationManager.AppSettings["URL"].ToString();
+                //鎺ユ敹xml鏁版嵁
+                XmlDocument xmlDoc = new XmlDocument();
+                xmlDoc.LoadXml(ROOT.ToString());
+
+                //灏�XmlDocument 杞崲涓�JSON 瀛楃涓�+                JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
+
+
+                LogHelper.Info($"jsonObject{JsonConvert.SerializeObject(jsonObject)}");
+
+           
+                // 澶勭悊鐗瑰畾瀛楁锛屽己鍒惰浆鎹负鏁扮粍
+                EnsureArrayFormat(jsonObject, "WLPZ", "HEAD", "ITEM");
+
+
+                EnsureArrayFormat2(jsonObject, "XLH");
+                var settings = new JsonSerializerSettings
+                {
+                    Converters = { new SingleOrArrayConverter<string>() }
+                };
+
+                var result = JsonConvert.DeserializeObject<otherDto.Root>(jsonObject.ToString(), settings);
+
+                var sss = jsonObject.ToString();
+                ///  鍙嶅簭鍒楀寲涓篟ootWithArray
+                var datas = JsonConvert.DeserializeObject<otherDto.Root>(jsonObject.ToString());
+
+
+
+                var sdada = JsonConvert.SerializeObject(datas);
+                LogHelper.Info($"111杩斿洖鍙傛暟{sdada}");
+
+                var feedinfo = HttpHelper.WebPost(ConfigurationManager.AppSettings["URL"].ToString() + "OtherReceiveXmlData", JsonConvert.SerializeObject(datas), "application/json");
+                LogHelper.Info($"OtherReceiveXmlData mobox杩斿洖鍙傛暟{feedinfo}");
+
+                var jsonObj = JsonConvert.DeserializeObject<OtherReturnRoot.Root>(feedinfo);
+
+                var json = JsonConvert.SerializeObject(jsonObj);
+                string xml = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + JsonConvert.DeserializeXmlNode(json, "").OuterXml;
+                LogHelper.Info("鍏朵粬鍑哄叆搴撹繑鍥� + xml);
+                return xml;
+            }
+            catch (Exception e)
+            {
+                LogHelper.Info("鍏朵粬鍑哄叆搴撹繑鍥� + e.Message);
+                throw;
+            }
+          
+
+        }
+        ///// <summary>
+        ///// 澶栭噰鍐呴噰閫氱敤鏀惰揣
+        ///// </summary>
+        ///// <param name="ROOT"></param>
+        ///// <returns></returns>
+        //[WebMethod]
+        //[ValidateInput(false)] // 绂佺敤璇锋眰楠岃瘉
+        //public string TYReceiveXmlData(string ROOT)
+        //{
+
+        //    LogHelper.Info("鏀惰揣鎺ュ彛鍦板潃" + ConfigurationManager.AppSettings["URL"].ToString() + "WCReceiveXmlData");
+        //    var ss = ConfigurationManager.AppSettings["URL"].ToString();
+        //    //鎺ユ敹xml鏁版嵁
+        //    XmlDocument xmlDoc = new XmlDocument();
+        //    xmlDoc.LoadXml(ROOT.ToString());
+
+        //    //灏�XmlDocument 杞崲涓�JSON 瀛楃涓�+        //    JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
+
+        //    // 澶勭悊鐗瑰畾瀛楁锛屽己鍒惰浆鎹负鏁扮粍
+        //    EnsureArrayFormat(jsonObject, "WLPZ", "HEAD", "ITEM");
+        //    ///  鍙嶅簭鍒楀寲涓篟ootWithArray
+        //    var wcdatas = JsonConvert.DeserializeObject<Root>(jsonObject.ToString());
+
+        //    if (wcdatas.ROOT.WLPZ[0].HEAD.YDLX== "103"|| wcdatas.ROOT.WLPZ[0].HEAD.YDLX == "104")
+        //    {
+
+        //        var feedinfo = HttpHelper.WebPost(ConfigurationManager.AppSettings["URL"].ToString() + "WCReceiveXmlData", JsonConvert.SerializeObject(wcdatas), "application/json");
+        //        LogHelper.Info($"WCReceiveXmlData mobox杩斿洖鍙傛暟{feedinfo}");
+
+
+
+        //        var jsonObj = JsonConvert.DeserializeObject<WcReturnRoot.Root>(feedinfo);
+
+        //        var json = JsonConvert.SerializeObject(jsonObj);
+        //        string xml = JsonConvert.DeserializeXmlNode(json, "").OuterXml;
+
+        //        return xml;
+        //    }
+        //    else
+        //    {
+        //        var ncdatas = JsonConvert.DeserializeObject<NcDto.Root>(jsonObject.ToString());
+        //        var sss = JsonConvert.SerializeObject(wcdatas);
+        //        var feedinfo = HttpHelper.WebPost(ConfigurationManager.AppSettings["URL"].ToString() + "NCReceiveXmlData", JsonConvert.SerializeObject(ncdatas), "application/json");
+        //        LogHelper.Info($"NCReceiveXmlData mobox杩斿洖鍙傛暟{feedinfo}");
+
+        //        var jsonObj = JsonConvert.DeserializeObject<WcReturnRoot.Root>(feedinfo);
+
+        //        var json = JsonConvert.SerializeObject(jsonObj);
+        //        string xml = JsonConvert.DeserializeXmlNode(json, "").OuterXml;
+
+        //        return xml;
+        //    }
+
+        //}
+
+        ///// <summary>
+        /////鍐呴噰鏀惰揣
+        ///// </summary>
+        ///// <param name="ROOT"></param>
+        ///// <returns></returns>
+        //[WebMethod]
+        //public ReturrnBackNC.Root NCReceiveXmlData(NcDto.ROOT2 ROOT)
+        //{
+        //    string result;
+
+        //    LogHelper.Info("鍐呴噰鏀惰揣鎺ュ彛鍦板潃" + ConfigurationManager.AppSettings["URL"].ToString() + "NCReceiveXmlData");
+        //    var feedinfo = HttpHelper.WebPost(ConfigurationManager.AppSettings["URL"].ToString() + "NCReceiveXmlData", JsonConvert.SerializeObject(ROOT), "application/json");
+        //    LogHelper.Info($"NCReceiveXmlData mobox杩斿洖鍙傛暟{feedinfo}");
+        //    var data = JsonConvert.DeserializeObject<ReturrnBackNC.ITEM>(feedinfo);
+
+        //    // 鍋囪data鏄竴涓凡缁忓垵濮嬪寲鐨処TEM瀵硅薄
+        //    ReturrnBackNC.ITEM data1 = new ReturrnBackNC.ITEM
+        //    {
+        //        KEY = data?.WLPZBH,
+        //        WLPZBH = data?.WLPZBH,
+        //        WLPZND = data?.WLPZND,
+        //        MSGCODE = data?.MSGCODE,
+        //        MSGDESP = data?.WLPZBH
+        //    };
+        //    if (string.IsNullOrEmpty(feedinfo))
+        //    {
+        //        data1.WLPZBH = "";
+        //        data1.MSGCODE = "1";
+        //        data1.MSGDESP = "鏈皟閫�;
+        //    }
+        //    // 瀹炰緥鍖朢OOT瀵硅薄锛屽苟灏咺TEM瀵硅薄璧嬪�缁橰OOT鐨処tem灞炴�
+        //    ReturrnBackNC.ROOT root = new ReturrnBackNC.ROOT
+        //    {
+        //        ITEM = data
+        //    };
+        //    ReturrnBackNC.Root roots = new ReturrnBackNC.Root
+        //    {
+        //        ROOT = root
+        //    };
+        //    return roots;
+
+        //}
+
+
+
+
+        ///// <summary>
+        /////鍏朵粬鍑哄叆搴�+        ///// </summary>
+        ///// <param name="ROOT"></param>
+        ///// <returns></returns>
+        //[WebMethod]
+        //public ReturrnBack.Root OtherReceiveXmlData(otherDto.ROOT3 ROOT)
+        //{
+        //    string result;
+
+        //    LogHelper.Info("鍏朵粬鍑哄叆搴撴帴鍙ｅ湴鍧� + ConfigurationManager.AppSettings["URL"].ToString() + "OtherReceiveXmlData");
+        //    var feedinfo = HttpHelper.WebPost(ConfigurationManager.AppSettings["URL"].ToString() + "OtherReceiveXmlData", JsonConvert.SerializeObject(ROOT), "application/json");
+        //    LogHelper.Info($"OtherReceiveXmlData mobox杩斿洖鍙傛暟{feedinfo}");
+        //    var data = JsonConvert.DeserializeObject<ReturrnBack.ITEM>(feedinfo);
+
+        //    // 鍋囪data鏄竴涓凡缁忓垵濮嬪寲鐨処TEM瀵硅薄
+        //    ReturrnBack.ITEM data1 = new ReturrnBack.ITEM
+        //    {
+        //        WLPZBH = data?.WLPZBH,
+        //        MSGCODE = data?.MSGCODE,
+        //        MSGDESP = data?.WLPZBH
+        //    };
+        //    if (string.IsNullOrEmpty(feedinfo))
+        //    {
+        //        data1.WLPZBH = "";
+        //        data1.MSGCODE = "1";
+        //        data1.MSGDESP = "鏈皟閫�;
+        //    }
+        //    // 瀹炰緥鍖朢OOT瀵硅薄锛屽苟灏咺TEM瀵硅薄璧嬪�缁橰OOT鐨処tem灞炴�
+        //    ReturrnBack.ROOT root = new ReturrnBack.ROOT
+        //    {
+        //        ITEM = data
+        //    };
+        //    ReturrnBack.Root roots = new ReturrnBack.Root
+        //    {
+        //        ROOT = root
+        //    };
+        //    return roots;
+
+        //}
+
+
+
+
+        /// <summary>
+        /// 鐢熶骇璁㈠崟淇℃伅鑾峰彇
+        /// </summary>
+        /// <param name="ROOT"></param>
+        /// <returns></returns>
+        [WebMethod]
+        [ValidateInput(false)] // 绂佺敤璇锋眰楠岃瘉
+        public string OrderReceiveXmlData(string ROOT)
+        {
+
+            LogHelper.Info("鐢熶骇璁㈠崟淇℃伅鑾峰彇" + ConfigurationManager.AppSettings["URL"].ToString() + "OrderReceiveXmlData");
+            var ss = ConfigurationManager.AppSettings["URL"].ToString();
+            //鎺ユ敹xml鏁版嵁
+            XmlDocument xmlDoc = new XmlDocument();
+            xmlDoc.LoadXml(ROOT.ToString());
+
+            //灏�XmlDocument 杞崲涓�JSON 瀛楃涓�+            JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
+
+            // 澶勭悊鐗瑰畾瀛楁锛屽己鍒惰浆鎹负鏁扮粍
+            EnsureArrayFormat(jsonObject, "SCDD", "ITEM");
+            ///  鍙嶅簭鍒楀寲涓篟ootWithArray
+            var datas = JsonConvert.DeserializeObject<OrderDto.Root>(jsonObject.ToString());
+            var sdada = JsonConvert.SerializeObject(datas);
+
+            var feedinfo = HttpHelper.WebPost(ConfigurationManager.AppSettings["URL"].ToString() + "OrderReceiveXmlData", JsonConvert.SerializeObject(datas), "application/json");
+            LogHelper.Info($"OtherReceiveXmlData mobox杩斿洖鍙傛暟{feedinfo}");
+
+            var jsonObj = JsonConvert.DeserializeObject<Orderback.Root>(feedinfo);
+
+            var json = JsonConvert.SerializeObject(jsonObj);
+            string xml = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + JsonConvert.DeserializeXmlNode(json, "").OuterXml;
+
+            return xml;
+
+        }
+        /// <summary>
+        ///鐢熶骇璁㈠崟淇℃伅鑾峰彇
+        /// </summary>
+        /// <param name="ROOT"></param>
+        /// <returns></returns>
+        //[WebMethod]
+        //public ReturrnBack.Root OrderReceiveXmlData(OrderDto.ROOT4 ROOT)
+        //{
+        //    string result;
+
+        //    LogHelper.Info("鐢熶骇璁㈠崟淇℃伅鑾峰彇鎺ュ彛鍦板潃" + ConfigurationManager.AppSettings["URL"].ToString() + "OrderReceiveXmlData");
+        //    var feedinfo = HttpHelper.WebPost(ConfigurationManager.AppSettings["URL"].ToString() + "OrderReceiveXmlData", JsonConvert.SerializeObject(ROOT), "application/json");
+        //    LogHelper.Info($"OrderReceiveXmlData mobox杩斿洖鍙傛暟{feedinfo}");
+        //    var data = JsonConvert.DeserializeObject<ReturrnBack.ITEM>(feedinfo);
+
+        //    // 鍋囪data鏄竴涓凡缁忓垵濮嬪寲鐨処TEM瀵硅薄
+        //    ReturrnBack.ITEM data1 = new ReturrnBack.ITEM
+        //    {
+        //        WLPZBH = data?.WLPZBH,
+        //        MSGCODE = data?.MSGCODE,
+        //        MSGDESP = data?.WLPZBH
+        //    };
+        //    if (string.IsNullOrEmpty(feedinfo))
+        //    {
+        //        data1.WLPZBH = "";
+        //        data1.MSGCODE = "1";
+        //        data1.MSGDESP = "鏈皟閫�;
+        //    }
+        //    // 瀹炰緥鍖朢OOT瀵硅薄锛屽苟灏咺TEM瀵硅薄璧嬪�缁橰OOT鐨処tem灞炴�
+        //    ReturrnBack.ROOT root = new ReturrnBack.ROOT
+        //    {
+        //        ITEM = data
+        //    };
+        //    ReturrnBack.Root roots = new ReturrnBack.Root
+        //    {
+        //        ROOT = root
+        //    };
+        //    return roots;
+
+        //}
+
+
+
+
+
+
+        /// <summary>
+        /// 涓荤墿鏂欎俊鎭幏鍙�+        /// </summary>
+        /// <param name="ROOT"></param>
+        /// <returns></returns>
+        [WebMethod]
+        [ValidateInput(false)] // 绂佺敤璇锋眰楠岃瘉
+        public string MaterReceiveXmlData(string ROOT)
+        {
+            try
+            {
+
+                LogHelper.Info("涓荤墿鏂欎俊鎭幏鍙栨帴鍙ｅ湴鍧� + ConfigurationManager.AppSettings["URL"].ToString() + "MaterReceiveXmlData");
+            var ss = ConfigurationManager.AppSettings["URL"].ToString();
+            //鎺ユ敹xml鏁版嵁
+            XmlDocument xmlDoc = new XmlDocument();
+            xmlDoc.LoadXml(ROOT.ToString());
+
+            //灏�XmlDocument 杞崲涓�JSON 瀛楃涓�+            JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
+
+            // 澶勭悊鐗瑰畾瀛楁锛屽己鍒惰浆鎹负鏁扮粍
+            EnsureArrayFormat(jsonObject, "ITEM", "");
+            ///  鍙嶅簭鍒楀寲涓篟ootWithArray
+            var datas = JsonConvert.DeserializeObject<MaterDto.Root6>(jsonObject.ToString());
+            var sdada = JsonConvert.SerializeObject(datas);
+
+            var feedinfo = HttpHelper.WebPost(ConfigurationManager.AppSettings["URL"].ToString() + "MaterReceiveXmlData", JsonConvert.SerializeObject(datas), "application/json");
+            LogHelper.Info($"MaterReceiveXmlData mobox杩斿洖鍙傛暟{feedinfo}");
+
+            var jsonObj = JsonConvert.DeserializeObject<WLReturnRoot.Root>(feedinfo);
+          
+            var json = JsonConvert.SerializeObject(jsonObj);
+            string xml = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + JsonConvert.DeserializeXmlNode(json, "").OuterXml;
+
+            return xml;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Info($"MaterReceiveXmlData 鎶ラ敊{ex.Message}");
+                throw;
+            }
+
+
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="ROOT"></param>
+        /// <returns></returns>
+        [WebMethod]
+        [ValidateInput(false)] // 绂佺敤璇锋眰楠岃瘉
+        public string GYSReceiveXmlData(string ROOT)
+        {
+
+            LogHelper.Info("渚涘簲鍟嗕俊鎭幏鍙栨帴鍙ｅ湴鍧� + ConfigurationManager.AppSettings["URL"].ToString() + "GYSReceiveXmlData");
+            var ss = ConfigurationManager.AppSettings["URL"].ToString();
+            //鎺ユ敹xml鏁版嵁
+            XmlDocument xmlDoc = new XmlDocument();
+            xmlDoc.LoadXml(ROOT.ToString());
+
+            //灏�XmlDocument 杞崲涓�JSON 瀛楃涓�+            JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
+
+            // 澶勭悊鐗瑰畾瀛楁锛屽己鍒惰浆鎹负鏁扮粍
+            EnsureArrayFormat(jsonObject, "GYSXX", "", "GYSHB");
+            ///  鍙嶅簭鍒楀寲涓篟ootWithArray
+            var datas = JsonConvert.DeserializeObject<GYSDto.Root9>(jsonObject.ToString());
+            var sdada = JsonConvert.SerializeObject(datas);
+
+            var feedinfo = HttpHelper.WebPost(ConfigurationManager.AppSettings["URL"].ToString() + "GYSReceiveXmlData", JsonConvert.SerializeObject(datas), "application/json");
+            LogHelper.Info($"MaterReceiveXmlData mobox杩斿洖鍙傛暟{feedinfo}");
+
+            var jsonObj = JsonConvert.DeserializeObject<GYSReturnRoot.Root>(feedinfo);
+
+            var json = JsonConvert.SerializeObject(jsonObj);
+            string xml = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + JsonConvert.DeserializeXmlNode(json, "").OuterXml;
+
+            return xml;
+
+        }
+        ///// <summary>
+        /////涓荤墿鏂欎俊鎭幏鍙�+        ///// </summary>
+        ///// <param name="ROOT"></param>
+        ///// <returns></returns>
+        //[WebMethod]
+        //public ReturrnBack.Root MaterReceiveXmlData(MaterDto.ROOT5 ROOT)
+        //{
+        //    string result;
+
+        //    LogHelper.Info("涓荤墿鏂欎俊鎭幏鍙栨帴鍙ｅ湴鍧� + ConfigurationManager.AppSettings["URL"].ToString() + "MaterReceiveXmlData");
+        //    var feedinfo = HttpHelper.WebPost(ConfigurationManager.AppSettings["URL"].ToString() + "MaterReceiveXmlData", JsonConvert.SerializeObject(ROOT), "application/json");
+        //    LogHelper.Info($"MaterReceiveXmlData mobox杩斿洖鍙傛暟{feedinfo}");
+        //    var data = JsonConvert.DeserializeObject<ReturrnBack.ITEM>(feedinfo);
+
+        //    // 鍋囪data鏄竴涓凡缁忓垵濮嬪寲鐨処TEM瀵硅薄
+        //    ReturrnBack.ITEM data1 = new ReturrnBack.ITEM
+        //    {
+        //        WLPZBH = data?.WLPZBH,
+        //        MSGCODE = data?.MSGCODE,
+        //        MSGDESP = data?.WLPZBH
+        //    };
+        //    if (string.IsNullOrEmpty(feedinfo))
+        //    {
+        //        data1.WLPZBH = "";
+        //        data1.MSGCODE = "1";
+        //        data1.MSGDESP = "鏈皟閫�;
+        //    }
+        //    // 瀹炰緥鍖朢OOT瀵硅薄锛屽苟灏咺TEM瀵硅薄璧嬪�缁橰OOT鐨処tem灞炴�
+        //    ReturrnBack.ROOT root = new ReturrnBack.ROOT
+        //    {
+        //        ITEM = data
+        //    };
+        //    ReturrnBack.Root roots = new ReturrnBack.Root
+        //    {
+        //        ROOT = root
+        //    };
+        //    return roots;
+
+        //}
+    }
+}
diff --git a/models/CntrItemRel.cs b/models/CntrItemRel.cs
index 45f64ad..fb05ab9 100644
--- a/models/CntrItemRel.cs
+++ b/models/CntrItemRel.cs
@@ -37,6 +37,7 @@
         public float F_QTY { get; set; }
         public string S_UOM { get; set; } = "kg";
         public string S_CNTR_CODE { get; set; }
+        public string S_CNTR_TYPE { get; set; }
         //public int N_BS_ROW_NO { get; set; }
         public string S_BS_TYPE { get; set; } = "";
         /// <summary>
diff --git a/models/DAPING.cs b/models/DAPING.cs
new file mode 100644
index 0000000..3d90652
--- /dev/null
+++ b/models/DAPING.cs
@@ -0,0 +1,47 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HH.WCS.Mobox3.pinggao.models
+{
+    public class DAPING
+    {
+        public class BarChartResponse
+        {
+            public List<BarChartData> OutboundData { get; set; }  // 鍑哄簱鏁版嵁锛�-12鏈堬級
+            public List<BarChartData> InboundData { get; set; }    // 鍏ュ簱鏁版嵁锛�-12鏈堬級
+            public List<NB> CKNData { get; set; }    // 鍏ュ簱鏁版嵁锛�-12鏈堬級
+            public List<Tasks> ListTask { get; set; }    // 鍏ュ簱鏁版嵁锛�-12鏈堬級
+           /// <summary>
+           /// 鏈畬鎴愬崟鎹暟閲�+           /// </summary>
+            public int? Inttbounddjcount { get; set; }
+            /// <summary>
+            /// 鏈畬鎴愬嚭搴撳崟鎹暟閲�+            /// </summary>
+            public int? Outtbounddjcount { get; set; }
+            public int? IntodayCount { get; set; }
+            public int? OuttodayCount { get; set; }
+        }
+        public class Tasks {
+
+            public string S_CNTR_CODE { get; set; }   
+            public string S_START_AREA { get; set; }   
+            public string S_END_AREA { get; set; }   
+            public string S_B_STATE { get; set; }   
+        }
+        public class BarChartData
+        {
+            public int Month { get; set; }   // 鏈堜唤锛屽 "2023-01"
+            public float? Count { get; set; }   // 鏁伴噺锛堝彲绌猴級
+        }
+
+        public class NB
+        {
+            public string  Name{ get; set; }   // 鏈堜唤锛屽 "2023-01"
+            public float? Count { get; set; }   // 鏁伴噺锛堝彲绌猴級
+        }
+    }
+}
diff --git a/models/SapRoot.cs b/models/SapRoot.cs
index 81c3c00..bf590a3 100644
--- a/models/SapRoot.cs
+++ b/models/SapRoot.cs
@@ -174,7 +174,7 @@
                 /// 鐗╂枡鍑瘉鍙�                 /// </summary>
                 public string WLPZBH { get; set; }
-                public string WLPZND { get; set; }
+                public string ND { get; set; }
                 /// <summary>
                 /// 杩斿洖缁撴灉鏍囪瘑(0鎴愬姛鎴栬�1澶辫触)瀛楃闀�                 /// </summary>
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index 7a7e1ba..6307977 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -14,6 +14,7 @@
 using System.Threading.Tasks;
 using static HH.WCS.Mobox3.pinggao.models.SapRoot.WcReturnRoot;
 using static HH.WCS.Mobox3.pinggao.api.OtherModel;
+using NLog.Fluent;
 
 namespace HH.WCS.Mobox3.pinggao.process
 {
@@ -94,7 +95,10 @@
                 db.CommitTran();
                 if (!string.IsNullOrEmpty(TN_Task.S_STATE_PRE) && !string.IsNullOrEmpty(TN_Task.S_EQ_TASK_CODE))
                 {
-                    weight(TN_Task);
+                    if (TN_Task.S_START_LOC == TN_Task.S_END_LOC)
+                    {
+                        weight(TN_Task);
+                    }
                 }
 
 
@@ -108,12 +112,15 @@
                 db.CommitTran();
                 if (!string.IsNullOrEmpty(TN_Task.S_STATE_PRE) && !string.IsNullOrEmpty(TN_Task.S_EQ_TASK_CODE))
                 {
-                    weight(TN_Task);
+                    if (TN_Task.S_START_LOC == TN_Task.S_END_LOC)
+                    {
+                        weight(TN_Task);
+                    }
                 }
 
             }
-            
-                if (state == 1103)
+
+            if (state == 1103)
             {
                 //澶ч搧妗嗗弶璧颁互鍚庨�鐭ワ紝鎴戜滑瑕侀�鐭ヨ緭閫佺嚎
             }
@@ -123,198 +130,211 @@
 
         internal static void weight(WCSTask TN_Task)
         {
-           
-       
-                if (!string.IsNullOrEmpty(TN_Task.S_STATE_PRE) && !string.IsNullOrEmpty(TN_Task.S_EQ_TASK_CODE))
-                {
+
+
+            if (!string.IsNullOrEmpty(TN_Task.S_STATE_PRE) && !string.IsNullOrEmpty(TN_Task.S_EQ_TASK_CODE))
+            {
                 string extData = TN_Task.S_STATE_PRE;
                 string Ext1 = TN_Task.S_EQ_TASK_CODE;
-                    LogHelper.Info($"绉伴噸鍒嗛厤鍏ュ簱缁堢偣璐т綅楂樺害閲嶉噺{extData}锛岄珮搴Ext1},瀹瑰櫒{TN_Task.S_CNTR_CODE}");
-                    var db = new SqlHelper<object>().GetInstance();
-                    var WMStask = db.Queryable<WMSTask>().Where(s => s.S_CODE == TN_Task.S_OP_CODE).First();
-                    if (WMStask == null)
+                LogHelper.Info($"绉伴噸鍒嗛厤鍏ュ簱缁堢偣璐т綅楂樺害閲嶉噺{extData}锛岄珮搴Ext1},瀹瑰櫒{TN_Task.S_CNTR_CODE}");
+                var db = new SqlHelper<object>().GetInstance();
+                var WMStask = db.Queryable<WMSTask>().Where(s => s.S_CODE == TN_Task.S_OP_CODE).First();
+                if (WMStask == null)
+                {
+                    LogHelper.Info($"鏈壘鍒版浠诲姟瀵瑰簲鐨勪綔涓�);
+                }
+                try
+                {
+                    Location result = null;
+                    //var TN_Task = WCSHelper.GetTask(no);
+                    //鍒ゆ柇褰撳墠瀹瑰櫒涓烘墭鐩樿繕鏄枡妗�+                    //鎵樼洏鍙兘鏀惧湪1-2灞�鏂欑3-9灞�+
+                    //鑾峰彇闆嗗悎
+                    var locklist = db.Queryable<Location>();
+
+
+                    if (TN_Task.S_CNTR_CODE.Substring(0, 2) == "TP")//鎵樼洏
                     {
-                        LogHelper.Info($"鏈壘鍒版浠诲姟瀵瑰簲鐨勪綔涓�);
-                    }
-                    try
-                    {
-                        Location result = null;
-                        //var TN_Task = WCSHelper.GetTask(no);
-                        //鍒ゆ柇褰撳墠瀹瑰櫒涓烘墭鐩樿繕鏄枡妗�-                        //鎵樼洏鍙兘鏀惧湪1-2灞�鏂欑3-9灞�-
-                        //鑾峰彇闆嗗悎
-                        var locklist = db.Queryable<Location>();
-
-
-                        if (TN_Task.S_CNTR_CODE.Substring(0, 2) == "TP")//鎵樼洏
+                        var endlist = locklist
+                                   .Where(it => it.N_CURRENT_NUM < it.N_CAPACITY && it.N_LAYER < 3 && it.N_LOCK_STATE == 0 && it.S_AREA_CODE == "HJQ")
+                                   .OrderBy(it => it.N_COL)
+                                   .PartitionBy(it => it.N_ROW)
+                                   .PartitionBy(it => it.N_LAYER)
+                                   .Take(1)
+                                   .ToList();
+                        if (TN_Task.N_ERR == 2)//鍓嶇Щ杞�                         {
-                            var endlist = locklist
-                                       .Where(it => it.N_CURRENT_NUM < it.N_CAPACITY && it.N_LAYER < 3 && it.N_LOCK_STATE ==0 && it.S_AREA_CODE == "HJQ")
-                                       .OrderBy(it => it.N_COL)
-                                       .PartitionBy(it => it.N_ROW)
-                                       .PartitionBy(it => it.N_LAYER)
-                                       .Take(1)
-                                       .ToList();
-                            foreach (var item in endlist)
+                       
+                            endlist = endlist.Where(s => s.N_LAYER < 7).ToList();
+                        }
+                        foreach (var item in endlist)
+                        {
+                            LogHelper.Info($"閲嶉噺{decimal.Parse(extData)}");
+                            //澶т簬800kg
+                            if (decimal.Parse(extData) > 1)
                             {
-                                LogHelper.Info($"閲嶉噺{decimal.Parse(extData)}");
-                                //澶т簬800kg
-                                if (decimal.Parse(extData) > 1)
+                                LogHelper.Info($"楂樺害{Ext1}");
+                                //楂樺害澶т簬1050mm 鍙斁鍦ㄧ涓�眰
+                                if (decimal.Parse(Ext1) <= 3)
                                 {
-                                    LogHelper.Info($"楂樺害{Ext1}");
-                                    //楂樺害澶т簬1050mm 鍙斁鍦ㄧ涓�眰
-                                    if (decimal.Parse(Ext1) <=3)
+                                    var lockinfo = locklist.Where(it => it.N_LOCK_STATE != 0 && it.N_LOCK_STATE != 0 && it.N_ROW == item.N_ROW
+                                                    && it.N_LAYER == 1).First();
+                                    if (lockinfo == null)
                                     {
-                                        var lockinfo = locklist.Where(it => it.N_LOCK_STATE != 0 && it.N_LOCK_STATE != 0 && it.N_ROW == item.N_ROW
-                                                        && it.N_LAYER == 1).First();
-                                        if (lockinfo == null)
-                                        {
-                                            result = item;
-                                            break;
-                                        }
-                                        else
-                                        {
-                                            LogHelper.Info($"璐т綅{lockinfo.S_CODE} 鏈夐攣 褰撴帓灞備笉鍙娇鐢�);
-                                            //throw new Exception($"璐т綅{lockinfo.S_CODE} 鏈夐攣 褰撴帓灞備笉鍙娇鐢�);
-                                        }
+                                        result = item;
+                                        break;
                                     }
                                     else
                                     {
-                                        LogHelper.Info($"楂樺害{decimal.Parse(Ext1)}杩囬珮 鑱旂郴浜哄伐澶勭悊");
-                                        throw new Exception($"楂樺害{decimal.Parse(Ext1)}杩囬珮 鑱旂郴浜哄伐澶勭悊");
-
+                                        LogHelper.Info($"璐т綅{lockinfo.S_CODE} 鏈夐攣 褰撴帓灞備笉鍙娇鐢�);
+                                        //throw new Exception($"璐т綅{lockinfo.S_CODE} 鏈夐攣 褰撴帓灞備笉鍙娇鐢�);
                                     }
+                                }
+                                else
+                                {
+                                    LogHelper.Info($"楂樺害{decimal.Parse(Ext1)}杩囬珮 鑱旂郴浜哄伐澶勭悊");
+                                    throw new Exception($"楂樺害{decimal.Parse(Ext1)}杩囬珮 鑱旂郴浜哄伐澶勭悊");
 
                                 }
-                                else//涓嶈秴閲�鍗�涓嶈秴杩�00kg
-                                {
-                                    //楂樺害<450mm 2-9灞�-                                    if (decimal.Parse(Ext1) < 2)
+
+                            }
+                            else//涓嶈秴閲�鍗�涓嶈秴杩�00kg
+                            {
+                                //楂樺害<450mm 2-9灞�+                                if (decimal.Parse(Ext1) < 2)
                                 {
                                     LogHelper.Info($"楂樺害<450mm 2-9灞�);
                                     var lockinfo = locklist.Where(it => it.N_LOCK_STATE != 0 && it.N_ROW == item.N_ROW
                                                         && it.N_LAYER == 2).First();
-                                        if (lockinfo == null)
-                                        {
-                                            result = item;
-
-                                            break;
-                                        }
-                                        else
-                                        {
-                                            LogHelper.Info($"璐т綅{lockinfo.S_CODE} 鏈夐攣 褰撴帓灞備笉鍙娇鐢�);
-                                            //throw new Exception($"璐т綅{lockinfo.S_CODE} 鏈夐攣 褰撴帓灞備笉鍙娇鐢�);
-                                        }
-                                    }
-                                    else if (decimal.Parse(Ext1) >= 2 && decimal.Parse(Ext1) < 4)
+                                    if (lockinfo == null)
                                     {
-                                        var lockinfo = locklist.Where(it => it.N_LOCK_STATE != 0 && it.N_ROW == item.N_ROW
-                                                       && it.N_LAYER >= 1 && it.N_LAYER <= 2).First();
-                                        if (lockinfo == null)
-                                        {
-                                            result = item;
+                                        result = item;
 
-
-                                            db.Updateable<WMSTask>(TN_Task).UpdateColumns(a => new { a.S_END_LOC, a.S_END_AREA, a.S_END_WH }).ExecuteCommand();
-
-                                            break;
-                                        }
-                                        else
-                                        {
-                                            LogHelper.Info($"璐т綅{lockinfo.S_CODE} 鏈夐攣 褰撴帓灞備笉鍙娇鐢�);
-                                            //throw new Exception($"璐т綅{lockinfo.S_CODE} 鏈夐攣 褰撴帓灞備笉鍙娇鐢�);
-                                        }
+                                        break;
                                     }
                                     else
                                     {
-                                        LogHelper.Info($"鎵樼洏楂樺害{decimal.Parse(Ext1)}杩囬珮 鑱旂郴浜哄伐澶勭悊");
-                                        throw new Exception($"鎵樼洏楂樺害{decimal.Parse(Ext1)}杩囬珮 鑱旂郴浜哄伐澶勭悊");
-
+                                        LogHelper.Info($"璐т綅{lockinfo.S_CODE} 鏈夐攣 褰撴帓灞備笉鍙娇鐢�);
+                                        //throw new Exception($"璐т綅{lockinfo.S_CODE} 鏈夐攣 褰撴帓灞備笉鍙娇鐢�);
                                     }
                                 }
-                            }
-                        }
-                        else
-                        { //瀹瑰櫒涓烘枡绠�鍒欐斁鍒�-9灞�-
-                            var endlist = locklist
-                                       .Where(it => it.N_CURRENT_NUM < it.N_CAPACITY && it.N_LAYER >= 3 && it.N_LOCK_STATE == 0 && it.S_AREA_CODE == "HJQ")
-                                       .OrderBy(it => it.N_COL)
-                                       .PartitionBy(it => it.N_ROW)
-                                       .PartitionBy(it => it.N_LAYER)
-                                       .Take(1)
-                                       .ToList();
-                            foreach (var item in endlist)
-                            {
-                                LogHelper.Info($"閲嶉噺{decimal.Parse(extData)}");
-                                //澶т簬800kg
-                                if (decimal.Parse(extData) > 1)
+                                else if (decimal.Parse(Ext1) >= 2 && decimal.Parse(Ext1) < 4)
                                 {
-                                    LogHelper.Info($"鏂欑閲嶉噺瓒呰繃800kg");
-                                    throw new Exception($"鏂欑閲嶉噺瓒呰繃800kg");
+                                    var lockinfo = locklist.Where(it => it.N_LOCK_STATE != 0 && it.N_ROW == item.N_ROW
+                                                   && it.N_LAYER >= 1 && it.N_LAYER <= 2).First();
+                                    if (lockinfo == null)
+                                    {
+                                        result = item;
+
+
+                                        db.Updateable<WMSTask>(TN_Task).UpdateColumns(a => new { a.S_END_LOC, a.S_END_AREA, a.S_END_WH }).ExecuteCommand();
+
+                                        break;
+                                    }
+                                    else
+                                    {
+                                        LogHelper.Info($"璐т綅{lockinfo.S_CODE} 鏈夐攣 褰撴帓灞備笉鍙娇鐢�);
+                                        //throw new Exception($"璐т綅{lockinfo.S_CODE} 鏈夐攣 褰撴帓灞備笉鍙娇鐢�);
+                                    }
                                 }
                                 else
                                 {
-                                    if (decimal.Parse(Ext1) < 4)
-                                    {
-                                        var lockinfo = locklist.Where(it => it.N_LOCK_STATE != 0 && it.N_LOCK_STATE != 0 && it.S_AREA_CODE == item.S_AREA_CODE && it.N_ROW == item.N_ROW
-                                                       && it.N_LAYER >= 3 && it.N_LAYER <= 9).First();
-                                        if (lockinfo == null)
-                                        {
-                                            result = item;
-                                            TN_Task.S_END_LOC = item.S_CODE;
-                                            db.Updateable<WMSTask>(TN_Task).UpdateColumns(a => new { a.S_END_LOC }).ExecuteCommand();
+                                    LogHelper.Info($"鎵樼洏楂樺害{decimal.Parse(Ext1)}杩囬珮 鑱旂郴浜哄伐澶勭悊");
+                                    throw new Exception($"鎵樼洏楂樺害{decimal.Parse(Ext1)}杩囬珮 鑱旂郴浜哄伐澶勭悊");
 
-                                            break;
-                                        }
-                                        else
-                                        {
-                                            LogHelper.Info($"璐т綅{lockinfo.S_CODE} 鏈夐攣 褰撴帓灞備笉鍙娇鐢�);
-                                            throw new Exception($"璐т綅{lockinfo.S_CODE} 鏈夐攣 褰撴帓灞備笉鍙娇鐢�);
-                                        }
-                                    }
-                                    else
-                                    {
-                                        LogHelper.Info($"鏂欑楂樺害 {decimal.Parse(Ext1)} 杩囬珮 鑱旂郴浜哄伐澶勭悊");
-                                        throw new Exception($"鏂欑楂樺害 {decimal.Parse(Ext1)} 杩囬珮 鑱旂郴浜哄伐澶勭悊");
-                                    }
                                 }
                             }
                         }
+                    }
+                    else
+                    { //瀹瑰櫒涓烘枡绠�鍒欐斁鍒�-9灞� 
-
-                        if (result == null)
+                        var endlist = locklist
+                                   .Where(it => it.N_CURRENT_NUM < it.N_CAPACITY && it.N_LAYER >= 3 && it.N_LOCK_STATE == 0 && it.S_AREA_CODE == "HJQ")
+                                   .OrderBy(it => it.N_COL)
+                                   .PartitionBy(it => it.N_ROW)
+                                   .PartitionBy(it => it.N_LAYER)
+                                   .Take(1)
+                                   .ToList();
+                        if (TN_Task.N_ERR == 2)//鍓嶇Щ杞�                         {
-                            LogHelper.Info($"灏忚溅鍥炶皟鏈壘鍒板彲鐢ㄥ簱浣�);
-                            throw new Exception($"灏忚溅鍥炶皟鏈壘鍒板彲鐢ㄥ簱浣�);
+                            endlist = endlist.Where(s => s.N_LAYER < 7).ToList();
                         }
-                        TN_Task.S_END_LOC = result.S_CODE;
-                        TN_Task.S_END_AREA = result.S_AREA_CODE;
-                        TN_Task.S_END_WH = result.S_WH_CODE;
+                        foreach (var item in endlist)
+                        {
+                            LogHelper.Info($"閲嶉噺{decimal.Parse(extData)}");
+                            //澶т簬800kg
+                            if (decimal.Parse(extData) > 1)
+                            {
+                                LogHelper.Info($"鏂欑閲嶉噺瓒呰繃800kg");
+                                throw new Exception($"鏂欑閲嶉噺瓒呰繃800kg");
+                            }
+                            else
+                            {
+                                if (decimal.Parse(Ext1) < 4)
+                                {
+                                    var lockinfo = locklist.Where(it => it.N_LOCK_STATE != 0 && it.N_LOCK_STATE != 0 && it.S_AREA_CODE == item.S_AREA_CODE && it.N_ROW == item.N_ROW
+                                                   && it.N_LAYER >= 3 && it.N_LAYER <= 9).First();
+                                    if (lockinfo == null)
+                                    {
+                                        result = item;
+                                        TN_Task.S_END_LOC = item.S_CODE;
+                                        db.Updateable<WMSTask>(TN_Task).UpdateColumns(a => new { a.S_END_LOC }).ExecuteCommand();
 
-                        db.Updateable<WCSTask>(TN_Task).UpdateColumns(a => new { a.S_END_LOC, a.S_END_AREA, a.S_END_WH }).ExecuteCommand();
-                        WMStask.S_END_LOC = result.S_CODE;
-                        WMStask.S_END_AREA = result.S_AREA_CODE;
-                        WMStask.S_END_WH = result.S_WH_CODE;
+                                        break;
+                                    }
+                                    else
+                                    {
+                                        LogHelper.Info($"璐т綅{lockinfo.S_CODE} 鏈夐攣 褰撴帓灞備笉鍙娇鐢�);
+                                        throw new Exception($"璐т綅{lockinfo.S_CODE} 鏈夐攣 褰撴帓灞備笉鍙娇鐢�);
+                                    }
+                                }
+                                else
+                                {
+                                    LogHelper.Info($"鏂欑楂樺害 {decimal.Parse(Ext1)} 杩囬珮 鑱旂郴浜哄伐澶勭悊");
+                                    throw new Exception($"鏂欑楂樺害 {decimal.Parse(Ext1)} 杩囬珮 鑱旂郴浜哄伐澶勭悊");
+                                }
+                            }
+                        }
+                    }
 
-                        db.Updateable<WMSTask>(WMStask).UpdateColumns(a => new { a.S_END_LOC, a.S_END_AREA, a.S_END_WH }).ExecuteCommand();
+
+                    if (result == null)
+                    {
+                        LogHelper.Info($"灏忚溅鍥炶皟鏈壘鍒板彲鐢ㄥ簱浣�);
+                        throw new Exception($"灏忚溅鍥炶皟鏈壘鍒板彲鐢ㄥ簱浣�);
+                    }
+
+                    //var lcrList = db.Queryable<LocCntrRel>().Includes(a => a.Container).Where(a => a.S_LOC_CODE == TN_Task.S_CNTR_CODE).ToList();
+                    //if (lcrList.Count == 0) {
+                    TN_Task.S_END_LOC = result.S_CODE;
+                    TN_Task.S_END_AREA = result.S_AREA_CODE;
+                    TN_Task.S_END_WH = result.S_WH_CODE;
+                    db.Updateable<WCSTask>(TN_Task).UpdateColumns(a => new { a.S_END_LOC, a.S_END_AREA, a.S_END_WH }).ExecuteCommand();
+                    WMStask.S_END_LOC = result.S_CODE;
+                    WMStask.S_END_AREA = result.S_AREA_CODE;
+                    WMStask.S_END_WH = result.S_WH_CODE;
+
+                    db.Updateable<WMSTask>(WMStask).UpdateColumns(a => new { a.S_END_LOC, a.S_END_AREA, a.S_END_WH }).ExecuteCommand();
+                    //}
+
                     var S_AGV_SITE = "";
-                    if (TN_Task.N_ERR==1)//鍓嶇Щ杞�+                    if (TN_Task.N_ERR == 1)//鍓嶇Щ杞�                     {
                         //鍓嶇Щ杞�-                         S_AGV_SITE = LocationHelper.GetAgvSite(TN_Task.S_END_LOC);
+                        S_AGV_SITE = LocationHelper.GetAgvSite(TN_Task.S_END_LOC);
                     }
                     else //鍫嗗灈杞�                     {
 
                         //鍫嗗灈杞�-                         S_AGV_SITE = db.Queryable<TN_Location_Ext>().Where(a => a.S_LOC_CODE == TN_Task.S_END_LOC).First()?.S_AGV_SITE;
+                        S_AGV_SITE = db.Queryable<TN_Location_Ext>().Where(a => a.S_LOC_CODE == TN_Task.S_END_LOC).First()?.S_AGV_SITE;
                     }
-                        var dic = new Dictionary<string, string>();
-                        dic.Add("No", TN_Task.S_CODE);
-                        dic.Add("ParamNo", "3");
-                        dic.Add("Param1", S_AGV_SITE);
+                    var dic = new Dictionary<string, string>();
+                    dic.Add("No", TN_Task.S_CODE);
+                    dic.Add("ParamNo", "2");
+                    dic.Add("Param1", S_AGV_SITE);
                     //dic.Add("Pri", TN_Task.N_PRIORITY.ToString());
                     //dic.Add("No", TN_Task.S_CODE.Trim());
                     //dic.Add("From", TN_Task.S_START_LOC);
@@ -324,26 +344,32 @@
                     //dic.Add("FRow", "0");
 
                     var res = NDC.ChangeOrder(dic);
-                        LogHelper.Info($"淇敼缁堢偣璐т綅" + JsonConvert.SerializeObject(res));
-                        if (res.Res.ErrCode != -1)
-                        {
-                            var dics = new Dictionary<string, string>();
-                            dics.Add("No", TN_Task.S_CODE);
-                            dics.Add("ParamNo", "6");
-                            dics.Add("Param1", "2");
-                            var ss = NDC.ChangeOrder(dics);
-                            LogHelper.Info($"灏忚溅鍓嶅線鏂板簱浣� + JsonConvert.SerializeObject(ss));
-                            LocationHelper.BindingLoc(TN_Task.S_END_LOC, TN_Task.S_CNTR_CODE.Split(',').ToList());
-                            LocationHelper.LockLoc(TN_Task.S_END_LOC,1);
-                        }
-                        db.CommitTran();
-                    }
-                    catch (Exception)
+                    LogHelper.Info($"淇敼缁堢偣璐т綅" + JsonConvert.SerializeObject(res));
+                    if (res.Res.ErrCode != -1)
                     {
-                        db.RollbackTran();
-                        throw;
+                        var dics = new Dictionary<string, string>();
+                        dics.Add("No", TN_Task.S_CODE);
+                        dics.Add("ParamNo", "6");
+                        dics.Add("Param1", "2");
+                        var ss = NDC.ChangeOrder(dics);
+                        LogHelper.Info($"灏忚溅鍓嶅線鏂板簱浣� + JsonConvert.SerializeObject(ss));
+
+
+                        //if (lcrList.Count()==0)
+                        //{
+                        LocationHelper.BindingLoc(TN_Task.S_END_LOC, TN_Task.S_CNTR_CODE.Split(',').ToList());
+                        LocationHelper.LockLoc(TN_Task.S_END_LOC, 1);
+                        //}
                     }
+
+                    db.CommitTran();
                 }
+                catch (Exception)
+                {
+                    db.RollbackTran();
+                    throw;
+                }
+            }
 
         }
 
@@ -552,7 +578,7 @@
             var taskType = mst.S_TYPE.Trim();
             try
             {
-                LogHelper.Info($"鎺ㄩ�浠诲姟{ mst.S_CODE}");
+                LogHelper.Info($"鎺ㄩ�浠诲姟{mst.S_CODE}");
                 Console.WriteLine("鎺ㄩ�浠诲姟", mst.S_CODE);
                 //鍓嶇Щ杞�                 var startlocs = LocationHelper.GetAgvSite(mst.S_START_LOC);
@@ -561,18 +587,18 @@
                 var db = new SqlHelper<object>().GetInstance();
                 var dstart = db.Queryable<TN_Location_Ext>().Where(a => a.S_LOC_CODE == mst.S_START_LOC).First()?.S_AGV_SITE;
                 var dend = db.Queryable<TN_Location_Ext>().Where(a => a.S_LOC_CODE == mst.S_END_LOC).First()?.S_AGV_SITE;
-                LogHelper.Info($"鑾峰彇搴撲綅{mst.S_START_LOC}{ mst.S_END_LOC}||{mst.N_B_STATE}");
+                LogHelper.Info($"鑾峰彇搴撲綅{mst.S_START_LOC}{mst.S_END_LOC}||{mst.N_B_STATE}");
                 LogHelper.Info($"绔欑偣鏁版嵁淇℃伅{dstart}/{dend}||{startlocs}/{endlocs}");
                 if (mst.N_B_STATE == 0)
                 {
                     //鍫嗗灈杞﹀幓绔欑偣琛ㄦ壘
                     if (mst.S_SCHEDULE_TYPE == "NDC")
                     {
-                     
+
                         var startloc = LocationHelper.GetLoc(mst.S_START_LOC);
                         var endloc = LocationHelper.GetLoc(mst.S_END_LOC);
                         LogHelper.Info($"鑾峰彇绔欑偣{startloc.N_LAYER}");
-                        if (startloc.N_LAYER > 7 || endloc.N_LAYER > 7)//澶т簬涓冨眰 鎵炬湁鏃�鍓嶇Щ杞︾殑浠诲姟 鏈�涓嶆帹 鏃犳帹閫�+                        if (mst.S_TYPE.Contains("鍏ュ簱"))
                         {
                             var task = WCSHelper.GetWaitingTaskGoList();//鏌ヨ鏄惁鏈夊墠绉昏溅姝ｅ湪鎵ц鐨勪换鍔�                             if (task.Count() == 0)
@@ -581,29 +607,66 @@
                                 start = startlocs;
                                 end = endlocs;
                             }
-                        }
-                        else //灏忎簬
-                        {
-                            LogHelper.Info($"灏忎簬7");
-                            var task = WCSHelper.GetWaitingTaskGoBackList();//鏌ヨ鏄惁鏈夊爢鍨涜溅姝ｅ湪鎵ц鐨勪换鍔°�
-                            LogHelper.Info($"count{task.Count()}");
-                            if (task.Count() == 0)
-                            {      //鍫嗗灈杞�鍘�绔欑偣琛ㄥ幓鏌�-                                mst.N_ERR = 2;
-                                start = dstart;
-                                end = dend;
-                            }
                             else
                             {
-                                var task1 = WCSHelper.GetWaitingTaskGoList();///鏌ヨ鏄惁鏈夊墠绉昏溅姝ｅ湪鎵ц鐨勪换鍔�-                                LogHelper.Info($"鏌ヨ鏄惁鏈夊墠绉昏溅姝ｅ湪鎵ц鐨勪换鍔ount{task1.Count()}");
-                                if (task1.Count() == 0)
+                                var task12 = WCSHelper.GetWaitingTaskGoBackList();//鏌ヨ鏄惁鏈夊爢鍨涜溅姝ｅ湪鎵ц鐨勪换鍔°�
+                                LogHelper.Info($"count{task12.Count()}");
+                                if (task12.Count() == 0)
+                                {      //鍫嗗灈杞�鍘�绔欑偣琛ㄥ幓鏌�+                                    mst.N_ERR = 2;
+                                    start = dstart;
+                                    end = dend;
+                                }
+                                else
+                                {
+                                    var task1 = WCSHelper.GetWaitingTaskGoList();///鏌ヨ鏄惁鏈夊墠绉昏溅姝ｅ湪鎵ц鐨勪换鍔�+                                    LogHelper.Info($"鏌ヨ鏄惁鏈夊墠绉昏溅姝ｅ湪鎵ц鐨勪换鍔ount{task1.Count()}");
+                                    if (task1.Count() == 0)
+                                    {
+                                        mst.N_ERR = 1;
+                                        start = startlocs;
+                                        end = endlocs;
+                                    }
+                                }
+                            }
+
+                        }
+                        else
+                        {
+                            if (startloc.N_LAYER > 7 || endloc.N_LAYER > 7)//澶т簬涓冨眰 鎵炬湁鏃�鍓嶇Щ杞︾殑浠诲姟 鏈�涓嶆帹 鏃犳帹閫�+                            {
+                                var task = WCSHelper.GetWaitingTaskGoList();//鏌ヨ鏄惁鏈夊墠绉昏溅姝ｅ湪鎵ц鐨勪换鍔�+                                if (task.Count() == 0)
                                 {
                                     mst.N_ERR = 1;
                                     start = startlocs;
                                     end = endlocs;
                                 }
                             }
+                            else //灏忎簬
+                            {
+                                LogHelper.Info($"灏忎簬7");
+                                var task = WCSHelper.GetWaitingTaskGoBackList();//鏌ヨ鏄惁鏈夊爢鍨涜溅姝ｅ湪鎵ц鐨勪换鍔°�
+                                LogHelper.Info($"count{task.Count()}");
+                                if (task.Count() == 0)
+                                {      //鍫嗗灈杞�鍘�绔欑偣琛ㄥ幓鏌�+                                    mst.N_ERR = 2;
+                                    start = dstart;
+                                    end = dend;
+                                }
+                                else
+                                {
+                                    var task1 = WCSHelper.GetWaitingTaskGoList();///鏌ヨ鏄惁鏈夊墠绉昏溅姝ｅ湪鎵ц鐨勪换鍔�+                                    LogHelper.Info($"鏌ヨ鏄惁鏈夊墠绉昏溅姝ｅ湪鎵ц鐨勪换鍔ount{task1.Count()}");
+                                    if (task1.Count() == 0)
+                                    {
+                                        mst.N_ERR = 1;
+                                        start = startlocs;
+                                        end = endlocs;
+                                    }
+                                }
+                            }
+
                         }
                         LogHelper.Info($"绔欑偣{start}/{end}");
                         if (!string.IsNullOrEmpty(start) && !string.IsNullOrEmpty(end))

--
Gitblit v1.9.1