From 0f7b217568c29e871305b48accdb292593b07545 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期三, 07 六月 2023 15:56:08 +0800 Subject: [PATCH] #平库库位优化 --- src/main/webapp/static/js/locDetl/locDetl.js | 2 +- src/main/java/com/zy/asrs/controller/NodeController.java | 7 ++++++- src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 4 ++-- src/main/java/com/zy/common/model/DetlDto.java | 8 ++++++++ src/main/java/com/zy/common/web/WcsController.java | 1 + src/main/webapp/static/js/common.js | 4 ++-- 6 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java index 2128e02..8e80d78 100644 --- a/src/main/java/com/zy/asrs/controller/NodeController.java +++ b/src/main/java/com/zy/asrs/controller/NodeController.java @@ -354,11 +354,16 @@ nodeEntityWrapper.eq("name",param.getName()); nodeService.delete(new EntityWrapper<Node>().eq("parent_id",param.getValue())); Node node = nodeService.selectOne(nodeEntityWrapper); + String[] string = node.getNamePath().split(","); for (int r=param.getStartRow(); r<=param.getEndRow(); r++){ for (int b=param.getStartBay(); b<=param.getEndBay(); b++) { for (int l=param.getStartLev(); l<=param.getEndLev(); l++) { // 鑾峰彇搴撲綅鍙� - String locNo = param.getName()+"-" +String.format("%02d", r) + String.format("%02d", b) + String.format("%02d", l); + String locNo; + + locNo = param.getName()+"-" +String.format("%02d", r) + String.format("%02d", b) + String.format("%02d", l); + + Date now = new Date(); Node node1 = new Node(); diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java index 9558c78..f1b9e5e 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -201,7 +201,7 @@ throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触"); } - DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getOwner()); + DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getOwner(),elem.getWeight()); if (DetlDto.has(detlDtos, detlDto)) { DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch()); assert one != null; @@ -230,7 +230,7 @@ waitPakin.setModiTime(now); waitPakin.setOwner(detlDto.getOwner()); waitPakin.setUuid(uuid); - waitPakin.setWeight(param.getCombMats().get(0).getWeight()); + waitPakin.setWeight(detlDto.getWeight()); if (!waitPakinService.insert(waitPakin)) { throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�"); } diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java index b08db0c..39c7841 100644 --- a/src/main/java/com/zy/common/model/DetlDto.java +++ b/src/main/java/com/zy/common/model/DetlDto.java @@ -51,6 +51,14 @@ this.owner = owner; } + public DetlDto(String matnr, String batch, Double anfme,int owner,Double weight) { + this.matnr = matnr; + this.batch = batch; + this.anfme = anfme; + this.owner = owner; + this.weight = weight; + } + public static boolean hasList(Set<DetlDto> detlDtos, OrderDetl orderDetl) { for (DetlDto dto : detlDtos) { diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java index c30b0ba..b2f31ac 100644 --- a/src/main/java/com/zy/common/web/WcsController.java +++ b/src/main/java/com/zy/common/web/WcsController.java @@ -214,6 +214,7 @@ wrkDetl.setAppeTime(now); wrkDetl.setModiTime(now); wrkDetl.setUuid(uuid); + wrkDetl.setWeight(waitPakin.getWeight()); wrkDetl.setOwner(waitPakin.getOwner()); wrkDetl.setPayment(waitPakin.getPayment()); if (!wrkDetlService.insert(wrkDetl)) { diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js index ca71258..4adeaef 100644 --- a/src/main/webapp/static/js/common.js +++ b/src/main/webapp/static/js/common.js @@ -243,7 +243,7 @@ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true} ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true} ,{field: 'anfme', align: 'center',title: '鏁伴噺',hide: true} - ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜',hide: true} + ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜',hide: false} ,{field: 'specs', align: 'center',title: '瑙勬牸',hide: true} ,{field: 'model', align: 'center',title: '浠g爜', hide: false} ,{field: 'color', align: 'center',title: '棰滆壊', hide: true} @@ -258,7 +258,7 @@ ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true} ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true} ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true} - ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: false} + ,{field: 'weight', align: 'center',title: '閲嶉噺', hide: false} ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: false} ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: false} ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: false} diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js index 211c380..625a052 100644 --- a/src/main/webapp/static/js/locDetl/locDetl.js +++ b/src/main/webapp/static/js/locDetl/locDetl.js @@ -22,7 +22,7 @@ ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true} ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true} ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true} - ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true} + ,{field: 'weight', align: 'center',title: '閲嶉噺', hide: false} ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true} ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true} ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true} -- Gitblit v1.9.1