JC24WMS.git - Gitblit

parent: 56d8b770 | 补丁 | 提交 | ignore whitespace

Demo

2024-02-04 2f4f9781fd19046e6c139532d27e4f2621ac4e91

Merge branch 'csc'

2个文件已修改

	HTML/views/ASNSetting/LabelBoxBuDa.html	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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("");

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

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

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

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