From c10e16220622d6fbc17c55893af41f73a4797cbd Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期日, 04 二月 2024 08:58:15 +0800
Subject: [PATCH] 标签样式调整
---
HTML/views/ASNSetting/LabelBoxBuDa.html | 14 +++++++-------
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs | 26 +++++++++++++-------------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/HTML/views/ASNSetting/LabelBoxBuDa.html b/HTML/views/ASNSetting/LabelBoxBuDa.html
index b835742..9e43162 100644
--- a/HTML/views/ASNSetting/LabelBoxBuDa.html
+++ b/HTML/views/ASNSetting/LabelBoxBuDa.html
@@ -88,8 +88,8 @@
<td id="StoreTime"></td>
</tr>
<tr>
- <td colspan="4">
- <img id="imgBar" style="width: auto; height: auto;" />
+ <td colspan="4" style="padding: 5px 0px;">
+ <img id="imgBar" style="width: 100%; height: auto;" />
</td>
</tr>
@@ -98,7 +98,7 @@
<div style="page-break-after: always;"></div>
</div>
<div class="layui-form hideCls" lay-filter="layuiadmin-app-form-list" id="print2"
- style="width: 100%;height:100%; text-align: right;padding-top: 5px;margin-left: 0%;"></div>
+ style="width: 100%;height:100%; text-align: right;padding-top: 15px;margin-left: 0%;"></div>
<div class="layui-form" style="padding: 30px 15px 0px; " id="button">
<div class="layui-form-item" style="margin-bottom:0px;">
@@ -256,11 +256,11 @@
$("#SupplierLot" + z.toString()).html( res.data[z].SupplierLot);
$("#ExpirationTime").attr("id", "ExpirationTime" + z.toString());
- $("#ExpirationTime" + z.toString()).html( res.data[z].ExpirationTime);
+ $("#ExpirationTime" + z.toString()).html( formatDate2(res.data[z].ExpirationTime));
$("#StoreTime").attr("id", "StoreTime" + z.toString());
- $("#StoreTime" + z.toString()).html( res.data[z].StoreTime);
+ $("#StoreTime" + z.toString()).html(formatDate2(res.data[z].StoreTime));
$("#imgBar").attr("id", "imgBar" + z.toString());
$("#imgBar" + z.toString()).attr("src", res.data[z].ImgStr);
@@ -303,9 +303,9 @@
document.getElementById('print2').innerHTML = "";
document.getElementById('print2').innerHTML = labels;
$("#print2").removeClass("hideCls");
- $("#button").hide();
+ //$("#button").hide();
$("#print2").print();
- $("#button").show();
+ //$("#button").show();
$("#print2").addClass("hideCls");
$("#LabelStream").val("");
diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
index db0a3dc..c5f314f 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -415,7 +415,7 @@
.AndIF(!string.IsNullOrWhiteSpace(model.Status), it => it.Status == model.SupplierLot)
.AndIF(!string.IsNullOrWhiteSpace(model.ProductionTime), it => it.ProductionTime >= Convert.ToDateTime(model.ProductionTime))
.AndIF(!string.IsNullOrWhiteSpace(model.ProductionTime), it => it.ProductionTime <= Convert.ToDateTime(model.ProductionTime).AddDays(1))
- .And(it => it.IsDel == "0")
+ .And(it => it.IsDel == "0" && it.Origin == "WMS鐢熸垚")
.ToExpression();
var total = 0;
@@ -1014,7 +1014,7 @@
model.BoxNo = data.BoxNo; // 绠卞彿
- model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo,100, 25);
+ model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo,260, 15,true);
// 娣诲姞鍒發ist闆嗗悎
printModelList.Add(model);
@@ -1069,7 +1069,7 @@
model.BoxNo = data.BoxNo; // 绠卞彿
- model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 100, 25);
+ model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 160, 15, true);
// 娣诲姞鍒發ist闆嗗悎
printModelList.Add(model);
@@ -1121,7 +1121,7 @@
model.BoxNo = data.BoxNo3; // 鏀彿
- model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 100, 25);
+ model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 160, 15, true);
// 娣诲姞鍒發ist闆嗗悎
printModelList.Add(model);
@@ -1173,7 +1173,7 @@
model.BoxNo = data.BoxNo3; // 绠卞彿
- model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 100, 25);
+ model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 160, 15, true);
// 娣诲姞鍒發ist闆嗗悎
printModelList.Add(model);
@@ -1237,7 +1237,7 @@
model1.Qty = dataList.Sum(m=>m.Qty);// 鏁伴噺
model1.BoxNo = data.BoxNo; // 绠卞彿
- model1.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 100, 25);
+ model1.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 160, 15, true);
// 娣诲姞鍒發ist闆嗗悎
printModelList.Add(model1);
@@ -1256,7 +1256,7 @@
model.Qty = data.Qty;// 鏁伴噺
model.BoxNo = data.BoxNo3; // 鏀彿
- model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 100, 25);
+ model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 160, 15, true);
// 娣诲姞鍒發ist闆嗗悎
printModelList.Add(model);
@@ -1303,7 +1303,7 @@
model.Qty = data.Sum(m => m.Qty); // 鏁伴噺
model.BoxNo = boxData.BoxNo; // 鏀彿
- model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 100, 25);
+ model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 160, 15, true);
// 娣诲姞鍒發ist闆嗗悎
printModelList.Add(model);
@@ -1325,7 +1325,7 @@
model1.Qty = item.Qty;// 鏁伴噺
model1.BoxNo = item.BoxNo3; // 鏀彿
- model.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 100, 25);
+ model.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 160, 15, true);
// 娣诲姞鍒發ist闆嗗悎
printModelList.Add(model);
@@ -1371,7 +1371,7 @@
model.Qty = data.Sum(m => m.Qty); // 鏁伴噺
model.BoxNo = boxData.BoxNo; // 鏀彿
- model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 100, 25);
+ model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 160, 15, true);
// 娣诲姞鍒發ist闆嗗悎
printModelList.Add(model);
@@ -1395,7 +1395,7 @@
model1.Qty = item.Qty; // 鏁伴噺
model1.BoxNo = item.BoxNo3; // 鏀彿
- model1.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 100, 25);
+ model1.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 160, 15, true);
// 娣诲姞鍒發ist闆嗗悎
@@ -1463,7 +1463,7 @@
model.Qty = data.Sum(m => m.Qty); // 鏁伴噺
model.BoxNo = boxData.BoxNo; // 鏀彿
- model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 100, 25);
+ model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 160, 15, true);
// 娣诲姞鍒發ist闆嗗悎
printModelList.Add(model);
@@ -1491,7 +1491,7 @@
model1.Qty = item.Qty;// 鏁伴噺
model1.BoxNo = item.BoxNo3; // 鏀彿
- model.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 100, 25);
+ model.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 160, 15, true);
// 娣诲姞鍒發ist闆嗗悎
printModelList.Add(model1);
--
Gitblit v1.8.0