diff --git a/WebApp/Apps/api/IStackerStatusApp.cs b/WebApp/Apps/api/IStackerStatusApp.cs
index e98976b..8567f0d 100644
--- a/WebApp/Apps/api/IStackerStatusApp.cs
+++ b/WebApp/Apps/api/IStackerStatusApp.cs
@@ -1673,146 +1673,146 @@ namespace WebApp
}
}
//入库完成测试接口
- if (sTKStatusModel.Status == 90)
- {
- //测试调用ERP接口
- TIPTOPServiceGateWayPortTypeClient TipOut = new TIPTOPServiceGateWayPortTypeClient();
- ConfigXmlDocument doc = new ConfigXmlDocument();
- //读取传入的xml
- var config = AppSettingsJson.GetAppSettings();
- doc.Load(config.GetSection("NouYaWebInBackService:Url").Value);
- //将物料号填入
- XmlNodeList ns = doc.SelectNodes("//Field");
- foreach (XmlElement node in ns)
- {
- //作业类型
- if (node.GetAttribute("name") == "tc_dcf001")
- {
- node.SetAttribute("value", "D111");
- }
- //入库单号
- else if (node.GetAttribute("name") == "tc_dcf003")
- {
- node.SetAttribute("value", "123123");
- }
- //客商编号
- else if (node.GetAttribute("name") == "tc_dcf004")
- {
- node.SetAttribute("value", "123");
- }
- //入库日期
- else if (node.GetAttribute("name") == "tc_dcf005")
- {
- node.SetAttribute("value", "2020-11-20");
- }
- //入库部门
- else if (node.GetAttribute("name") == "tc_dcf006")
- {
- node.SetAttribute("value", "123");
- }
- //单据状态
- else if (node.GetAttribute("name") == "tc_dcf012")
- {
- node.SetAttribute("value", "123");
- }
- //营运中心
- else if (node.GetAttribute("name") == "tc_dcf013")
- {
- node.SetAttribute("value", "123");
- }
- //单据项次
- else if (node.GetAttribute("name") == "tc_dcf015")
- {
- node.SetAttribute("value", "123");
- }
- //物料编号
- else if (node.GetAttribute("name") == "tc_dcf016")
- {
- node.SetAttribute("value", "7120004938");
- }
- //单位
- else if (node.GetAttribute("name") == "tc_dcf019")
- {
- node.SetAttribute("value", "7120004938");
- }
- //申请数量
- else if (node.GetAttribute("name") == "tc_dcf021")
- {
- node.SetAttribute("value", "100");
- }
- //实际数量
- else if (node.GetAttribute("name") == "tc_dcf022")
- {
- node.SetAttribute("value", "100");
- }
- //单据完成状态
- else if (node.GetAttribute("name") == "tc_dcf023")
- {
- node.SetAttribute("value", "1");
- }
- //单据完成结果
- else if (node.GetAttribute("name") == "tc_dcf024")
- {
- node.SetAttribute("value", "");
- }
- //仓库
- else if (node.GetAttribute("name") == "tc_dcf028")
- {
- node.SetAttribute("value", "B0010");
- }
- //WMS回传仓库
- else if (node.GetAttribute("name") == "tc_dcf029")
- {
- node.SetAttribute("value", "B0010");
- }
- //库位
- else if (node.GetAttribute("name") == "tc_dcf030")
- {
- node.SetAttribute("value", "");
- }
- //WMS回传库位
- else if (node.GetAttribute("name") == "tc_dcf031")
- {
- node.SetAttribute("value", "CA-01-05");
- }
- //批号
- else if (node.GetAttribute("name") == "tc_dcf032")
- {
- node.SetAttribute("value", "20201120001");
- }
- //工单号
- else if (node.GetAttribute("name") == "tc_dcf033")
- {
- node.SetAttribute("value", "123");
- }
+ //if (sTKStatusModel.Status == 90)
+ //{
+ // //测试调用ERP接口
+ // TIPTOPServiceGateWayPortTypeClient TipIn = new TIPTOPServiceGateWayPortTypeClient();
+ // ConfigXmlDocument doc = new ConfigXmlDocument();
+ // //读取传入的xml
+ // var config = AppSettingsJson.GetAppSettings();
+ // doc.Load(config.GetSection("NouYaWebInBackService:Url").Value);
+ // //将物料号填入
+ // XmlNodeList ns = doc.SelectNodes("//Field");
+ // foreach (XmlElement node in ns)
+ // {
+ // //作业类型
+ // if (node.GetAttribute("name") == "tc_dcf001")
+ // {
+ // node.SetAttribute("value", "D111");
+ // }
+ // //入库单号
+ // else if (node.GetAttribute("name") == "tc_dcf003")
+ // {
+ // node.SetAttribute("value", "123123");
+ // }
+ // //客商编号
+ // else if (node.GetAttribute("name") == "tc_dcf004")
+ // {
+ // node.SetAttribute("value", "123");
+ // }
+ // //入库日期
+ // else if (node.GetAttribute("name") == "tc_dcf005")
+ // {
+ // node.SetAttribute("value", "2020-11-20");
+ // }
+ // //入库部门
+ // else if (node.GetAttribute("name") == "tc_dcf006")
+ // {
+ // node.SetAttribute("value", "123");
+ // }
+ // //单据状态
+ // else if (node.GetAttribute("name") == "tc_dcf012")
+ // {
+ // node.SetAttribute("value", "123");
+ // }
+ // //营运中心
+ // else if (node.GetAttribute("name") == "tc_dcf013")
+ // {
+ // node.SetAttribute("value", "123");
+ // }
+ // //单据项次
+ // else if (node.GetAttribute("name") == "tc_dcf015")
+ // {
+ // node.SetAttribute("value", "123");
+ // }
+ // //物料编号
+ // else if (node.GetAttribute("name") == "tc_dcf016")
+ // {
+ // node.SetAttribute("value", "7120004938");
+ // }
+ // //单位
+ // else if (node.GetAttribute("name") == "tc_dcf019")
+ // {
+ // node.SetAttribute("value", "7120004938");
+ // }
+ // //申请数量
+ // else if (node.GetAttribute("name") == "tc_dcf021")
+ // {
+ // node.SetAttribute("value", "100");
+ // }
+ // //实际数量
+ // else if (node.GetAttribute("name") == "tc_dcf022")
+ // {
+ // node.SetAttribute("value", "100");
+ // }
+ // //单据完成状态
+ // else if (node.GetAttribute("name") == "tc_dcf023")
+ // {
+ // node.SetAttribute("value", "1");
+ // }
+ // //单据完成结果
+ // else if (node.GetAttribute("name") == "tc_dcf024")
+ // {
+ // node.SetAttribute("value", "");
+ // }
+ // //仓库
+ // else if (node.GetAttribute("name") == "tc_dcf028")
+ // {
+ // node.SetAttribute("value", "B0010");
+ // }
+ // //WMS回传仓库
+ // else if (node.GetAttribute("name") == "tc_dcf029")
+ // {
+ // node.SetAttribute("value", "B0010");
+ // }
+ // //库位
+ // else if (node.GetAttribute("name") == "tc_dcf030")
+ // {
+ // node.SetAttribute("value", "");
+ // }
+ // //WMS回传库位
+ // else if (node.GetAttribute("name") == "tc_dcf031")
+ // {
+ // node.SetAttribute("value", "CA-01-05");
+ // }
+ // //批号
+ // else if (node.GetAttribute("name") == "tc_dcf032")
+ // {
+ // node.SetAttribute("value", "20201120001");
+ // }
+ // //工单号
+ // else if (node.GetAttribute("name") == "tc_dcf033")
+ // {
+ // node.SetAttribute("value", "123");
+ // }
- }
- //调用方法
- var response = TipOut.intostore_post(doc.InnerXml);
- //处理调用后回传数据
- doc.LoadXml(response);
- //接口记录
- InterfaceLog inter = new InterfaceLog();
- inter.Initiator = "WMS";
- inter.recipient = "ERP";
- inter.Request = doc.InnerXml;
- inter.Method = "LK_InBack";
- inter.CreateTime = DateTime.Now;
- inter.CreateBy = "WMS";
- _unitWork.Add(inter);
-
- XmlElement element = (XmlElement)doc.SelectSingleNode("//Status");
- string code = element.GetAttribute("code");
- if (code == "0")
- {
- return "调用接口成功";
- }
- else
- {
- string description = element.GetAttribute("description");
- return description;
- }
- }
+ // }
+ // //调用方法
+ // var response = TipIn.intostore_post(doc.InnerXml);
+ // //处理调用后回传数据
+ // doc.LoadXml(response);
+ // //接口记录
+ // InterfaceLog inter = new InterfaceLog();
+ // inter.Initiator = "WMS";
+ // inter.recipient = "ERP";
+ // inter.Request = doc.InnerXml;
+ // inter.Method = "LK_InBack";
+ // inter.CreateTime = DateTime.Now;
+ // inter.CreateBy = "WMS";
+ // _unitWork.Add(inter);
+
+ // XmlElement element = (XmlElement)doc.SelectSingleNode("//Status");
+ // string code = element.GetAttribute("code");
+ // if (code == "0")
+ // {
+ // return "调用接口成功";
+ // }
+ // else
+ // {
+ // string description = element.GetAttribute("description");
+ // return description;
+ // }
+ //}
}
else
diff --git a/WebMvc/Areas/WebService/SampleService.cs b/WebMvc/Areas/WebService/SampleService.cs
index e3773ae..44f6728 100644
--- a/WebMvc/Areas/WebService/SampleService.cs
+++ b/WebMvc/Areas/WebService/SampleService.cs
@@ -90,25 +90,38 @@ namespace WebMvc.Areas.WebService
doc.LoadXml(Request);
string name = "";
string value = "";
+ string UpperTaskNo = "";
string SourceCode = "";
+ string TaskType = "";
+ string CustomerCode = "";
string MaterialCode = "";
string SupplierCode = "";
decimal? Num = 0;
string WareCell = "";
string Code = "";
var NewCode = "";
- XmlNodeList RecordSets = doc.SelectNodes("//RecordSet");
+ XmlNodeList RecordSets = doc.SelectNodes("//Record");
foreach (XmlNode RecordSet in RecordSets)
{
- XmlNodeList nodes = RecordSet.SelectNodes("//Field");
+ XmlNodeList nodes = RecordSet.ChildNodes;
foreach (XmlElement node in nodes)
{
//抓取单个的xml节点
//获得字节里面的属性值
name = node.GetAttribute("name");
value = node.GetAttribute("value");
+ //上游任务号
+ if (name == "tc_dcf000" && !string.IsNullOrEmpty(value))
+ {
+ UpperTaskNo = value;
+ }
+ //上游作业类型
+ else if (name == "tc_dcf001" && !string.IsNullOrEmpty(value))
+ {
+ TaskType = value;
+ }
//上游系统单号
- if (name == "tc_dcf003" && !string.IsNullOrEmpty(value))
+ else if (name == "tc_dcf003" && !string.IsNullOrEmpty(value))
{
SourceCode = value;
}
diff --git a/WebRepository/Domain/monitor/InterfaceLog.cs b/WebRepository/Domain/monitor/InterfaceLog.cs
index 941c2d3..887fcd4 100644
--- a/WebRepository/Domain/monitor/InterfaceLog.cs
+++ b/WebRepository/Domain/monitor/InterfaceLog.cs
@@ -14,44 +14,29 @@ namespace WebRepository
}
/// <summary>
- /// 接口类型:发送/接收
+ /// 状态
/// </summary>
- [Column("type")]
- public string Type { get; set; }
+ [Column("status")]
+ public string Status { get; set; }
/// <summary>
- /// 发起者
+ /// 唯一标识（上游任务号加上游系统单号）
/// </summary>
- [Column("Initiator")]
- public string Initiator { get; set; }
+ [Column("taskNo")]
+ public string TaskNo { get; set; }
/// <summary>
- ///接收者
+ ///任务总条数
/// </summary>
- [Column("recipient")]
- public string recipient { get; set; }
+ [Column("allNum")]
+ public string AllNum { get; set; }
/// <summary>
- /// 方法
+ /// 完成总条数
/// </summary>
- [Column("method")]
- public string Method { get; set; }
+ [Column("comNum")]
+ public string ComNum { get; set; }
/// <summary>
- /// 请求
+ /// 数据
/// </summary>
[Column("request")]
public string Request { get; set; }
- /// <summary>
- /// 响应
- /// </summary>
- [Column("response")]
- public string Response { get; set; }
- /// <summary>
- /// 结果
- /// </summary>
- [Column("result")]
- public string Result { get; set; }
- /// <summary>
- /// 日志时间
- /// </summary>
- [Column("logtime")]
- public System.DateTime? Logtime { get; set; }
}
}
\ No newline at end of file