From cda66b452fda201ab0ecc7fb5c94bbc2288b8877 Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期三, 14 五月 2025 16:08:47 +0800
Subject: [PATCH] 1.主物料信息获取 2.物料凭证表数据逻辑修改 3.物料凭证表添加新字段 4.冲销回调实现(为完全实现)

---
 api/ZSCM2_CXPZ.cs              |  158 +++++++++++++++++
 models/TN_Distribution_CNTR.cs |    1 
 api/WmsSpaHelper.cs            |  259 +++++++++++++++++++---------
 models/MaterialVoucher.cs      |    6 
 models/SapRoot.cs              |   46 +++++
 models/TN_Outbound_Order.cs    |    2 
 api/WmsSapController.cs        |    6 
 api/ApibackModel.cs            |   52 +++++
 HH.WCS.Mobox3.pinggao.csproj   |    1 
 9 files changed, 444 insertions(+), 87 deletions(-)

diff --git a/HH.WCS.Mobox3.pinggao.csproj b/HH.WCS.Mobox3.pinggao.csproj
index 99d4c4f..a8228bc 100644
--- a/HH.WCS.Mobox3.pinggao.csproj
+++ b/HH.WCS.Mobox3.pinggao.csproj
@@ -172,6 +172,7 @@
     <Compile Include="api\WmsSpaHelper.cs" />
     <Compile Include="api\ZCCM_NC.cs" />
     <Compile Include="api\ZSCM2_CBZX.cs" />
+    <Compile Include="api\ZSCM2_CXPZ.cs" />
     <Compile Include="api\ZSCM2_SCFLJHW.cs" />
     <Compile Include="App_Start\SwaggerControllerDescProvider.cs" />
     <Compile Include="core\WMSCore.cs" />
diff --git a/api/ApibackModel.cs b/api/ApibackModel.cs
index adb149a..f40b5b6 100644
--- a/api/ApibackModel.cs
+++ b/api/ApibackModel.cs
@@ -177,6 +177,56 @@
         }
         #endregion
 
+        #region 閫氱敤鍐查攢鍥炶皟鍏ュ弬
+        public class ReturnTYBcak
+        {
+            public class ITEM
+            {
+                /// <summary>
+                /// 鍞竴鏍囪瘑
+                /// </summary>
+                public string YWLPZBH { get; set; }
+                /// <summary>
+                /// 鐗╂枡鍑瘉鍙�+                /// </summary>
+                public string YWLPZND { get; set; }
+                /// <summary>
+                /// 鐗╂枡鍑勾搴�+                /// </summary>
+                public string YWLPZHXM { get; set; }
+                public string WLPZBH { get; set; }
+                public string WLPZND { get; set; }
+                /// <summary>
+                /// 杩斿洖缁撴灉鏍囪瘑(0鎴愬姛鎴栬�1澶辫触)瀛楃闀垮害1
+                /// </summary>
+                public string WLPZHXM { get; set; }
+                public int MSGCODE { get; set; }
+                /// <summary>
+                /// 澶辫触鍘熷洜鎴栬�鎴愬姛淇℃伅瀛楃闀垮害255
+                /// </summary>
+                public string MSGDESP { get; set; }
+            }
+
+            public class ROOT
+            {
+                /// <summary>
+                /// 
+                /// </summary>
+                public List<ITEM> ITEM { get; set; }
+            }
+
+            public class Root
+            {
+                /// <summary>
+                /// 
+                /// </summary>
+                public ROOT ROOT { get; set; }
+            }
+
+        }
+        #endregion
+
+
         #region 鍐呴噰鍏ュ簱瀹℃牳瀹屾垚鍥炶皟鍏ュ弬
         public class NcRkDto {
             public class HEAD
@@ -423,7 +473,7 @@
                 /// <summary>
                 /// 
                 /// </summary>
-                public HEAD HEAD { get; set; }
+                public List<HEAD> HEAD { get; set; }
             }
 
             public class Root
diff --git a/api/WmsSapController.cs b/api/WmsSapController.cs
index d520c95..5060af9 100644
--- a/api/WmsSapController.cs
+++ b/api/WmsSapController.cs
@@ -115,7 +115,7 @@
         /// <returns></returns>
 
         [HttpPost]
-        public SimpleResult MaterReceiveXmlData([FromBody] MaterDto.Root xmlData)
+        public WLReturnRoot.Root MaterReceiveXmlData([FromBody] MaterDto.Root xmlData)
         {
             #region xml鏁版嵁鎺ユ敹杞暟缁� 
@@ -135,7 +135,7 @@
             #endregion
 
             #region 澶栭噰鍏ュ簱涓氬姟娴佺▼
-            SimpleResult simpleResult = WmsSpaHelper.Mater_In(xmlData);
+            WLReturnRoot.Root simpleResult = WmsSpaHelper.Mater_In(xmlData);
             //鎺ユ敹杩斿洖鍙傛暟 鐢熸垚sap瀵规帴鏂囨。杩斿洖鏍煎紡
             //var json = WmsSpaHelper.GetJsonResult(simpleResult.WLPZBH, simpleResult.resultCode.ToString(), simpleResult.resultMsg);
 
@@ -148,6 +148,8 @@
             //    Content = new StringContent(xml, Encoding.UTF8, "application/xml")
             //};
             //return response;
+
+            var json = JsonConvert.SerializeObject(simpleResult);
             return simpleResult;
             #endregion
         }
diff --git a/api/WmsSpaHelper.cs b/api/WmsSpaHelper.cs
index 6a2b796..a43f215 100644
--- a/api/WmsSpaHelper.cs
+++ b/api/WmsSpaHelper.cs
@@ -821,17 +821,28 @@
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-        internal static SimpleResult Mater_In(MaterDto.Root model)
+        internal static WLReturnRoot.Root Mater_In(MaterDto.Root model)
         {
             var db = new SqlHelper<object>().GetInstance();
-            var result = new SimpleResult();
-            result.resultMsg = "鎴愬姛";
-            try
+            var response = new WLReturnRoot.Root
             {
-                db.BeginTran();
-                List<TN_Material> list = new List<TN_Material>();
-                foreach (var item in model.ROOT.ITEM)
+                ROOT = new WLReturnRoot.ROOT
                 {
+                    ITEM = new List<WLReturnRoot.ITEM>
+                    {
+                        
+                    }
+                }
+            };
+            db.BeginTran();
+            List<WLReturnRoot.ITEM> list = new List<WLReturnRoot.ITEM>();
+            foreach (var item in model.ROOT.ITEM)
+            {
+                try
+                {
+
+                    var result = new WLReturnRoot.ITEM();
+
                     var materlist = db.Queryable<TN_Material>().Where(it => it.S_ITEM_CODE == item.WLBM).First();
                     if (materlist == null)
                     {
@@ -849,20 +860,54 @@
                         tN_Material.S_CPZ = item.CPZ;
                         tN_Material.S_CPZMS = item.CPZMS;
                         tN_Material.S_ITEM_NAME = item.VTEXT;
-                        list.Add(tN_Material);
+                        db.Insertable<TN_Material>(tN_Material).ExecuteCommand();
+                        result.MSGDESP = "鎴愬姛";
+                        result.MSGCODE = 0;
+                        result.GCBM = item.GCBM;
+                        result.WLBM = item.WLBM;
+                        list.Add(result);
                     }
-
+                    else
+                    {
+                        materlist.S_ITEM_CODE = item.WLBM;
+                        materlist.S_GCBM = item.GCBM;
+                        materlist.S_WLZBM = item.WLZBM;
+                        materlist.S_WLZMS = item.WLZMS;
+                        materlist.S_WLLX = item.WLLX;
+                        materlist.S_WLMS = item.WLMS;
+                        materlist.S_WLCMS = item.WLCMS;
+                        materlist.S_DWBM = item.DWBM;
+                        materlist.S_DWMS = item.DWMS;
+                        materlist.S_JBM = item.JBM;
+                        materlist.S_CPZ = item.CPZ;
+                        materlist.S_CPZMS = item.CPZMS;
+                        materlist.S_ITEM_NAME = item.VTEXT;
+                        db.Updateable<TN_Material>(materlist).ExecuteCommand();
+                        result.MSGDESP = "鎴愬姛";
+                        result.MSGCODE = 0;
+                        result.GCBM = item.GCBM;
+                        result.WLBM = item.WLBM;
+                        list.Add(result);
+                    }
                 }
-                db.Insertable<TN_Material>(list).ExecuteCommand();
-                db.CommitTran();
+                catch (Exception e)
+                {
+                    var result = new WLReturnRoot.ITEM();
+                    result.MSGDESP = e.Message;
+                    result.MSGCODE = 1;
+                    result.GCBM = item.GCBM;
+                    result.WLBM = item.WLBM;
+                    list.Add(result);
+                    db.RollbackTran();
+                    throw;
+                }
+            }
+            response.ROOT.ITEM = list;
+            //db.Insertable<TN_Material>(list).ExecuteCommand();
+            db.CommitTran();
 
-            }
-            catch (Exception e)
-            {
-                db.RollbackTran();
-                throw;
-            }
-            return result;
+
+            return response;
         }
 
 
@@ -1749,7 +1794,7 @@
                     S_START_AREA = locinfo.S_AREA_CODE,
                     S_START_WH = locinfo.S_WH_CODE,
                     S_END_LOC = model.start,
-                    //S_BS_NO = model.arrival_no,
+                    S_BS_NO = model.MaterList[0].arrival_no,
                     N_TYPE = 1,
                     S_TYPE = WMSTask.GetTypeStr(1),
                     S_OP_DEF_CODE = "",
@@ -1838,7 +1883,8 @@
                     var startinfo = db.Queryable<Location>().Where(it => it.S_CODE == start).First();
                     //鍑哄簱鍗曡鎯�                     var po = db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == arrival_no).First();
-
+                    //鍒嗘嫞鍗�+                    //var popp = db.Queryable<TN_Distribution_CNTR>().Where(a => a.S_BS_NO == arrival_no&&a.S_SORT_TYPE=="鏈垎绫� && a.N_B_STATE == 2).First();
 
                     //鍥炲弬鐗╂枡淇℃伅
                     List<OutboundRecord> records = new List<OutboundRecord>();
@@ -2253,13 +2299,19 @@
                     //娣诲姞鍑瘉璁板綍琛�                     result.resultMsg = data.ROOT.ITEM.MSGDESP;
                     result.resultCode = data.ROOT.ITEM.MSGCODE;
-                    MaterialVoucher materialVoucher = new MaterialVoucher();
-                    materialVoucher.S_NO = po.S_NO;
-                    materialVoucher.S_TYPE = po.S_OUT_TYPE;
-                    materialVoucher.S_WLPZBH = data.ROOT.ITEM?.WLPZBH;
-                    materialVoucher.S_WLPZND = data.ROOT.ITEM?.WLPZND;
-                    materialVoucher.STATUS = 0;
-                    db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
+                    foreach (var item in MaterList)
+                    {
+                        MaterialVoucher materialVoucher = new MaterialVoucher();
+                        materialVoucher.S_NO = po.S_NO;
+                        materialVoucher.S_TYPE = po.S_OUT_TYPE;
+                        materialVoucher.S_WLBM = item.item_code;
+                        materialVoucher.S_WLH = item.N_ROW_NO;
+                        materialVoucher.S_WLPZBH = data.ROOT.ITEM?.WLPZBH;
+                        materialVoucher.S_WLPZND = data.ROOT.ITEM?.WLPZND;
+                        materialVoucher.STATUS = 0;
+                        db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
+                    }
+                
                     #endregion
 
                     db.CommitTran();
@@ -2298,6 +2350,13 @@
                     var startinfo = db.Queryable<Location>().Where(it => it.S_CODE == start).First();
                     //鍑哄簱鍗曡鎯�                     var po = db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == arrival_no).First();
+
+                    string GZRQ = "";
+                    if (po.BUDAT != null)
+                    {
+                        GZRQ = DateTime.Parse(po.BUDAT.ToString()).ToString("yyyyMMdd");
+                    }
+                  
                     //鏉ユ簮鍐查攢鍑瘉瀵瑰簲鐨勭墿鏂欏嚟璇佷俊鎭�                     //var poIn = db.Queryable<TN_Inbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == po.S_BS_NO).First();
                     //鏍规嵁鍏ュ簱鏌ョ湅鍑瘉缂栧彿淇℃伅
@@ -2307,71 +2366,102 @@
                     {
                         ROOT = new CXCkBackDto.ROOT
                         {
-                            HEAD = new CXCkBackDto.HEAD
+                            HEAD = new List<CXCkBackDto.HEAD>
                             {
-                                WLPZ = po.S_WLPZ,
-                                WLPZNF = po.S_WLPZNF,
-                                WLPZXM = MaterList[0].N_ROW_NO,
-                                GZRQ = "2025-03-20",
-                                SRRQ = "2025-03-19",
-                                GZRY = "杩囪处浜哄憳濮撳悕"
+
+                                //GZRQ = GZRQ,
+                                //SRRQ = PZZDRQ,
+                                //WLPZ = po.S_WLPZ,
+                                //WLPZNF = po.S_WLPZNF,
+                                //WLPZXM = MaterList[0].N_ROW_NO,
+
+                                //GZRY = po.UNAME
                             }
                         }
                     };
-                    //鍥炲弬鐗╂枡淇℃伅
-                    //List<OutboundRecord> records = new List<OutboundRecord>();
-                    //foreach (var item in MaterList)
-                    //{
+                    List<CXCkBackDto.HEAD> listhead = new List<CXCkBackDto.HEAD>();
+                    foreach (var item in po.Details)
+                    {
+                        CXCkBackDto.HEAD hEAD = new CXCkBackDto.HEAD();
+                        hEAD.GZRQ = GZRQ;
+                        hEAD.SRRQ = DateTime.Now.ToString("yyyyMMdd");
+                        hEAD.WLPZ = po.S_NO;
+                        hEAD.WLPZNF = po.S_WLPZND;
+                        hEAD.WLPZXM = item.N_ROW_NO;
+                        hEAD.GZRY = po.UNAME;
+                        listhead.Add(hEAD);
+                    }
+                    myRoot.ROOT.HEAD = listhead;
 
-                    //    db.BeginTran();
-                    //    //鍑哄簱璁板綍
-                    //    var pz = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == arrival_no).First();
-                    //    OutboundRecord outboundRecord = new OutboundRecord();
-                    //    outboundRecord.S_WLPZBH = pz.S_WLPZBH;
-                    //    outboundRecord.S_WLPZND = pz.S_WLPZND;
-
-                    //    outboundRecord.S_NO = arrival_no;
-                    //    outboundRecord.S_WLBM = item.item_code;
-                    //    outboundRecord.S_SL = item.qty;
-                    //    outboundRecord.S_CNTR_CODE = cntr_code;
-                    //    records.Add(outboundRecord);
-
-                    //}
-                    //db.Insertable<OutboundRecord>(records).ExecuteCommand();
                     #region wms-sap鍥炶皟
+
+
+
                     //绫昏浆json
                     var json = JsonConvert.SerializeObject(myRoot.ROOT);
                     //json杞瑇ml
                     string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;
 
                     LogHelper.Info($"鍐查攢鍑哄簱鍥炶皟xml鏁版嵁{xml}");
-                    // 鍒涘缓 StringContent 骞舵寚瀹氬獟浣撶被鍨嬩负 "text/xml"
-                    HttpContent content = new StringContent(xml, Encoding.UTF8, "application/xml");
-                    string url = Settings.WCSSeverUrl + "/api/WmsSap/cesReceiveXmlData";
-                    string responseXml = "";
-                    using (HttpClient client = new HttpClient())
-                    {
-                        // 鍙戦� POST 璇锋眰骞舵帴鏀跺搷搴�-                        HttpResponseMessage responsess = await client.PostAsync(url, content);
-                        responseXml = await responsess.Content.ReadAsStringAsync();
 
-                    }
+                    ZSCM2_CXPZ service = new ZSCM2_CXPZ();
+                    //  service.Credentials = new NetworkCredential("CONN_RFC", "Init.1234");
+                    // 鍑嗗璇锋眰鍙傛暟
+                    ZfmScm2CxpzMm001 request = new ZfmScm2CxpzMm001();
+                    request.Input = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + xml;
+                    LogHelper.Info($"閫氱敤鍐查攢SAP鍥炶皟");
+                    // 璋冪敤Web Service
+                    ZfmScm2CxpzMm001Response responses = service.ZfmScm2CxpzMm001(request);
 
+                    // 澶勭悊鍝嶅簲
+                    LogHelper.Info("閫氱敤鍐查攢SAP杩斿洖缁撴灉: " + responses.Output);
 
                     XmlDocument xmlDoc = new XmlDocument();
-                    xmlDoc.LoadXml(responseXml.ToString());
+                    xmlDoc.LoadXml(responses.Output.ToString());
                     JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
-                    var data = JsonConvert.DeserializeObject<ReturnWcBcak.Root>(jsonObject.ToString());
+                    var data = JsonConvert.DeserializeObject<ReturnTYBcak.Root>(jsonObject.ToString());
+                    var resmeg = "";
+                    int rescode = 0;
                     //娣诲姞鍑瘉璁板綍琛�-                    result.resultMsg = data.ROOT.ITEM.MSGDESP;
-                    result.resultCode = data.ROOT.ITEM.MSGCODE;
-                    MaterialVoucher materialVoucher = new MaterialVoucher();
-                    materialVoucher.S_NO = po.S_NO;
-                    materialVoucher.S_TYPE = po.S_OUT_TYPE;
-                    materialVoucher.S_WLPZBH = data.ROOT.ITEM?.WLPZBH;
-                    materialVoucher.S_WLPZND = data.ROOT.ITEM?.WLPZND;
-                    materialVoucher.STATUS = 0;
-                    db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
+                    if (data!=null)
+                    {
+                        List<MaterialVoucher> materiallist = new List<MaterialVoucher>();
+                        foreach (var item in data.ROOT.ITEM)
+                        {
+                            if (item.MSGCODE == 0)
+                            {
+                                MaterialVoucher materialVoucher = new MaterialVoucher();
+                                materialVoucher.S_NO = po.S_NO;
+                                materialVoucher.S_TYPE = po.S_OUT_TYPE;
+                                materialVoucher.S_WLPZBH = item?.WLPZBH;
+                                materialVoucher.S_WLPZND = item?.WLPZND;
+                                materialVoucher.S_WLPZHXM = item?.WLPZHXM;
+
+                                materialVoucher.S_YWLPZBH = item?.YWLPZBH;
+                                materialVoucher.S_YWLPZND = item?.YWLPZND;
+                                materialVoucher.S_YWLPZHXM = item?.YWLPZHXM;
+                                materialVoucher.STATUS = 0;
+                                resmeg += item?.MSGDESP;
+                                materiallist.Add(materialVoucher);
+                            }
+                            else {
+                                rescode = 1;
+                            }
+                          
+                         
+                        }
+                        if (materiallist.Count()>0)
+                        {
+
+                            db.Insertable<MaterialVoucher>(materiallist).ExecuteCommand();
+                        }
+                    }
+            
+
+
+
+                    result.resultMsg = resmeg;
+                    result.resultCode = rescode;
                     #endregion
 
                     db.CommitTran();
@@ -2605,7 +2695,10 @@
 
                 try
                 {
-
+                    if (MaterList.Count()<1)
+                    {
+                        throw new Exception("绱鐮佺洏鏁伴噺鐗╂枡鏁版嵁涓虹┖");
+                    }
                     foreach (var item in MaterList)
                     {
                         var allInfolist = db.Queryable<TN_Inbound_Detail>()
@@ -3867,14 +3960,14 @@
                         {
                             ROOT = new CXCkBackDto.ROOT
                             {
-                                HEAD = new CXCkBackDto.HEAD
+                                HEAD = new List<CXCkBackDto.HEAD>
                                 {
-                                    WLPZ = materpz.S_WLPZ,
-                                    WLPZNF = materpz.S_WLPZNF,
-                                    WLPZXM = null,
-                                    GZRQ = "2025-03-20",
-                                    SRRQ = DateTime.Now.ToString(),
-                                    GZRY = "杩囪处浜哄憳濮撳悕"
+                                    //WLPZ = materpz.S_WLPZ,
+                                    //WLPZNF = materpz.S_WLPZNF,
+                                    //WLPZXM = null,
+                                    //GZRQ = "2025-03-20",
+                                    //SRRQ = DateTime.Now.ToString(),
+                                    //GZRY = "杩囪处浜哄憳濮撳悕"
                                 }
                             }
                         };
@@ -3923,7 +4016,7 @@
                 }
                 catch (Exception ex)
                 {
-                    LogHelper.Info($"鍏ュ簱鍥炶皟鎶ラ敊{ex.Message}");
+                    LogHelper.Info($"鍐查攢鍥炲簱鍥炶皟鎶ラ敊{ex.Message}");
                     db.RollbackTran();
                     throw;
                 }
diff --git a/api/ZSCM2_CXPZ.cs b/api/ZSCM2_CXPZ.cs
new file mode 100644
index 0000000..6219ce9
--- /dev/null
+++ b/api/ZSCM2_CXPZ.cs
@@ -0,0 +1,158 @@
+锘�/------------------------------------------------------------------------------
+// <auto-generated>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�+//     杩愯鏃剁増鏈�4.0.30319.42000
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�+//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Web.Services;
+using System.Web.Services.Protocols;
+using System.Xml.Serialization;
+
+// 
+// 姝ゆ簮浠g爜鐢�wsdl 鑷姩鐢熸垚, Version=4.8.3928.0銆�+// 
+
+
+/// <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 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";
+    }
+    
+    /// <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) {
+        object[] results = this.Invoke("ZfmScm2CxpzMm001", new object[] {
+                    ZfmScm2CxpzMm0011});
+        return ((ZfmScm2CxpzMm001Response)(results[0]));
+    }
+    
+    /// <remarks/>
+    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) {
+        object[] results = this.EndInvoke(asyncResult);
+        return ((ZfmScm2CxpzMm001Response)(results[0]));
+    }
+    
+    /// <remarks/>
+    public void ZfmScm2CxpzMm001Async(ZfmScm2CxpzMm001 ZfmScm2CxpzMm0011) {
+        this.ZfmScm2CxpzMm001Async(ZfmScm2CxpzMm0011, null);
+    }
+    
+    /// <remarks/>
+    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)) {
+            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) {
+        base.CancelAsync(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 ZfmScm2CxpzMm001 {
+    
+    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 ZfmScm2CxpzMm001Response {
+    
+    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;
+        }
+    }
+}
+
+/// <remarks/>
+[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.8.3928.0")]
+public delegate void ZfmScm2CxpzMm001CompletedEventHandler(object sender, ZfmScm2CxpzMm001CompletedEventArgs e);
+
+/// <remarks/>
+[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.8.3928.0")]
+[System.Diagnostics.DebuggerStepThroughAttribute()]
+[System.ComponentModel.DesignerCategoryAttribute("code")]
+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) {
+        this.results = results;
+    }
+    
+    /// <remarks/>
+    public ZfmScm2CxpzMm001Response Result {
+        get {
+            this.RaiseExceptionIfNecessary();
+            return ((ZfmScm2CxpzMm001Response)(this.results[0]));
+        }
+    }
+}
diff --git a/models/MaterialVoucher.cs b/models/MaterialVoucher.cs
index 9a95385..88f6fb5 100644
--- a/models/MaterialVoucher.cs
+++ b/models/MaterialVoucher.cs
@@ -16,11 +16,17 @@
         /// </summary>
         public string S_NO { get; set; }
         public string S_TYPE { get; set; }
+        public string S_WLBM { get; set; }
+        public string S_WLH { get; set; }
         /// <summary>
         /// 鐗╂枡缂栫爜
         /// </summary>
         public string S_WLPZBH { get; set; }
         public string S_WLPZND { get; set; }
+        public string S_WLPZHXM  { get; set; }
+        public string S_YWLPZBH { get; set; }
+        public string S_YWLPZND { get; set; }
+        public string S_YWLPZHXM { get; set; }
         /// <summary>
         /// 0鏈夋晥 1鍐查攢
         /// </summary>
diff --git a/models/SapRoot.cs b/models/SapRoot.cs
index 321559c..c563e0d 100644
--- a/models/SapRoot.cs
+++ b/models/SapRoot.cs
@@ -244,6 +244,52 @@
             }
         }
         #endregion
+
+
+
+        #region 鐗╂枡鏀惰揣鍥炲弬
+
+
+        /// <summary>
+        /// 鐗╂枡鏀惰揣鍥炲弬
+        /// </summary>
+        public class WLReturnRoot
+        {
+
+            public class ITEM
+            {
+                /// <summary>
+                /// 鐗╂枡鍑瘉鍙�+                /// </summary>
+                public string GCBM { get; set; }
+                public string WLBM { get; set; }
+                /// <summary>
+                /// 杩斿洖缁撴灉鏍囪瘑(0鎴愬姛鎴栬�1澶辫触)瀛楃闀�+                /// </summary>
+                public int MSGCODE { get; set; }
+                /// <summary>
+                /// 澶辫触鍘熷洜鎴栬�鎴愬姛淇℃伅瀛楃闀垮害255
+                /// </summary>
+                public string MSGDESP { get; set; }
+            }
+
+            public class ROOT
+            {
+                /// <summary>
+                /// 
+                /// </summary>
+                public List<ITEM> ITEM { get; set; }
+            }
+
+            public class Root
+            {
+                /// <summary>
+                /// 
+                /// </summary>
+                public ROOT ROOT { get; set; }
+            }
+        }
+        #endregion
         #region 棰嗘枡鍗曞洖鍙�         public class LLDReturnRoot {
 
diff --git a/models/TN_Distribution_CNTR.cs b/models/TN_Distribution_CNTR.cs
index 1703068..0a1823f 100644
--- a/models/TN_Distribution_CNTR.cs
+++ b/models/TN_Distribution_CNTR.cs
@@ -56,6 +56,7 @@
         /// 来源业务编码
         /// </summary>
         public string S_BS_NO { get; set; }
+        public string S_SORT_TYPE { get; set; }
         /// <summary>
         /// 自动生成作业
         /// </summary>
diff --git a/models/TN_Outbound_Order.cs b/models/TN_Outbound_Order.cs
index b281291..84336b0 100644
--- a/models/TN_Outbound_Order.cs
+++ b/models/TN_Outbound_Order.cs
@@ -20,7 +20,7 @@
         /// <summary>
         /// 年份
         /// </summary>
-        public string S_WLPZNF { get; set; }
+        //public string S_WLPZNF { get; set; }
         public string S_WLPZHXM { get; set; }
         public string S_WLPZ { get; set; }
         public string S_WLPZND { get; set; }

--
Gitblit v1.9.1