From 171197ee085860f047e4a4191e5c232f9ef60a25 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 10 四月 2025 10:30:00 +0800
Subject: [PATCH] 优化了一些已知问题

---
 Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 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 864eb8d..b874e7a 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
@@ -11,6 +11,7 @@
 using Tiger.IBusiness;
 using Tiger.Model.MES.Yada;
 using Tiger.Model.Entitys.MES.U9C;
+using Microsoft.Scripting.Utils;
 
 namespace Tiger.Business.WMS.Transaction
 {
@@ -513,7 +514,7 @@
                 }
 
                 //鏇存柊搴撳瓨琛ㄤ俊鎭�
-                var items = MainDB.Queryable<WMS_ITEM>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && s.ORDER_NO == order.ORDER_NO).Any()).ToList();
+                var items = MainDB.Queryable<WMS_ITEM>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && s.ORDER_NO == order.ORDER_NO && finishNotSubmit.Select(d => d.LINE_NO).Contains(s.LINE_NO)).Any()).ToList();
                 var historys = new List<WMS_ITEM_HIS>();
                 foreach (var item in items)
                 {
@@ -525,9 +526,9 @@
                     item.TRANS_CODE = nameof(BIZ_U9_RECEIPT);
                     item.TRANS_NO = receipt.ORDER_NO;
                     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}]锛屽緟妫�楠屽畬鎴愬悗鍙叆搴�"));
+                    historys.Add(new WMS_ITEM_HIS(item, @$"閫佽揣鍗昜{order.ORDER_NO}]鐨勬潯鐮乕{item.SN}]鐢熸垚鏀惰揣鍗昜{receipt.ORDER_NO}]锛屽緟妫�楠屽畬鎴愬悗鍙叆搴�"));
                 }
-                var pkgs = MainDB.Queryable<WMS_ITEM_PKG>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && s.ORDER_NO == order.ORDER_NO).Any()).ToList();
+                var pkgs = MainDB.Queryable<WMS_ITEM_PKG>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && s.ORDER_NO == order.ORDER_NO && finishNotSubmit.Select(d => d.LINE_NO).Contains(s.LINE_NO)).Any()).ToList();
                 foreach (var item in pkgs)
                 {
                     item.AUTH_ORG = receipt.AUTH_ORG;
@@ -552,8 +553,8 @@
                     db.Updateable(items, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG, q.STATUS, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SOURCE_CODE, q.SOURCE_ORDER, q.SOURCE_LINE }).ExecuteCommand();
                     db.Updateable(pkgs, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG, 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.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.Updateable(finishNotSubmit, 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.Updateable(order, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.RECEIVER, q.RECEIVE_DATE }).ExecuteCommand();
+                    db.Updateable(finishNotSubmit, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.RECEIVER, q.RECEIVE_DATE, q.RECEIVER_ID, q.RECEIVER_NO, q.RECEIVER_LINE }).ExecuteCommand();
                     db.Insertable(receipt, UserCode).ExecuteCommand();
                     db.Insertable(receipt.Details, UserCode).ExecuteCommand();
                     db.Insertable(receipt.SnList, UserCode).ExecuteCommand();

--
Gitblit v1.9.3