From f0d620633b67d78c45d39ba3e91ba84c4fed0aa4 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 11 四月 2025 19:39:13 +0800
Subject: [PATCH] 优化了U9接口逻辑
---
Tiger.Business.WMS/ERP/U9C_WMS.cs | 123 ++++++++++++++++------------------------
1 files changed, 49 insertions(+), 74 deletions(-)
diff --git a/Tiger.Business.WMS/ERP/U9C_WMS.cs b/Tiger.Business.WMS/ERP/U9C_WMS.cs
index afe58ff..a61beaa 100644
--- a/Tiger.Business.WMS/ERP/U9C_WMS.cs
+++ b/Tiger.Business.WMS/ERP/U9C_WMS.cs
@@ -102,9 +102,10 @@
.GroupBy(x => new { x.DocNo })
.Select(x => new BIZ_U9_ASN
{
+ ID = x.Max(t => t.AsnId).ToString(),
+ AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE,
STATUS = BIZ_U9_ASN.STATUSs.Imported.GetValue(),
ORDER_NO = x.Key.DocNo,
- ID = x.Max(t => t.AsnId).ToString(),
SUPP_CODE = x.Max(t => t.SupplierCode),
SUPP_NAME = x.Max(t => t.SupplierName),
DELIVERY_DATE = x.Max(t => t.ShipDate),
@@ -114,9 +115,6 @@
CREATE_USER= UserCode,
UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
UPDATE_USER = UserCode,
- AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE,
- HANDLED=-1, //鏈鐞�
- HANDLED_DATE=DateTime.Now,
})
.ToList();
Logger.Scheduler.Info($"閫佽揣鍗曡〃澶翠俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{asns.Count}]");
@@ -313,20 +311,16 @@
.GroupBy(x => new { x.DocNo })
.Select(x => new BIZ_U9_RECEIPT
{
- STATUS = BIZ_U9_RECEIPT.STATUSs.Init.GetValue(),
+ AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE,
+ STATUS = BIZ_U9_RECEIPT.STATUSs.Imported.GetValue(),
ORDER_NO = x.Key.DocNo,
SUPP_CODE = x.Max(t => t.SupplierCode),
SUPP_NAME = x.Max(t => t.SupplierName),
ORDER_DATE = x.Max(t => t.ModifiedOn),
- //RECEIVER 鏀惰揣浜�
- //RECEIVE_DATE 鏀惰揣鏃ユ湡
CREATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),//--鏃堕棿涓嶆洿鏂�
CREATE_USER = UserCode,
UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
UPDATE_USER = UserCode,
- AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE,
- HANDLED = -1,
- HANDLED_DATE = DateTime.Now,
})
.ToList();
Logger.Scheduler.Info($"鏀惰揣鍗曡〃澶翠俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{result.Count}]");
@@ -403,8 +397,9 @@
.GroupBy(x => new { x.DocNo })
.Select(x => new BIZ_U9_RMA
{
- STATUS = BIZ_U9_RECEIPT.STATUSs.Init.GetValue(), //鐘舵��
+ AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE,
ORDER_NO = x.Key.DocNo, //鍗曞彿
+ STATUS = BIZ_U9_RECEIPT.STATUSs.Imported.GetValue(), //鐘舵��
SUPP_CODE = x.Max(t => t.SupplierCode), //渚涘簲鍟嗙紪鐮�
SUPP_NAME = x.Max(t => t.SupplierName),//渚涘簲鍟嗗悕绉�
ORDER_DATE = x.Max(t => t.ModifiedOn), //鍗曟嵁鏃ユ湡
@@ -412,10 +407,6 @@
CREATE_USER = UserCode,
UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
UPDATE_USER = UserCode,
- AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE,
- HANDLED = -1,
- HANDLED_DATE = DateTime.Now,
- GHOST_ROW = false,
})
.ToList();
Logger.Scheduler.Info($"閫�璐у崟琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{result.Count}]");
@@ -446,7 +437,7 @@
.WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
.ToStorage();
y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.SUPP_CODE, q.SUPP_NAME, q.ORDER_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, q.HANDLED, q.HANDLED_DATE, }).ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.SUPP_CODE, q.SUPP_NAME, q.ORDER_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
});
}
@@ -487,34 +478,30 @@
List<BIZ_U9_MISC_IN_DTL> resultDt = new();
if (list != null && list.Count > 0)
{
- result = list
- .GroupBy(x => new { x.DocNo })
- .Select(x => new BIZ_U9_MISC_IN
+ result = list.Select(x => new BIZ_U9_MISC_IN
{
- ORDER_NO = x.Key.DocNo, //鍗曟嵁鍙�
- STATUS = BIZ_U9_MISC_IN.STATUSs.Init.GetValue(), //鐘舵��
- TYPE_CODE =x.Max(t =>t.MiscRcvDocType), //鍗曟嵁绫诲瀷缂栫爜
- TYPE_NAME= x.Max(t => t.MiscRcvDocTypeName), //鍗曟嵁绫诲瀷鍚嶇О
- ERP_STATUS_CODE = x.Max(t => t.Status).ToString(), // ERP鍗曟嵁鐘舵��
- ERP_STATUS_NAME = x.Max(t => t.StatusName), // ERP鍗曟嵁鐘舵�佸悕绉�
- ORDER_DATE = x.Max(t => t.ModifiedOn), //鍗曟嵁鏃ユ湡
- CREATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),//--鏃堕棿涓嶆洿鏂�
- // RECEIVER 鏀惰揣浜�
- //RECEIVE_DATE 鏀惰揣鏃ユ湡
- AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE, //缁勭粐
+ ID = x.MiscRcvTransID.ToString(),
+ AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Org.ToString())?.ORG_CODE, //缁勭粐
+ ORDER_NO = x.DocNo, //鍗曟嵁鍙�
+ STATUS = BIZ_U9_MISC_IN.STATUSs.Imported.GetValue(), //鐘舵��
+ TYPE_CODE =x.MiscRcvDocType, //鍗曟嵁绫诲瀷缂栫爜
+ TYPE_NAME= x.MiscRcvDocTypeName, //鍗曟嵁绫诲瀷鍚嶇О
+ ERP_STATUS_CODE = x.Status.ToString(), // ERP鍗曟嵁鐘舵��
+ ERP_STATUS_NAME = x.StatusName, // ERP鍗曟嵁鐘舵�佸悕绉�
+ ORDER_DATE = x.BusinessDate, //鍗曟嵁鏃ユ湡
+ CREATE_TIME = x.ModifiedOn,//--鏃堕棿涓嶆洿鏂�
CREATE_USER = UserCode,
- UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
+ UPDATE_TIME = x.ModifiedOn,
UPDATE_USER = UserCode,
- HANDLED = -1, //-1:鏈鐞嗭紝0:鍚屾澶勭悊瀹岋紝>0:鍚屾澶勭悊澶辫触娆℃暟
- HANDLED_DATE = DateTime.Now, //鏈�鍚庝竴娆″悓姝ュ鐞嗘棩鏈�
- })
- .ToList();
+ }).ToList();
Logger.Scheduler.Info($"鏉傛敹鍗曟嵁琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{result.Count}]");
foreach (var item in listLine)
{
- var org = db.Queryable<mes_MiscRcvTrans>().Where(x => x.MiscRcvTransID == listLine.First().MiscRcvTransID).First();
+ var order = result.Where(x => x.ID == item.MiscRcvTransID.ToString()).First();
BIZ_U9_MISC_IN_DTL info = new()
{
+ ID = item.MiscRcvTransLineID.ToString(),
+ AUTH_ORG = order.AUTH_ORG, //缁勭粐
ORDER_NO = item.DocNo, //鍗曟嵁鍙�
LINE_NO = item.DocLineNo.ToString(), //鍗曟嵁琛屽彿
STATUS = BIZ_U9_MISC_IN.STATUSs.Imported.GetValue(), //鐘舵��
@@ -522,17 +509,16 @@
UNIT = item.StoreUOM,// UNIT 鍗曚綅
QTY = item.StoreUOMQty,//QTY 鍗曟嵁鏁伴噺
UNIT_COST = item. CostUOM, // 鎴愭湰鍗曚綅
- QTY_GIFT = item.CostUOMQty, // 鎴愭湰鏁伴噺
+ QTY_COST = item.CostUOMQty, // 鎴愭湰鏁伴噺
COST_PRICE =item.CostPrice, // 鍗曚环
COST_MNY = item.CostMny, // 鎴愭湰
WH_CODE = item.WhCode,// 瀛樺偍鍦扮偣
WH_NAME = item.WhName, // 瀛樺偍鍦扮偣鍚嶇О
BNF_DEPT_CODE = item.BenefitDept,// 鍙楃泭閮ㄩ棬缂栫爜
BNF_DEPT_NAME = item.BenefitDeptName, // 鏀剁泭閮ㄩ棬鍚嶇О
- // ERP_CODE ERP缂栫爜
+ ERP_CODE = item.SapCode, //ERP缂栫爜
RETURN_REASON = item.ReturnStorageReason,// 閫�鏂欏師鍥�
INSTORE_REASON = item.InStorageReason, // INSTORE_REASON 鍏ュ簱鍘熷洜
- AUTH_ORG = orgs.FirstOrDefault(q => q.ID == org.Org.ToString())?.ORG_CODE, //缁勭粐
CREATE_TIME = item.ModifiedOn,//--鏃堕棿涓嶆洿鏂�
CREATE_USER = UserCode,
UPDATE_TIME = item.ModifiedOn,
@@ -550,7 +536,7 @@
.WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
.ToStorage();
y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.TYPE_CODE, q.TYPE_NAME, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.ORDER_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, q.HANDLED, q.HANDLED_DATE, }).ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.TYPE_CODE, q.TYPE_NAME, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.ORDER_DATE, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
});
}
@@ -562,7 +548,7 @@
.WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW })
.ToStorage();
y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.LINE_NO, q.STATUS, q.ITEM_CODE, q.UNIT, q.QTY, q.UNIT_COST, q.QTY_GIFT, q.COST_PRICE, q.COST_MNY, q.WH_CODE, q.WH_NAME, q.BNF_DEPT_CODE, q.BNF_DEPT_NAME, q.RETURN_REASON, q.INSTORE_REASON, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
+ y.AsUpdateable.UpdateColumns(q => new { q.ITEM_CODE, q.UNIT, q.QTY, q.UNIT_COST, q.QTY_COST, q.COST_PRICE, q.COST_MNY, q.WH_CODE, q.WH_NAME, q.BNF_DEPT_CODE, q.BNF_DEPT_NAME, q.ERP_CODE, q.RETURN_REASON, q.INSTORE_REASON, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
});
}
Logger.Scheduler.Info($"鏉傛敹鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]");
@@ -590,57 +576,46 @@
List<BIZ_U9_MISC_OUT_DTL> resultDt = new();
if (list != null && list.Count > 0)
{
- result = list
- .GroupBy(x => new { x.DocNo })
- .Select(x => new BIZ_U9_MISC_OUT
+ result = list.Select(x => new BIZ_U9_MISC_OUT
{
- ORDER_NO = x.Key.DocNo, //鍗曟嵁鍙�
+ ID = x.MiscShipID.ToString(),
+ AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Org.ToString())?.ORG_CODE, //缁勭粐
+ ORDER_NO = x.DocNo, //鍗曟嵁鍙�
STATUS = BIZ_U9_MISC_OUT.STATUSs.Init.GetValue(), //鐘舵��
- TYPE_CODE = x.Max(t => t.MiscShipDocType), //鍗曟嵁绫诲瀷缂栫爜
- TYPE_NAME = x.Max(t => t.MiscShipDocTypeName), //鍗曟嵁绫诲瀷鍚嶇О
- ERP_STATUS_CODE = x.Max(t => t.Status).ToString(), // ERP鍗曟嵁鐘舵��
- ERP_STATUS_NAME = x.Max(t => t.StatusName), // ERP鍗曟嵁鐘舵�佸悕绉�
- ORDER_DATE = x.Max(t => t.BusinessDate), //鍗曟嵁鏃ユ湡
- /* PREP_PERSON //澶囨枡浜�
- FINISH_TIME //澶囨枡瀹屾垚鏃堕棿
- REQ_PERSON //棰嗘枡浜�
- REQ_DEPT //棰嗘枡閮ㄩ棬
- DLVY_TIME //鍑哄簱鏃堕棿*/
- CREATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),//--鏃堕棿涓嶆洿鏂�
- AUTH_ORG = orgs.FirstOrDefault(q => q.ID == x.Max(t => t.Org).ToString())?.ORG_CODE, //缁勭粐
+ TYPE_CODE = x.MiscShipDocType, //鍗曟嵁绫诲瀷缂栫爜
+ TYPE_NAME = x.MiscShipDocTypeName, //鍗曟嵁绫诲瀷鍚嶇О
+ ERP_STATUS_CODE = x.Status.ToString(), // ERP鍗曟嵁鐘舵��
+ ERP_STATUS_NAME = x.StatusName, // ERP鍗曟嵁鐘舵�佸悕绉�
+ ORDER_DATE = x.BusinessDate, //鍗曟嵁鏃ユ湡
+ CREATE_TIME = x.ModifiedOn,//--鏃堕棿涓嶆洿鏂�
CREATE_USER = UserCode,
- UPDATE_TIME = x.Max(t => t.ModifiedOn).ToDateTime(),
+ UPDATE_TIME = x.ModifiedOn,
UPDATE_USER = UserCode,
- HANDLED = -1, //-1:鏈鐞嗭紝0:鍚屾澶勭悊瀹岋紝>0:鍚屾澶勭悊澶辫触娆℃暟
- HANDLED_DATE = DateTime.Now, //鏈�鍚庝竴娆″悓姝ュ鐞嗘棩鏈�
- // COMMIT_JSON 杩囪处鎻愪氦鐨凧SON
- //COMMIT_MSG 杩囪处鎻愪氦鐨勮繑鍥炰俊鎭�
- })
- .ToList();
+ }).ToList();
Logger.Scheduler.Info($"鏉傚彂鍗曟嵁琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{result.Count}]");
foreach (var item in listLine)
{
- var org = db.Queryable<mes_MiscShip>().Where(x => x.MiscShipID == listLine.First().MiscShipID).First();
+ var order = result.Where(x => x.ID == item.MiscShipID.ToString()).First();
BIZ_U9_MISC_OUT_DTL info = new()
{
+ ID = item.MiscShipLineID.ToString(),
+ AUTH_ORG = order.AUTH_ORG, //缁勭粐
ORDER_NO = item.DocNo, //鍗曟嵁鍙�
LINE_NO = item.DocLineNo.ToString(), //鍗曟嵁琛屽彿
- STATUS = BIZ_U9_RMA.STATUSs.Imported.GetValue(), //鐘舵��
+ STATUS = BIZ_U9_MISC_OUT.STATUSs.Init.GetValue(), //鐘舵��
ITEM_CODE = item.ItemCode, //鐗╂枡缂栫爜
- UNIT =item.StoreUOM,// UNIT 鍗曚綅
- QTY = item.StoreUOMQty,//QTY 鍗曟嵁鏁伴噺
+ UNIT = item.StoreUOM,// UNIT 鍗曚綅
+ QTY = item.StoreUOMQty,//QTY 鍗曟嵁鏁伴噺
UNIT_COST = item.CostUOM, // 鎴愭湰鍗曚綅
- QTY_GIFT = item.CostUOMQty, // 鎴愭湰鏁伴噺
+ QTY_COST = item.CostUOMQty, // 鎴愭湰鏁伴噺
COST_PRICE = item.CostPrice, // 鍗曚环
COST_MNY = item.CostMny, // 鎴愭湰
WH_CODE = item.WhCode,// 瀛樺偍鍦扮偣
WH_NAME = item.WhName, // 瀛樺偍鍦扮偣鍚嶇О
BNF_DEPT_CODE = item.BenefitDept,// 鍙楃泭閮ㄩ棬缂栫爜
BNF_DEPT_NAME = item.BenefitDeptName, // 鏀剁泭閮ㄩ棬鍚嶇О
- // ERP_CODE ERP缂栫爜
+ ERP_CODE = item.SapCode, //ERP缂栫爜
OUTSTORE_REASON = item.OutStorageReason, // OUTSTORE_REASON 鍑哄簱鍘熷洜
-
- AUTH_ORG = orgs.FirstOrDefault(q => q.ID == org.Org.ToString())?.ORG_CODE, //缁勭粐
CREATE_TIME = item.ModifiedOn,//--鏃堕棿涓嶆洿鏂�
CREATE_USER = UserCode,
UPDATE_TIME = item.ModifiedOn,
@@ -658,7 +633,7 @@
.WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
.ToStorage();
y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.TYPE_CODE, q.TYPE_NAME, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.ORDER_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, q.HANDLED, q.HANDLED_DATE, }).ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.TYPE_CODE, q.TYPE_NAME, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.ORDER_DATE, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
});
}
@@ -670,7 +645,7 @@
.WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW })
.ToStorage();
y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.LINE_NO, q.STATUS, q.ITEM_CODE, q.UNIT, q.QTY, q.UNIT_COST, q.QTY_GIFT, q.COST_PRICE, q.COST_MNY, q.WH_CODE, q.WH_NAME, q.BNF_DEPT_CODE, q.BNF_DEPT_NAME, q.OUTSTORE_REASON, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
+ y.AsUpdateable.UpdateColumns(q => new { q.ITEM_CODE, q.UNIT, q.QTY, q.UNIT_COST, q.QTY_COST, q.COST_PRICE, q.COST_MNY, q.WH_CODE, q.WH_NAME, q.BNF_DEPT_CODE, q.BNF_DEPT_NAME, q.ERP_CODE, q.OUTSTORE_REASON, q.AUTH_ORG, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
});
}
Logger.Scheduler.Info($"鏉傚彂鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]");
--
Gitblit v1.9.3