From 43b2af8956d54dc3a53f211c53d8af582806b6ba Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 08 四月 2025 11:18:58 +0800
Subject: [PATCH] 备料任务合并发料只适用于包装车间工单发料 备料任务增加根据发料类型，调用相应发料单据的ERP接口
---
Tiger.Business.WMS/ERP/U9C_WMS.cs | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/Tiger.Business.WMS/ERP/U9C_WMS.cs b/Tiger.Business.WMS/ERP/U9C_WMS.cs
index 1c9ac2e..afe58ff 100644
--- a/Tiger.Business.WMS/ERP/U9C_WMS.cs
+++ b/Tiger.Business.WMS/ERP/U9C_WMS.cs
@@ -185,6 +185,7 @@
TRANS_CODE = nameof(BIZ_U9_ASN),
TRANS_NO = info.ORDER_NO,
TRANS_LINE = info.LINE_NO,
+ LOTNO = barcode.LotNo,
SUPP_CODE = dtl.SUPP_CODE,
SUPP_LOTNO = dtl.SUPP_LOTNO,
};
@@ -207,6 +208,7 @@
TRANS_CODE = nameof(BIZ_U9_ASN),
TRANS_NO = info.ORDER_NO,
TRANS_LINE = info.LINE_NO,
+ LOTNO = barcode.LotNo,
SUPP_CODE = dtl.SUPP_CODE,
SUPP_LOTNO = dtl.SUPP_LOTNO,
};
@@ -809,7 +811,7 @@
.GroupBy(x => new { x.DocNo })
.Select(x => new BIZ_WMS_TRANSFER
{
- ORDER_NO = x.Key.DocNo, //鍗曟嵁鍙�
+ ORDER_NO = x.Key.DocNo, //璋冩嫧鍗曞彿
ORDER_DATE = x.Max(t => t.BusinessDate), //鍗曟嵁鏃ユ湡
STATUS = BIZ_WMS_TRANSFER.STATUSs.Init.GetValue(), //鐘舵��
//OUT_WH_CODE 璋冨嚭浠撳簱
@@ -847,14 +849,14 @@
IN_WH_CODE = item.TransInWhCode, // 鎷ㄥ叆浠撳簱
OUT_LOTNO = item.LotCode,// 璋冨嚭鎵规 -- 鎵规
IN_LOTNO = item.LotCode, // 鎷ㄥ叆鎵规 -- 鎵规
- //SOURCE_CODE = item.BenefitDept,// 鏉ユ簮鍗曟嵁缂栫爜锛屽涓敤鈥�,鈥濆垎闅�
- //SOURCE_ORDER = item.BenefitDeptName, // 鏉ユ簮鍗曡鍙凤紝澶氫釜鐢ㄢ��,鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲
- //SOURCE_LINE = item.ReturnStorageReason,//
+ //SOURCE_CODE = item.BenefitDept,// 鏉ユ簮鍗曟嵁缂栫爜
+ SOURCE_ORDER = item.TransferInId.ToString(), // 鏉ユ簮鍗曡鍙�-- 鍗曞ごID
+ SOURCE_LINE = item.DocLineNo.ToString(),// 鏉ユ簮鍗曡鍙� ---琛屽彿
// ERP_ORDER = item.InStorageReason, // ERP鍗曟嵁鍙风爜
- //REMARK 澶囨敞
+ //REMARK 澶囨敞
AUTH_ORG = orgs.FirstOrDefault(q => q.ID == org.Org.ToString())?.ORG_CODE, //缁勭粐
- CREATE_TIME = item.ModifiedOn,//--鏃堕棿涓嶆洿鏂�
- CREATE_USER = UserCode,
+ CREATE_TIME = item.CreatedOn,//--鏃堕棿涓嶆洿鏂�
+ CREATE_USER = item.CreatedBy,
UPDATE_TIME = item.ModifiedOn,
UPDATE_USER = UserCode,
};
@@ -870,7 +872,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.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.ORDER_NO, q.ORDER_DATE, q.STATUS,q.SOURCE_CODE,q.SOURCE_ORDER,q.HANDLED,q.HANDLED_DATE, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER,}).ExecuteCommand();
});
}
@@ -882,7 +884,7 @@
.WhereColumns(t => new { t.ORDER_NO, t.ORDER_LINE, t.GHOST_ROW })
.ToStorage();
y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.ORDER_LINE, q.STATUS, q.ITEM_CODE, q.UNIT, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
+ y.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.ORDER_LINE, q.STATUS, q.ITEM_CODE, q.UNIT, q.QTY_REQ,q.QTY_OUT,q.OUT_WH_CODE,q.IN_WH_CODE,q.OUT_LOTNO,q.IN_LOTNO, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
});
}
Logger.Scheduler.Info($"璋冩嫧鍗曟嵁琛ㄥご淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{resultDt.Count}]");
--
Gitblit v1.9.3