From e070b26178e324ea7afecccb4c5ff41f96d2dd8d Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 26 三月 2025 18:25:16 +0800
Subject: [PATCH] 一些更改

---
 Tiger.Business.WMS/ERP/U9C_WMS.cs |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Tiger.Business.WMS/ERP/U9C_WMS.cs b/Tiger.Business.WMS/ERP/U9C_WMS.cs
index 615619f..9563e70 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,
@@ -333,7 +336,7 @@
                         ORDER_NO = item.DocNo,  //鍗曟嵁鍙�
                         LINE_NO = item.DocLineNo.ToString(), //鍗曟嵁琛屽彿
                         ITEM_CODE = item.ItemCode, //鐗╂枡缂栫爜
-                        QTY = item.RtnFillQtyTU.ToDouble(), // mes鍗曟嵁鏁伴噺 --U9閫�琛ユ暟閲�
+                        QTY = item.EyeballingQtyTU.ToDouble(), // mes鍗曟嵁鏁伴噺 --U9閫�琛ユ暟閲�
                         AUTH_ORG = orgs.FirstOrDefault(q => q.ID == item.Org.ToString())?.ORG_CODE,  //鐢熶骇鍗曞厓鎺堟潈鏍囪瘑瀛楃
                         CREATE_TIME = item.ModifiedOn,//--鏃堕棿涓嶆洿鏂�
                         CREATE_USER = UserCode,

--
Gitblit v1.9.3