wxw
4 天以前 af583e3044e03325d8fdbc08164e8de3a0021792
修改补打标签样式
2个文件已修改
68 ■■■■ 已修改文件
HTML/views/ASNSetting/LabelBoxBuDa.html 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
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;                 // 支号