From e0fb9542b07f82b55245cf21e960d37fbab5206f Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期日, 04 二月 2024 14:48:30 +0800
Subject: [PATCH] 修改生成标签时在入库单中添加对应批次
---
HTML/views/ASNSetting/LabelBoxBuDa.html | 2 +-
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs | 24 +++++++++++++++++++++---
2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/HTML/views/ASNSetting/LabelBoxBuDa.html b/HTML/views/ASNSetting/LabelBoxBuDa.html
index f4f3fc4..2458c99 100644
--- a/HTML/views/ASNSetting/LabelBoxBuDa.html
+++ b/HTML/views/ASNSetting/LabelBoxBuDa.html
@@ -52,7 +52,7 @@
<body>
<div style="width:100%;">
<div class="layui-form hideCls" lay-filter="layuiadmin-app-form-list" id="print" style="width: 100%;height:100%;">
- <div style="display: flex;align-items: center;height: 260px;margin-left: 10px;">
+ <div style="display: flex;align-items: center;justify-content: center; height: 260px;">
<table border="1" id="table" style="width: 90%; height:240px; text-align: center;border-collapse: collapse;table-layout: fixed;">
<tr>
<td colspan="2">
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