src/main/java/com/zy/asrs/controller/PlaController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/static/css/common.css | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/static/js/pla/plaDetl.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/views/pla/plaDetl.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/PlaController.java
@@ -14,6 +14,7 @@ import com.zy.asrs.service.*; import com.zy.asrs.utils.PlaExcelListener; import com.zy.asrs.utils.SaasUtils; import com.zy.common.CodeRes; import com.zy.common.entity.PlaExcel; import com.zy.common.web.BaseController; import lombok.Synchronized; @@ -277,28 +278,19 @@ return R.ok("成功同步"+listener.getTotal()+"条pla物料数据"); } // // 打印 // @RequestMapping(value = "/pla/print/auth") // @ManagerAuth(memo = "pla编码打印") // public R matCodePrint(@RequestParam(value = "param[]") String[] param) { // if(Cools.isEmpty(param)) { // return R.parse(CodeRes.EMPTY); // } // List<MatPrint> res = new ArrayList<>(); // for (String matnr : param){ // Mat mat = matService.selectByMatnr(matnr); // // 打印数据注入 // MatPrint print = new MatPrint(); // print.setMatnr(mat.getMatnr()); // print.setBarcode(mat.getBarcode()); // print.setMaktx(mat.getMaktx()); // print.setSpecs(mat.getSpecs()); // print.setUnit(mat.getUnit()); // print.setMemo(mat.getMemo()); // res.add(print); // } // return R.ok().add(res); // } // 打印 @RequestMapping(value = "/pla/print/auth") @ManagerAuth(memo = "pla编码打印") public R matCodePrint(@RequestBody List<Pla> plas) { if(Cools.isEmpty(plas)) { return R.parse(CodeRes.EMPTY); } List<Pla> res = new ArrayList<>(); for (Pla pla : plas){ res.add(pla); } return R.ok().add(res); } private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){ for (Map.Entry<String, Object> entry : map.entrySet()){ src/main/webapp/static/css/common.css
@@ -120,9 +120,9 @@ /*white-space:normal;*/ /*word-break: break-all;*/ /*}*/ /*.layui-table-grid-down {*/ /* display: none;*/ /*}*/ .layui-table-grid-down { display: none; } /*详情*/ #detail .layui-form-label{ src/main/webapp/static/js/pla/plaDetl.js
@@ -107,6 +107,7 @@ limits: [16, 30, 50, 100, 200, 500], even: true, toolbar: '#toolbar', size: "lg", cellMinWidth: 50, cols: [getCol()], request: { @@ -126,6 +127,7 @@ statusCode: 200 }, done: function(res, curr, count) { //$(".lavui-table-grid-down").hide(); if (res.code === 403) { top.location.href = baseUrl+"/"; } @@ -405,11 +407,11 @@ var templateDom = $("#templatePreview"+templateNo); var className = templateDom.attr("class"); layer.closeAll(); for (let i=0;i<printData.length;i++){ for (let i=0;i<printData.data.length;i++){ if (className === 'template-barcode') { printData[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1¶m="+(printData[i].batch+";"+printData[i].packageNo) printData.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1¶m="+(printData.data[i].batch+";"+printData.data[i].packageNo) } else { res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2¶m="+(printData[i].batch+";"+printData[i].packageNo) printData.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2¶m="+(printData.data[i].batch+";"+printData.data[i].packageNo) } } var tpl = templateDom.html(); @@ -422,7 +424,8 @@ // $.ajax({ // url: baseUrl+"/pla/print/auth", // headers: {'token': localStorage.getItem('token')}, // data: {param: printMatCodeNos}, // data: JSON.stringify(printData.data), // contentType:'application/json;charset=UTF-8', // method: 'POST', // async: false, // success: function (res) { src/main/webapp/views/pla/plaDetl.html
@@ -263,7 +263,7 @@ </script> <!-- 表格 --> <table class="layui-table" id="plaDetl" lay-filter="plaDetl"></table> <table class="layui-table" id="plaDetl" lay-filter="plaDetl"></table> <script type="text/html" id="tbLook"> <span class="layui-text"> @@ -279,6 +279,7 @@ <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script> <script type="text/javascript" src="../../static/js/pla/plaDetl.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script> <!-- 打印操作弹窗 --> <div id="printDataDiv" style="display: none;padding: 20px"> @@ -334,30 +335,14 @@ <!-- 模板引擎 --> <!-- 模板3 --> <script type="text/template" id="templatePreview1" class="template-qrcode"> <div class="template-preview"> {{#each data}} <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;"> <tr style="height: 74px" > <td align="center" scope="col" colspan="1" style="font-weight: bold;"><strong style="font-weight: bold;color: black;">牌号</strong></td> <td align="center" scope="col" colspan="1" style=" font-weight: bold; display: inline-block; line-height: 20px; vertical-align: middle; border: none; border-top: 1px solid #000; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 3; -webkit-box-orient: vertical; "> <strong style="font-weight: bold;color: black;">{{this.brand}}</strong> </td> <td align="center" colspan="1" style="font-weight: bold;color: black;overflow:hidden; white-space:nowrap; text-overflow:ellipsis;"><strong style="font-weight: bold;color: black;">{{this.brand}}</strong></td> <td align="center" scope="col" colspan="2" rowspan="2"> <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%"> <div style="letter-spacing: 1px;margin-top: 1px; text-align: center"> <span style="font-weight: bold;color: black;"><strong style="font-weight: bold;color: black;">{{this.brand}}</strong></span> </div> </td> </tr> <tr style="height: 74px"> @@ -371,7 +356,9 @@ <td align="center" colspan="1" style="font-weight: bold;color: black;overflow:hidden; white-space:nowrap; text-overflow:ellipsis;"><strong style="font-weight: bold;color: black;">{{this.packageNo}}</strong></td> </tr> </table> </br> {{/each}} </div>> </script> </body>