From c10e16220622d6fbc17c55893af41f73a4797cbd Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期日, 04 二月 2024 08:58:15 +0800
Subject: [PATCH] 标签样式调整

---
 Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

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