JC24WMS.git - Gitblit

			@@ -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);

			// 添加到list集合
			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);

			// 添加到list集合
			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);

			// 添加到list集合
			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);

			// 添加到list集合
			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);

			// 添加到list集合
			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);

			// 添加到list集合
			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);

			// 添加到list集合
			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);

			// 添加到list集合
			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);

			// 添加到list集合
			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);


			// 添加到list集合
			@@ -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);

			// 添加到list集合
			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);

			// 添加到list集合
			printModelList.Add(model1);