From de56e91fc4891d15965c7a14256236cbbe32cd65 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 18 三月 2025 14:29:32 +0800
Subject: [PATCH] 优化了一些已知问题

---
 Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs |   30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs b/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
index f00575a..d0a07e3 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
@@ -258,7 +258,9 @@
                 //鎵ц娓呯偣鏁版嵁澶勭悊
                 CurSn.STATUS = WMS_ITEM.STATUSs.Counted.GetValue();
                 CurSn.QTY = CurInvItem.Items.Sum(q => q.QTY);
-				foreach (var item in CurInvItem.Items)
+                CurSn.RECEIVER = UserCode;
+                CurSn.RECEIVE_DATE = DateTime.Now;
+                foreach (var item in CurInvItem.Items)
 				{
 					item.AUTH_ORG = CurSn.AUTH_ORG;
 					item.STATUS = WMS_ITEM.STATUSs.Counted.GetValue();
@@ -347,6 +349,8 @@
 				foreach (var sn in ScanList)
 				{
 					sn.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
+                    sn.RECEIVER = null;
+                    sn.RECEIVE_DATE = DateTime.MinValue;
 				}
 
 				var historys = new List<WMS_ITEM_HIS>();
@@ -415,7 +419,9 @@
 				var dbTran = db.UseTran(() =>
 				{
 					db.Updateable<BIZ_U9_ASN_SN>(UserCode).SetColumns(q => q.STATUS == WMS_ITEM.STATUSs.Incoming.GetValue())
-						   .Where(q => q.SN == input.SN).ExecuteCommand();
+                        .SetColumns(q => q.RECEIVER == null)
+                        .SetColumns(q => q.RECEIVE_DATE == DateTime.MinValue)
+                        .Where(q => q.SN == input.SN).ExecuteCommand();
 					db.Updateable(item, UserCode).ExecuteCommand();
 					db.Insertable(new WMS_ITEM_HIS(item, $"鏉$爜[{item.SN}]鍙栨秷娓呯偣锛屾搷浣滃崟鎹甗{order}]"), UserCode).ExecuteCommand();
 				});
@@ -439,7 +445,7 @@
 		}
 
 		/// <summary>
-		///  鑾峰彇鏈宸叉竻鐐圭殑鐗╂枡鍒楄〃锛堝甫鍒嗛〉锛�
+		///  鑾峰彇鏈宸叉竻鐐圭殑鐗╂枡鍒楄〃
 		/// </summary>
 		/// <returns></returns>
 		public async Task<PageAble<BIZ_U9_ASN_SN>> GetScannedList()
@@ -566,7 +572,8 @@
 
 				if (list != null && list.Count > 0)
 				{
-					receipt.AUTH_ORG = order.AUTH_ORG;
+                    receipt.ID = list.First().RcvId.ToString();
+                    receipt.AUTH_ORG = order.AUTH_ORG;
 					receipt.STATUS = BIZ_U9_RECEIPT.STATUSs.InQC.GetValue();
 					receipt.ORDER_NO = list.First().DocNo;
 					receipt.SUPP_CODE = list.First().SupplierCode;
@@ -584,6 +591,7 @@
 						var asnDtl = order.Details.First(q => q.ID == item.SrcASNDocLineId.ToString());
 						BIZ_U9_RECEIPT_DTL receiptDt = new()
 						{
+                            ID = item.RcvLineId.ToString(),
                             AUTH_ORG = receipt.AUTH_ORG,
                             STATUS = BIZ_U9_RECEIPT.STATUSs.InQC.GetValue(),
 							ORDER_NO = item.DocNo,
@@ -638,14 +646,20 @@
 					item.TRANS_LINE = receipt.SnList.First(q => q.SN == item.SN).LINE_NO;
 					historys.Add(new WMS_ITEM_HIS(item, $"閫佽揣鍗昜{order.ORDER_NO}]鐨勬潯鐮乕{item.SN}]鐢熸垚鏀惰揣鍗昜{receipt.ORDER_NO}]锛屽緟妫�楠屽畬鎴愬悗鍙叆搴�"));
 				}
+                order.STATUS = BIZ_U9_ASN.STATUSs.Finished.GetValue();
+                order.RECEIVER_ID = receipt.ID;
+                order.RECEIVER_NO = receipt.ORDER_NO;
+                order.RECEIVER = UserCode;
+                order.RECEIVE_DATE = DateTime.Now;
 
-				//浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
-				var db = GetCommitDB();
+                //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
+                var db = GetCommitDB();
 				var dbTran = db.UseTran(() =>
 				{
-					db.Updateable(items, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SOURCE_CODE, q.SOURCE_ORDER, q.SOURCE_LINE }).ExecuteCommandAsync();
+					db.Updateable(items, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SOURCE_CODE, q.SOURCE_ORDER, q.SOURCE_LINE }).ExecuteCommand();
 					db.Insertable(historys, UserCode).ExecuteCommand();
-					db.Insertable(receipt, UserCode).ExecuteCommand();
+                    db.Updateable(order, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.RECEIVER, q.RECEIVE_DATE, q.RECEIVER_ID, q.RECEIVER_NO }).ExecuteCommand();
+                    db.Insertable(receipt, UserCode).ExecuteCommand();
 					db.Insertable(receipt.Details, UserCode).ExecuteCommand();
 					db.Insertable(receipt.SnList, UserCode).ExecuteCommand();
 				});

--
Gitblit v1.9.3