From af583e3044e03325d8fdbc08164e8de3a0021792 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 17 六月 2025 15:24:56 +0800
Subject: [PATCH] 修改补打标签样式
---
HTML/views/ASNSetting/LabelBoxBuDa.html | 56 ++++++++++------------------
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs | 12 ++++++
2 files changed, 32 insertions(+), 36 deletions(-)
diff --git a/HTML/views/ASNSetting/LabelBoxBuDa.html b/HTML/views/ASNSetting/LabelBoxBuDa.html
index 475c72c..8ff69b9 100644
--- a/HTML/views/ASNSetting/LabelBoxBuDa.html
+++ b/HTML/views/ASNSetting/LabelBoxBuDa.html
@@ -53,47 +53,31 @@
<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;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">
- <img src="../../img/LiNuo.jpg" style="width: 80%; height: 15px;" />
- </td>
- <td colspan="2" style="padding: 1px 0px;" class="font-size12">SMP-ST002-R08-01</td>
- </tr>
- <tr>
- <td colspan="4" class="font-size12">鐗╂枡鏍囩</td>
- </tr>
+ <table border="1" id="table" style="width: 90%; height:240px; text-align: center;border-collapse: collapse;table-layout: fixed;border:none">
<tr>
- <td class="font-size12">鍝佸悕</td>
- <td colspan="3" id="SkuName" class="font-size10"></td>
- </tr>
- <tr>
- <td class="font-size12">瑙勬牸/鍨嬪彿</td>
- <td id="Standard" class="font-size10"></td>
- <td class="font-size12">鍖呰瑙勬牸</td>
- <td id="PackageStandard" class="font-size10"></td>
- </tr>
- <tr>
- <td class="font-size12">杩涘巶缂栧彿</td>
- <td id="LotNo" class="font-size10"></td>
- <td class="font-size12">鐗╂枡浠ｇ爜</td>
+ <td class="font-size12">鐗╂枡缂栧彿锛�</td>
<td id="SkuNo" class="font-size10"></td>
</tr>
<tr>
- <td class="font-size12">鍘熷巶鎵瑰彿</td>
- <td id="SupplierLot" class="font-size10"></td>
- <td class="font-size12">鏁� 閲�</td>
- <td id="Qty" class="font-size10"></td>
+ <td class="font-size12">鐗╂枡鍚嶇О锛�</td>
+ <td id="SkuName" class="font-size10"></td>
</tr>
<tr>
- <td class="font-size12">鏈夋晥鏈熻嚦</td>
- <td id="ExpirationTime" class="font-size10"></td>
- <td class="font-size12">鍌ㄥ瓨鏈熻嚦</td>
- <td id="StoreTime" class="font-size10"></td>
+ <td class="font-size12">鎵规鍙凤細</td>
+ <td id="LotNo" class="font-size10"></td>
+ </tr>
+ <tr>
+ <td class="font-size12">鐢熶骇鏃ユ湡锛�</td>
+ <td id="ProductionTime" class="font-size10"></td>
+ </tr>
+ <tr>
+ <td class="font-size12">鏈夋晥鏈燂細</td>
+ <td id="ExpirationTime" class="font-size10"></td>
</tr>
+
<tr>
- <td colspan="4" style="padding: 5px 0px;">
- <img id="imgBar" style=" height: 35px;" />
+ <td colspan="2" style="padding: 5px 0px;">
+ <img id="imgBar" style=" height: 40px;" />
</td>
</tr>
@@ -262,9 +246,9 @@
$("#ExpirationTime").attr("id", "ExpirationTime" + z.toString());
$("#ExpirationTime" + z.toString()).html( formatDate2(res.data[z].ExpirationTime));
-
- $("#StoreTime").attr("id", "StoreTime" + z.toString());
- $("#StoreTime" + z.toString()).html(formatDate2(res.data[z].StoreTime));
+
+ $("#ProductionTime").attr("id", "ProductionTime" + z.toString());
+ $("#ProductionTime" + z.toString()).html( formatDate2(res.data[z].ProductionTime));
$("#imgBar").attr("id", "imgBar" + z.toString());
$("#imgBar" + z.toString()).attr("src", res.data[z].ImgStr);
diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
index ace488b..3aa92c5 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -1027,6 +1027,7 @@
model.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = data.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = dataList.Sum(m => m.Qty);// 鏁伴噺
@@ -1082,6 +1083,7 @@
model.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = data.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = data1.Sum(m => m.Qty);// 鏁伴噺
@@ -1134,6 +1136,7 @@
model.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = data.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = data.Qty;// 鏁伴噺
@@ -1186,6 +1189,7 @@
model.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = data.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = data.Qty;// 鏁伴噺
@@ -1252,6 +1256,7 @@
model1.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
model1.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model1.ProductionTime = data.ProductionTime;//鐢熶骇鏃ユ湡
model1.Qty = dataList.Sum(m => m.Qty);// 鏁伴噺
model1.BoxNo = data.BoxNo; // 绠卞彿
@@ -1271,6 +1276,7 @@
model.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = data.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = data.Qty;// 鏁伴噺
model.BoxNo = data.BoxNo3; // 鏀彿
@@ -1318,6 +1324,7 @@
model.ExpirationTime = boxData.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = boxData.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = boxData.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = data.Sum(m => m.Qty); // 鏁伴噺
model.BoxNo = boxData.BoxNo; // 鏀彿
@@ -1340,6 +1347,7 @@
model1.ExpirationTime = item.ExpirationTime; // 鏈夋晥鏈熻嚦
model1.StoreTime = item.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model1.ProductionTime = item.ProductionTime;//鐢熶骇鏃ユ湡
model1.Qty = item.Qty;// 鏁伴噺
model1.BoxNo = item.BoxNo3; // 鏀彿
@@ -1386,6 +1394,7 @@
model.ExpirationTime = boxData.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = boxData.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = boxData.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = data.Sum(m => m.Qty); // 鏁伴噺
model.BoxNo = boxData.BoxNo; // 鏀彿
@@ -1410,6 +1419,7 @@
model1.ExpirationTime = item.ExpirationTime; // 鏈夋晥鏈熻嚦
model1.StoreTime = item.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = item.ProductionTime;//鐢熶骇鏃ユ湡
model1.Qty = item.Qty; // 鏁伴噺
model1.BoxNo = item.BoxNo3; // 鏀彿
@@ -1478,6 +1488,7 @@
model.ExpirationTime = boxData.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = boxData.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = boxData.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = data.Sum(m => m.Qty); // 鏁伴噺
model.BoxNo = boxData.BoxNo; // 鏀彿
@@ -1506,6 +1517,7 @@
model1.ExpirationTime = item.ExpirationTime; // 鏈夋晥鏈熻嚦
model1.StoreTime = item.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = item.ProductionTime;//鐢熶骇鏃ユ湡
model1.Qty = item.Qty;// 鏁伴噺
model1.BoxNo = item.BoxNo3; // 鏀彿
--
Gitblit v1.8.0