From e163a27328c805ffec7c894259430f76f0881d00 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 03 四月 2025 23:12:23 +0800
Subject: [PATCH] 更新收货单提交按行提交已完成清点的行，上架增加IQC审核的判断
---
Tiger.Business.WMS/ERP/U9C_WMS.cs | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Tiger.Business.WMS/ERP/U9C_WMS.cs b/Tiger.Business.WMS/ERP/U9C_WMS.cs
index f56435b..28f4a1d 100644
--- a/Tiger.Business.WMS/ERP/U9C_WMS.cs
+++ b/Tiger.Business.WMS/ERP/U9C_WMS.cs
@@ -9,6 +9,7 @@
using Tiger.IBusiness;
using SqlSugar;
using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
+using Tiger.Model.Entitys.MES.U9C;
namespace Tiger.Business.WMS
{
@@ -132,7 +133,7 @@
QTY = dtl.ShipQtyTU.ToDouble(),
PO_QTY = dtl.POQtyTU,
SUPP_CODE = dtl.SupplierCode,
- SUPP_LOTNO = dtl.SupplierLot,
+ SUPP_LOTNO = dtl.LotMater,
LOTNO = dtl.LotMater,
AUTH_ORG = orgs.FirstOrDefault(q => q.ID == dtl.Org.ToString())?.ORG_CODE,
CREATE_TIME = dtl.ModifiedOn,//--鏃堕棿涓嶆洿鏂�
@@ -146,10 +147,12 @@
foreach (var asn in asns)
{
var snlist = db.Queryable<mes_MaterialBarCode>().Where(x => x.Segment1 == asn.ORDER_NO || x.Segment2 == asn.ORDER_NO).ToList();
+
foreach (var sn in snlist)
{
var barcode = new Barcode(sn.Code);
var dtl = dtls.First(q => q.LINE_NO == barcode.OrderLine);
+ var asnDtl = list.First(q => q.DocLineNo.ToString() == barcode.OrderLine);
BIZ_U9_ASN_SN info = new()
{
AUTH_ORG = asn.AUTH_ORG,
@@ -177,7 +180,7 @@
AUTH_ORG = asn.AUTH_ORG,
STATUS = WMS_ITEM.STATUSs.Incoming.GetValue(),
QTY = sn.WhQty,
- PROD_DATE = barcode.ProdDate ?? DateTime.Now,
+ PROD_DATE = barcode.ProdDate ?? BarcodeAnalysis.GetDateTime(asnDtl.SupplierLot) ??DateTime.Now,
UNIT = barcode.Unit,
TRANS_CODE = nameof(BIZ_U9_ASN),
TRANS_NO = info.ORDER_NO,
@@ -337,8 +340,10 @@
AUTH_ORG = orgs.FirstOrDefault(q => q.ID == item.Org.ToString())?.ORG_CODE, //鐢熶骇鍗曞厓鎺堟潈鏍囪瘑瀛楃
CREATE_TIME = item.ModifiedOn,//--鏃堕棿涓嶆洿鏂�
CREATE_USER = UserCode,
- UPDATE_TIME = item.ModifiedOn,
- UPDATE_USER = UserCode
+ UPDATE_TIME = item.ModifiedOn,
+ UPDATE_USER = UserCode,
+ ERP_STATUS_CODE = item.Status.ToString(),
+ ERP_STATUS_NAME = item.StatusName,
};
resultDt.Add(info);
}
@@ -364,7 +369,7 @@
.WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW })
.ToStorage();
y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.LINE_NO, q.ITEM_CODE, q.QTY, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_USER, q.UPDATE_TIME }).ExecuteCommand();
+ y.AsUpdateable.UpdateColumns(q => new { q.STATUS, q.ORDER_NO, q.LINE_NO, q.ITEM_CODE, q.QTY, q.AUTH_ORG, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME, q.CREATE_USER, q.CREATE_TIME, q.UPDATE_USER, q.UPDATE_TIME }).ExecuteCommand();
});
}
Logger.Scheduler.Info($"鏀惰揣鍗曡〃澶翠俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{resultDt.Count}]");
--
Gitblit v1.9.3