From 075c8cfecc517dbb80a184933a79498ce2fcc617 Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期五, 16 八月 2024 08:38:18 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/StandardPda
---
MES.Service/service/GetErpParametersServer.cs | 57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/MES.Service/service/GetErpParametersServer.cs b/MES.Service/service/GetErpParametersServer.cs
index 4ffae67..0c7ab66 100644
--- a/MES.Service/service/GetErpParametersServer.cs
+++ b/MES.Service/service/GetErpParametersServer.cs
@@ -13,13 +13,16 @@
private readonly MesInvItemInCDetailsManager _invItemInCDetailsServer =
new();
+ private readonly MesInvItemOutsManager _invItemOutsServer =
+ new();
+
private readonly MessageCenterManager _messageCenterServer = new();
public List<MessageCenter> GetErpParameters(List<MessageCenter> data)
{
var centers = new List<MessageCenter>();
- //鑾峰彇绗竴涓姹�
+ //鑾峰彇涓昏姹�
var center = data.Find(p => p.Seq == 1);
//瑙ｆ瀽URL
@@ -28,32 +31,70 @@
//鎻愬彇鍙傛暟
var queryParameters = HttpUtility.ParseQueryString(queryString);
+ var strings = center.TableName.Split("_");
+
+ MessageCenter mesToErp = null;
+ var query = new WarehouseQuery();
switch (center.TableName)
{
//閲囪喘鍏ュ簱鍗曞鏍�
case "MES_INV_ITEM_INS_A":
//閲囪喘鍏ュ簱鍗曞弽瀹℃牳
case "MES_INV_ITEM_INS_B":
- var strings = center.TableName.Split("_");
- var query = new WarehouseQuery();
//鑾峰彇鍒扮被鍨嬶紙瀹℃牳杩樻槸鍙嶅鏍革級
query.Type = strings[^1];
+ //鑾峰彇url涓檮甯︾殑鍙傛暟
query.id = Convert.ToDecimal(queryParameters["id"]);
query.billNo = queryParameters["billNo"];
-
- var mesToErp = _invItemInCDetailsServer.MesToErpParam(query);
+ //閲嶆柊鑾峰彇璇锋眰鐨勬暟鎹�
+ mesToErp = _invItemInCDetailsServer.MesToErpParam(query);
+ //璧嬪�间富id
mesToErp.Id = center.Id;
centers.Add(mesToErp);
+ //鏇存柊鍓╀笅鐨勮姹傜殑鍙傛暟
var messageCenter = data[0];
- var json = new JObject();
- json.Add(new JProperty("id", query.id));
- json.Add(new JProperty("billNo", query.billNo));
+ var json = new JObject
+ {
+ new JProperty("id", query.id),
+ new JProperty("billNo", query.billNo)
+ };
messageCenter.Data = json.ToString();
centers.Add(messageCenter);
break;
+
+ //閲囪喘閫�鏂欏崟瀹℃牳
+ case "MES_INV_ITEM_OUTS_A":
+ //閲囪喘閫�鏂欏崟鍙嶅鏍�
+ case "MES_INV_ITEM_OUTS_B":
+
+ //鑾峰彇鍒扮被鍨嬶紙瀹℃牳杩樻槸鍙嶅鏍革級
+ query.Type = strings[^1];
+ query.id = Convert.ToDecimal(queryParameters["id"]);
+ query.billNo = queryParameters["itemOutNo"];
+
+ //閲嶆柊鑾峰彇璇锋眰鐨勬暟鎹�
+ mesToErp = _invItemOutsServer.MesToErpParam(query);
+ //鏇存涓轰富id
+ mesToErp.Id = center.Id;
+ //娣诲姞鍒拌姹傞泦鍚堜腑
+ centers.Add(mesToErp);
+
+ //鑾峰彇鍓╀綑鐨勮姹�
+ var find = data.FindAll(s => s.Seq != 1);
+ var result = new JObject
+ {
+ new JProperty("id", query.id),
+ new JProperty("billNo", query.billNo)
+ };
+ find.ForEach(s =>
+ {
+ s.Data = result.ToString();
+ centers.Add(s);
+ });
+ break;
default:
throw new Exception("鏃犳硶璇嗗埆TableName绫诲瀷");
}
--
Gitblit v1.9.3