From da4b61f0701712e4a381974cf18b30ce56a288c4 Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期五, 09 五月 2025 16:52:33 +0800
Subject: [PATCH] 增加实体类 物料sap接口测试
---
api/WmsSpaHelper.cs | 126 +++++++++------
wms/WMSHelper.cs | 6
models/TN_Supplier_detial.cs | 18 ++
api/ZSCM2_CBZX.cs | 158 +++++++++++++++++++
models/SapRoot.cs | 4
models/TN_Supplier.cs | 82 ++++++++--
models/TN_Outbound_Order.cs | 4
api/WmsSapController.cs | 43 -----
api/ApibackModel.cs | 8
HH.WCS.Mobox3.pinggao.csproj | 2
10 files changed, 331 insertions(+), 120 deletions(-)
diff --git a/HH.WCS.Mobox3.pinggao.csproj b/HH.WCS.Mobox3.pinggao.csproj
index 85b4b25..99d4c4f 100644
--- a/HH.WCS.Mobox3.pinggao.csproj
+++ b/HH.WCS.Mobox3.pinggao.csproj
@@ -171,6 +171,7 @@
<Compile Include="api\WmsSapController.cs" />
<Compile Include="api\WmsSpaHelper.cs" />
<Compile Include="api\ZCCM_NC.cs" />
+ <Compile Include="api\ZSCM2_CBZX.cs" />
<Compile Include="api\ZSCM2_SCFLJHW.cs" />
<Compile Include="App_Start\SwaggerControllerDescProvider.cs" />
<Compile Include="core\WMSCore.cs" />
@@ -194,6 +195,7 @@
<Compile Include="models\TN_Location_Ext.cs" />
<Compile Include="models\TN_Ll_detail.cs" />
<Compile Include="models\TN_Ll_Order.cs" />
+ <Compile Include="models\TN_Supplier_detial.cs" />
<Compile Include="models\WorkOrder.cs" />
<Compile Include="models\TN_PRICE.cs" />
<Compile Include="models\TN_WeiLi_SerialNo.cs" />
diff --git a/api/ApibackModel.cs b/api/ApibackModel.cs
index f0fde03..aa09924 100644
--- a/api/ApibackModel.cs
+++ b/api/ApibackModel.cs
@@ -298,7 +298,7 @@
/// <summary>
/// 搴忓垪鍙� /// </summary>
- public string XLH { get; set; }
+ public List<string> XLH { get; set; }
}
public class ITEM
@@ -342,7 +342,7 @@
/// <summary>
///
/// </summary>
- public List<ITEM1> ITEM1 { get; set; }
+ public ITEM1 ITEM1 { get; set; }
}
public class WLPZ
@@ -571,7 +571,7 @@
public class CBcenterBackDto {
public class ITEM
{
- public string XLH { get; set; }
+ public List<string> XLH { get; set; }
}
public class HEADItem
@@ -620,7 +620,7 @@
/// <summary>
///
/// </summary>
- public List<ITEM> ITEM { get; set; }
+ public ITEM ITEM { get; set; }
}
public class ROOT
diff --git a/api/WmsSapController.cs b/api/WmsSapController.cs
index 89471e8..1ffb9e2 100644
--- a/api/WmsSapController.cs
+++ b/api/WmsSapController.cs
@@ -22,48 +22,7 @@
{
public class WmsSapController : System.Web.Http.ApiController
{
- /// <summary>
- /// 鐢熶骇璁㈠崟淇℃伅鑾峰彇
- /// </summary>
- /// <param name="xmlData"></param>
- /// <returns></returns>
- //[HttpPost]
- //public Orderback.Root GYSReceiveXmlData([FromBody] GYSDto.Root xmlData)
- //{
- // #region xml鏁版嵁鎺ユ敹杞暟缁�-
- // LogHelper.Info("渚涘簲鍟嗘帴鏀舵帴鍙ｏ細" + JsonConvert.SerializeObject(xmlData));
-
- // ////鎺ユ敹xml鏁版嵁
- // //XmlDocument xmlDoc = new XmlDocument();
- // //xmlDoc.LoadXml(xmlData.ToString());
-
- // //// 灏�XmlDocument 杞崲涓�JSON 瀛楃涓�- // //JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
-
- // //// 澶勭悊鐗瑰畾瀛楁锛屽己鍒惰浆鎹负鏁扮粍
- // //WmsSpaHelper.EnsureArrayFormats(jsonObject, "ITEM");
- // //// 鍙嶅簭鍒楀寲涓篟ootWithArray
- // //var data = JsonConvert.DeserializeObject<OrderDto.Root>(jsonObject.ToString());
- // #endregion
-
- // #region 澶栭噰鍏ュ簱涓氬姟娴佺▼
- // //Orderback.Root simpleResult = WmsSpaHelper.Mater_In(xmlData);
- // //鎺ユ敹杩斿洖鍙傛暟 鐢熸垚sap瀵规帴鏂囨。杩斿洖鏍煎紡
- // //var json = WmsSpaHelper.GetJsonResult(simpleResult.WLPZBH, simpleResult.resultCode.ToString(), simpleResult.resultMsg);
-
- // #endregion
- // #region 杩斿洖xml
- // //string xml = JsonConvert.DeserializeXmlNode(json, "root").OuterXml;
- // ////杩斿洖json
- // //var response = new HttpResponseMessage()
- // //{
- // // Content = new StringContent(xml, Encoding.UTF8, "application/xml")
- // //};
- // //return response;
- // return null;
- // #endregion
- //}
+
/// <summary>
diff --git a/api/WmsSpaHelper.cs b/api/WmsSpaHelper.cs
index b510dac..d3ab124 100644
--- a/api/WmsSpaHelper.cs
+++ b/api/WmsSpaHelper.cs
@@ -33,6 +33,7 @@
using WHTest;
using System.Net;
using SqlSugar;
+using static HH.WCS.Mobox3.pinggao.models.SapRoot.GYSDto;
namespace HH.WCS.Mobox3.pinggao.api
{
@@ -653,6 +654,7 @@
}
return simpleResults;
}
+
/// <summary>
/// sap-wms鐢熶骇璁㈠崟淇℃伅娣诲姞SimpleResult
/// </summary>
@@ -706,7 +708,7 @@
iTEM.SCDDH = item.SCDDH;
iTEM.GC = item.GC;
iTEM.MSGCODE = "1";
- iTEM.MSGDESP = $"{item.SCDDH}涓嶅瓨鍦�;
+ iTEM.MSGDESP = $"{item.SCDDH}宸插瓨鍦�;
tEMs.Add(iTEM);
}
iTEM.SCDDH = item.SCDDH;
@@ -1743,7 +1745,7 @@
return result;
}
-
+ po.S_OUT_TYPE = "鎴愭湰涓績鍑哄簱";
//鏍规嵁涓嶅悓鍑哄簱绫诲瀷 鍥炶皟sap
if (po.S_OUT_TYPE == "鍐查攢鍑哄簱")
{
@@ -1938,18 +1940,20 @@
ckbitem.PC = podetail?.S_BATCH_NO;
- List<CBcenterBackDto.ITEM> listitem1 = new List<CBcenterBackDto.ITEM>();
+ CBcenterBackDto.ITEM listitem1 = new CBcenterBackDto.ITEM();
+ // List<CBcenterBackDto.ITEM> listitem1 = new List<CBcenterBackDto.ITEM>();
//string[] xlhValues = item.S_SERIAL_NO.Split(',');
//var serialNos = string.Join(",", CntrItemRels
// .Where(s => s.S_ITEM_CODE == item.item_code)
// .Select(s => s.S_SERIAL_NO));
//string[] xlhValues = serialNos.Split(',');
string[] xlhValues = item.S_SERIAL_NO.Split(',');
- foreach (var xlhValue in xlhValues)
- {
- CBcenterBackDto.ITEM newItem = new CBcenterBackDto.ITEM { XLH = xlhValue };
- listitem1.Add(newItem);
- }
+ listitem1.XLH= podetail?.S_SERIAL_NO.Split(',').ToList();
+ //foreach (var xlhValue in xlhValues)
+ //{
+ // CBcenterBackDto.ITEM newItem = new CBcenterBackDto.ITEM { XLH = xlhValue };
+ // listitem1.Add(newItem);
+ //}
ckbitem.ITEM = listitem1;
iTEMs.Add(ckbitem);
@@ -1964,21 +1968,37 @@
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();
+ //// 鍒涘缓 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();
- }
+ //}
+ #region sap鍥炶皟
+ // 鍒涘缓Web Service浠ｇ悊绫诲疄渚�+ ZSCM2_CBZX service = new ZSCM2_CBZX();
+ // service.Credentials = new NetworkCredential("CONN_RFC", "Init.1234");
+ // 鍑嗗璇锋眰鍙傛暟
+ ZfmScm2CbzxMm001 request = new ZfmScm2CbzxMm001();
+ request.Input = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + xml;
+ LogHelper.Info($"鎴愭湰涓績鍑哄簱SAP鍥炶皟");
+ // 璋冪敤Web Service
+ ZfmScm2CbzxMm001Response responses = service.ZfmScm2CbzxMm001(request);
+ // 澶勭悊鍝嶅簲
+ LogHelper.Info("SAP杩斿洖缁撴灉: " + responses.Output);
+
+ // 瑙ｆ瀽Output涓殑鍑瘉鍙风瓑淇℃伅
+
+ #endregion
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());
//娣诲姞鍑瘉璁板綍琛�@@ -2050,14 +2070,7 @@
{
HEAD = new JHWBackDto.HEAD
{
- //KEY = "KeyExample",
- //GZRQ = "2023-04-01",
- //PZZDRQ = "2023-04-02",
- //YHM = "Username",
- //PZTTWB = "HeaderText",
- //YDLX = "MovementType",
- //TSKCBS = "SpecialStock"
-
+
KEY = po.S_NO,
GZRQ = GZRQ,
PZZDRQ = PZZDRQ,
@@ -2082,9 +2095,7 @@
JHWBackDto.ITEM ckbitem = new JHWBackDto.ITEM();
ckbitem.WLBH = item.item_code;
ckbitem.GC = po.S_FACTORY;
-
//ckbitem.PH = podetail?.S_PH;
-
//ckbitem.TSKCBS = podetail?.S_TSKCBS;
ckbitem.XSDD = podetail?.S_XSDD;
ckbitem.XSDDHXM = podetail?.S_XSDDXMBH;
@@ -2095,7 +2106,6 @@
ckbitem.WBS = podetail?.S_WBS;
ckbitem.KCDD = podetail?.S_KCDD;
ckbitem.PC = podetail?.S_BATCH_NO;
-
JHWBackDto.ITEM1 listitem1 = new JHWBackDto.ITEM1();
//string[] xlhValues = item.S_SERIAL_NO.Split(',');
//var serialNos = string.Join(",", CntrItemRels
@@ -2136,20 +2146,36 @@
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();
+ //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();
- }
+ //}
+ #region sap鍥炶皟
+ // 鍒涘缓Web Service浠ｇ悊绫诲疄渚�+ ZSCM2_SCFLJHW service = new ZSCM2_SCFLJHW();
+ // service.Credentials = new NetworkCredential("CONN_RFC", "Init.1234");
+ // 鍑嗗璇锋眰鍙傛暟
+ ZscmScflJhw request = new ZscmScflJhw();
+ request.Input = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + xml;
+ LogHelper.Info($"璁″垝澶朣AP鍥炶皟");
+ // 璋冪敤Web Service
+ ZscmScflJhwResponse responses = service.ZscmScflJhw(request);
+ // 澶勭悊鍝嶅簲
+ LogHelper.Info("SAP杩斿洖缁撴灉: " + responses.Output);
+
+ // 瑙ｆ瀽Output涓殑鍑瘉鍙风瓑淇℃伅
+
+ #endregion
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());
//娣诲姞鍑瘉璁板綍琛�@@ -2391,18 +2417,18 @@
ckbitem.GC = po.S_FACTORY;
ckbitem.KCDD = podetail?.S_KCDD;
- List<CkBcakDto.ITEM1> listitem1 = new List<CkBcakDto.ITEM1>();
+ CkBcakDto.ITEM1 listitem1 = new CkBcakDto.ITEM1();
//var CntrItemRels = db.Queryable<CntrItemRel>().Where(a => a.S_ITEM_CODE == item.item_code&&a.N_ROW_NO==item.N_ROW_NO).ToList();
////string[] xlhValues = item.S_SERIAL_NO.Split(',');
//var serialNos = string.Join(",", CntrItemRels
// .Where(s => s.S_ITEM_CODE == item.item_code)
// .Select(s => s.S_SERIAL_NO));
- string[] xlhValues = item.S_SERIAL_NO.Split(',');
- foreach (var xlhValue in xlhValues)
- {
- CkBcakDto.ITEM1 newItem = new CkBcakDto.ITEM1 { XLH = xlhValue };
- listitem1.Add(newItem);
- }
+ listitem1.XLH = podetail?.S_SERIAL_NO.Split(',').ToList();
+ //foreach (var xlhValue in xlhValues)
+ //{
+ // CkBcakDto.ITEM1 newItem = new CkBcakDto.ITEM1 { XLH = xlhValue };
+ // listitem1.Add(newItem);
+ //}
ckbitem.ITEM1 = listitem1;
iTEMs.Add(ckbitem);
@@ -3531,15 +3557,13 @@
JHWBackDto.ITEM ckbitem = new JHWBackDto.ITEM();
ckbitem.WLBH = item.S_ITEM_CODE;
ckbitem.GC = po.S_FACTORY;
-
- //ckbitem.PH = podetail?.S_PH;
-
- // ckbitem.TSKCBS = podetail?.S_TSKCBS;
ckbitem.XSDD = podetail?.S_XSDD;
ckbitem.XSDDHXM = podetail?.S_XSDDXMBH;
ckbitem.SL = item.F_QTY;
ckbitem.DW = podetail?.S_UOM;
ckbitem.DDH = podetail?.S_DDH;
+ //ckbitem.PH = podetail?.S_PH;
+ // ckbitem.TSKCBS = podetail?.S_TSKCBS;
//ckbitem.DDHXM = (podetail?.N_ROW_NO);
ckbitem.WBS = podetail?.S_WBS;
ckbitem.KCDD = podetail?.S_KCDD;
diff --git a/api/ZSCM2_CBZX.cs b/api/ZSCM2_CBZX.cs
new file mode 100644
index 0000000..2524ce4
--- /dev/null
+++ b/api/ZSCM2_CBZX.cs
@@ -0,0 +1,158 @@
+锘�/------------------------------------------------------------------------------
+// <auto-generated>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�+// 杩愯鏃剁増鏈�4.0.30319.42000
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�+// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�
+// </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銆�+//
+
+
+/// <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_CBZX : System.Web.Services.Protocols.SoapHttpClientProtocol {
+
+ private System.Threading.SendOrPostCallback ZfmScm2CbzxMm001OperationCompleted;
+
+ /// <remarks/>
+ public ZSCM2_CBZX() {
+ this.Url = "http://ceerptest.cee.com.cn:8000/sap/bc/srt/rfc/sap/zscm2_cbzx/110/zscm2_cbzx/bin" +
+ "ding";
+ }
+
+ /// <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) {
+ object[] results = this.Invoke("ZfmScm2CbzxMm001", new object[] {
+ ZfmScm2CbzxMm0011});
+ return ((ZfmScm2CbzxMm001Response)(results[0]));
+ }
+
+ /// <remarks/>
+ 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) {
+ object[] results = this.EndInvoke(asyncResult);
+ return ((ZfmScm2CbzxMm001Response)(results[0]));
+ }
+
+ /// <remarks/>
+ public void ZfmScm2CbzxMm001Async(ZfmScm2CbzxMm001 ZfmScm2CbzxMm0011) {
+ this.ZfmScm2CbzxMm001Async(ZfmScm2CbzxMm0011, null);
+ }
+
+ /// <remarks/>
+ 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)) {
+ 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) {
+ 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 ZfmScm2CbzxMm001 {
+
+ 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 ZfmScm2CbzxMm001Response {
+
+ 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 ZfmScm2CbzxMm001CompletedEventHandler(object sender, ZfmScm2CbzxMm001CompletedEventArgs e);
+
+/// <remarks/>
+[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.8.3928.0")]
+[System.Diagnostics.DebuggerStepThroughAttribute()]
+[System.ComponentModel.DesignerCategoryAttribute("code")]
+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) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public ZfmScm2CbzxMm001Response Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((ZfmScm2CbzxMm001Response)(this.results[0]));
+ }
+ }
+}
diff --git a/models/SapRoot.cs b/models/SapRoot.cs
index dc1d267..321559c 100644
--- a/models/SapRoot.cs
+++ b/models/SapRoot.cs
@@ -704,7 +704,7 @@
public string ZZSDJH { get; set; }
}
- public class GYSHBItem
+ public class GYSHB
{
/// <summary>
///
@@ -729,7 +729,7 @@
/// <summary>
///
/// </summary>
- public List<GYSHBItem> GYSHB { get; set; }
+ public List<GYSHB> GYSHB { get; set; }
}
public class ROOT
diff --git a/models/TN_Outbound_Order.cs b/models/TN_Outbound_Order.cs
index a9b2598..6fba4da 100644
--- a/models/TN_Outbound_Order.cs
+++ b/models/TN_Outbound_Order.cs
@@ -12,8 +12,8 @@
/// 出库单号
/// </summary>
public string S_NO { get; set; }
- public DateTime? BUDAT { get; set; }
- public DateTime? BLDAT { get; set; }
+ public string BUDAT { get; set; }
+ public string BLDAT { get; set; }
public string UNAME { get; set; }
public string BKTXT { get; set; }
public string SOBKZ { get; set; }
diff --git a/models/TN_Supplier.cs b/models/TN_Supplier.cs
index b2da1cb..d2acce5 100644
--- a/models/TN_Supplier.cs
+++ b/models/TN_Supplier.cs
@@ -1,28 +1,74 @@
using HH.WCS.Mobox3.pinggao.models;
+using SqlSugar;
using System;
+using System.Collections.Generic;
namespace HH.WCS.Mobox3.pinggao
{
-
+ [SugarTable("TN_Supplier")]
public class TN_Supplier : BaseModel
{
-
-
- public string S_NO { get; set; }
- public string S_NAME { get; set; }
- public string S_TYPE { get; set; }
- public string C_UNINSPECTED { get; set; }
- public string S_NOTE { get; set; }
- public string S_CONTACT_PERSON { get; set; }
- public string S_TEL { get; set; }
- public string S_PHONE { get; set; }
- public string S_EMAIL { get; set; }
- public string S_PROVINCE { get; set; }
- public string S_CITY { get; set; }
- public string S_ZONE { get; set; }
- public string S_ADDRESS { get; set; }
+
+ // 供应商或债权人的帐号
+ public string S_GYSBM { get; set; }
+
+ // MDM供应商
+ public string S_MDMBM { get; set; }
+
+ // 主数据接口名称
+ public string S_GYSMC { get; set; }
+
+ // 银行国家代码
+ public string S_YHGJ { get; set; }
+
+ // 银行代码
+ public string S_YHDM { get; set; }
+
+ // 开户银行的简要键
+ public string S_KHH { get; set; }
+
+ // 住宅号及街道
+ public string S_YHJD { get; set; }
+
+ // 城市
+ public string S_YHCS { get; set; }
+
+ // 帐户号码
+ public string S_KHHZH { get; set; }
+
+ // 街道
+ public string S_DZ { get; set; }
+
+ // 邮政编码
+ public string S_YZBM { get; set; }
+
+ // 城市
+ public string S_CS { get; set; }
+
+ // 国家代码
+ public string S_GJDM { get; set; }
+
+ // 国家名称
+ public string S_GJ { get; set; }
+
+ // 地区
+ public string S_DQDM { get; set; }
+
+ // 描述
+ public string S_DQMC { get; set; }
+
+ // 税号
+ public string S_SH { get; set; }
+
+ // 组织机构代码
+ public string S_ZZSDJH { get; set; }
+
+ // 根据您的要求添加的属性
public string S_STATE_PRE { get; set; }
- public int N_REVIEW_RESULT { get; set; }
-
+
+ [SugarColumn(IsIgnore = true)]
+ [Navigate(NavigateType.OneToMany, nameof(TN_Supplier_detial.S_DO_GYSBM), nameof(S_GYSBM))]
+ public List<TN_Supplier_detial> Details { get; set; }
+
}
}
diff --git a/models/TN_Supplier_detial.cs b/models/TN_Supplier_detial.cs
new file mode 100644
index 0000000..31305ce
--- /dev/null
+++ b/models/TN_Supplier_detial.cs
@@ -0,0 +1,18 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HH.WCS.Mobox3.pinggao.models
+{
+ [SugarTable("TN_Supplier_Detail")]
+ public class TN_Supplier_detial:BaseModel
+ {
+ public string S_CGZZ
+ { get; set; }
+ public string S_DO_GYSBM { get; set; }
+ public string S_HB { get; set; }
+ }
+}
diff --git a/wms/WMSHelper.cs b/wms/WMSHelper.cs
index 66c650f..f22f842 100644
--- a/wms/WMSHelper.cs
+++ b/wms/WMSHelper.cs
@@ -135,7 +135,11 @@
var db = new SqlHelper<object>().GetInstance();
return db.Queryable<TN_Inbound_Order>().Includes(a => a.Details).Where(a => a.S_NO == no).First();
}
-
+ internal static TN_Supplier GetGYSBMOrder(string no)
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ return db.Queryable<TN_Supplier>().Includes(a => a.Details).Where(a => a.S_GYSBM == no).First();
+ }
internal static TN_ASN_Order GetASNOrder(string no)
{
var db = new SqlHelper<object>().GetInstance();
--
Gitblit v1.9.1