From 415c17f207966603c4c60c408f0e0bfdc3763ca7 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期日, 04 二月 2024 16:07:23 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
index c5f314f..8511af4 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -612,6 +612,9 @@
#endregion
var modelList = new List<BllBoxInfo>();
+
+ var addLotNo = "";
+
if (packLevel == 1)
{
#region 涓�绾у寘瑁�
@@ -690,9 +693,10 @@
}
}
+ addLotNo = maxLotNoStr;
#endregion
-
+
for (int i = 1; i <= labelNum; i++)
{
@@ -836,9 +840,10 @@
}
}
+ addLotNo = maxCodestr2;
#endregion
-
+
for (int i = 1; i <= labelNum2; i++)//绠辩爜鏍囩
{
@@ -954,7 +959,20 @@
#endregion
}
-
+ if (string.IsNullOrWhiteSpace(asnList.LotNo))
+ {
+ asnList.LotNo = addLotNo;
+ Db.Updateable(asnList).ExecuteCommand();
+ }
+ else
+ {
+ if (!asnList.LotNo.Contains(addLotNo))
+ {
+ asnList.LotNo += ";" + addLotNo;
+ Db.Updateable(asnList).ExecuteCommand();
+ }
+ }
+
return modelList;
--
Gitblit v1.8.0