From aa58fb95164952d7d1707c6b87fe7d7668207360 Mon Sep 17 00:00:00 2001 From: whycq <123456> Date: 星期二, 10 九月 2024 19:07:02 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/bomMat/bomMat.js | 3 ++- src/main/java/com/zy/asrs/controller/OutController.java | 3 ++- src/main/resources/license.lic | 0 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java index a7004eb..77ef408 100644 --- a/src/main/java/com/zy/asrs/controller/OutController.java +++ b/src/main/java/com/zy/asrs/controller/OutController.java @@ -65,12 +65,13 @@ List<LocDetl> locDetls = new ArrayList<>(); double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D); if (issued <= 0.0D) { continue; } + locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist); //if (Cools.isEmpty(orderDetl.getBomCode())) { // locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist); //} else { // locDetls = locDetlService.queryStockByBomcode(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBomCode(),null, exist); //} - locDetls = locDetlService.queryStockByBomcode(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBomCode(),null, exist); +// locDetls = locDetlService.queryStockByBomcode(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBomCode(),null, exist); for (LocDetl locDetl : locDetls) { if (issued > 0) { LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(), diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic index 4add7f4..e0cf76d 100644 --- a/src/main/resources/license.lic +++ b/src/main/resources/license.lic Binary files differ diff --git a/src/main/webapp/static/js/bomMat/bomMat.js b/src/main/webapp/static/js/bomMat/bomMat.js index 3c78330..eb09f1a 100644 --- a/src/main/webapp/static/js/bomMat/bomMat.js +++ b/src/main/webapp/static/js/bomMat/bomMat.js @@ -28,6 +28,7 @@ ,{field: 'unitNum', align: 'center',title: '閮ㄤ欢鍝佸彿'} ,{field: 'unitName', align: 'center',title: '閮ㄤ欢鍝佸悕'} ,{field: 'unitSpace', align: 'center',title: '閮ㄤ欢瑙勬牸'} + ,{field: 'bomCount', align: 'center',title: '濂楁暟'} ,{field: 'bomNum', align: 'center',title: '缁勪欢鍝佸彿'} ,{field: 'bomName', align: 'center',title: '缁勪欢鍝佸悕'} ,{field: 'bomSpace', align: 'center',title: '缁勪欢瑙勬牸'} @@ -35,7 +36,7 @@ ,{field: 'elementName', align: 'center',title: '鍏冧欢鍝佸悕'} ,{field: 'elementSpace', align: 'center',title: '鍏冧欢瑙勬牸'} ,{field: 'memo', align: 'center',title: '澶囨敞'} - ,{field: 'bomCount', align: 'center',title: '濂楁暟'} + ,{field: 'bomAnfme', align: 'center',title: '缁勬垚鐢ㄩ噺'} ,{field: 'zpalletAnfme', align: 'center',title: '鎵樼洏鏁伴噺'} ,{field: 'modiUser', align: 'center',title: '淇敼浜哄憳',hide: true} -- Gitblit v1.9.1