From 1c08ea7ba3b0f7f0fe5d26eeead80d398b2703be Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期四, 27 四月 2023 09:43:21 +0800 Subject: [PATCH] 订单打印修复 --- src/main/java/com/zy/asrs/controller/OpenController.java | 4 ++-- src/main/webapp/static/js/order/out.js | 2 +- src/main/java/com/zy/asrs/controller/MatController.java | 4 ++++ src/main/webapp/views/order/order.html | 14 ++++++-------- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java index af66c6f..ec2dc6a 100644 --- a/src/main/java/com/zy/asrs/controller/MatController.java +++ b/src/main/java/com/zy/asrs/controller/MatController.java @@ -273,6 +273,10 @@ for (String orderNo : param){ res = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo)); } + for (OrderDetl orderDetl: + res) { + orderDetl.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty()); + } return R.ok().add(res); } diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index 8f2e27c..878527e 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -170,7 +170,7 @@ System.out.println(JSON.toJSONString(param1)); } - + //骞冲簱pda涓婃灦 @RequestMapping("/manDetl/in") public R manDetlAdd(@RequestBody JSONObject json){ if (json == null){ @@ -179,7 +179,7 @@ return openService.manDetlIn(json); } - + //骞冲簱pda涓嬫灦 @RequestMapping("/manDetl/out") public R manDetlDelete(@RequestBody JSONObject json){ if (json == null){ diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js index bf78b6b..e05528a 100644 --- a/src/main/webapp/static/js/order/out.js +++ b/src/main/webapp/static/js/order/out.js @@ -37,9 +37,9 @@ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200} ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'} ,{field: 'specs', align: 'center',title: '瑙勬牸'} - // ,{field: 'anfme', align: 'center',title: '鏁伴噺'} ,{field: 'anfme', align: 'center',title: '鎬绘暟閲�', style: 'font-weight: bold'} ,{field: 'workQty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'} + ,{field: 'anfme', align: 'center',title: '瀹屾垚鏁伴噺'} // ,{field: 'name', align: 'center',title: '鍚嶇О'} // ,{field: 'model', align: 'center',title: '鍨嬪彿'} ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true} diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html index ad4bbd3..3a22582 100644 --- a/src/main/webapp/views/order/order.html +++ b/src/main/webapp/views/order/order.html @@ -258,33 +258,31 @@ <thead></thead> <tbody style="font-weight: bold"> <tr style="height: 30px;"> - <td align="center" scope="col" colspan="1">鍟嗗搧</td> - <td align="lift" colspan="4" style="padding-left: 8px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.maktx}}</td> + <td align="center" scope="col" colspan="1">鏂欏彿</td> + <td align="lift" colspan="4" style="padding-left: 8px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.matnr}}</td> <td align="center" scope="col" colspan="3" rowspan="3"> <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%"> </td> </tr> <tr style="height: 30px"> - <td align="center" scope="col" colspan="1">鏂欏彿</td> + <td align="center" scope="col" colspan="1">鍟嗗搧</td> <!-- overflow:hidden; 婧㈠嚭闅愯棌 white-space:nowrap; text-overflow:ellipsis;--> <!-- word-break : break-all; 瓒呭嚭鑷姩鎹㈣--> - <td align="lift" colspan="4" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.matnr}}</td> + <td align="lift" colspan="4" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.maktx}}</td> </tr> <tr style="height: 30px"> <td align="center" scope="col" colspan="1">鏃ユ湡</td> <td align="lift" colspan="4" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.createTime$}}</td> </tr> <tr style="height: 30px"> - <td align="center" scope="col" colspan="1">鐗屽彿</td> - <td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.brand}}</td> <td align="center" scope="col" colspan="1">鎵瑰彿</td> <td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.batch}}</td> + <td align="center" scope="col" colspan="1">瑙勬牸</td> + <td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.specs}}</td> </tr> <tr style="height: 30px"> <td align="center" scope="col" colspan="1">鏁伴噺</td> <td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.anfme}}</td> - <td align="center" scope="col" colspan="1">鐘舵��</td> - <td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.status$}}</td> </tr> -- Gitblit v1.9.1