From d6afabe5093b6ca9f5f7ff783a2ee7008e4a7d00 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期一, 23 六月 2025 17:27:24 +0800
Subject: [PATCH] 修改编辑入库单,批次信息不更新问题。解决物料标签排序问题。

---
 Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs    |    2 +-
 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 7aca437..e0381b5 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -701,6 +701,7 @@
                                              && it.IsBelt == detailModel.IsBelt
                                              && it.Lot1 == detailModel.Lot1                                 // 鐢熶骇鏃ユ湡
                                              && it.Lot2 == detailModel.Lot2                                 // 杩囨湡鏃ユ湡
+                                             && it.BoxCodeStr == detailModel.BoxCodeStr
                                              && it.UDF1 == detailModel.UDF1
                                              && it.UDF2 == detailModel.UDF2
                                              && it.UDF3 == detailModel.UDF3
@@ -735,6 +736,7 @@
                             dbDetail.IsBale = detailModel.IsBale;
                             dbDetail.Lot1 = detailModel.Lot1;
                             dbDetail.Lot2 = detailModel.Lot2;
+                            dbDetail.BoxCodeStr = detailModel.BoxCodeStr;
                             dbDetail.UDF1 = detailModel.UDF1;
                             dbDetail.UDF2 = detailModel.UDF2;
                             dbDetail.UDF3 = detailModel.UDF3;
diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
index 57e902e..e57b70b 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -514,7 +514,7 @@
                         CreateTime = a.CreateTime,
                         UpdateTime = a.UpdateTime
 
-                    }).OrderByDescending(a => a.CreateTime).OrderBy(a => a.BoxNo).ToOffsetPage(model.Page, model.Limit, ref total);
+                    }).OrderByDescending(a => a.ASNNo).OrderBy(a => a.BoxNo).ToOffsetPage(model.Page, model.Limit, ref total);
                 count = total;
                 return data;
             }

--
Gitblit v1.8.0