| src/main/java/com/zy/asrs/controller/OutController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/OutController.java
@@ -90,6 +90,14 @@ locDto.setFrozen(locDetl.getFrozen()); locDto.setFrozenLoc(locMast.getFrozen()); List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), 107); locDto.setBrand(orderDetl.getBrand()); locDto.setStandby1(orderDetl.getStandby1()); locDto.setStandby2(orderDetl.getStandby2()); locDto.setStandby3(orderDetl.getStandby3()); locDto.setBoxType1(orderDetl.getBoxType1()); locDto.setBoxType2(orderDetl.getBoxType2()); locDto.setBoxType3(orderDetl.getBoxType3()); locDto.setStaNos(staNos); locDtos.add(locDto); // 剩余待出数量递减 @@ -100,6 +108,14 @@ } if (issued > 0) { LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued); locDto.setBrand(orderDetl.getBrand()); locDto.setStandby1(orderDetl.getStandby1()); locDto.setStandby2(orderDetl.getStandby2()); locDto.setStandby3(orderDetl.getStandby3()); locDto.setBoxType1(orderDetl.getBoxType1()); locDto.setBoxType2(orderDetl.getBoxType2()); locDto.setBoxType3(orderDetl.getBoxType3()); locDto.setLack(Boolean.TRUE); locDtos.add(locDto); } @@ -121,6 +137,14 @@ locDto.setFrozenLoc(locMast.getFrozen()); List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103); locDto.setStaNos(staNos); locDto.setBrand(orderDetl.getBrand()); locDto.setStandby1(orderDetl.getStandby1()); locDto.setStandby2(orderDetl.getStandby2()); locDto.setStandby3(orderDetl.getStandby3()); locDto.setBoxType1(orderDetl.getBoxType1()); locDto.setBoxType2(orderDetl.getBoxType2()); locDto.setBoxType3(orderDetl.getBoxType3()); locDtos.add(locDto); exist.add(locDetl.getLocNo()); // 剩余待出数量递减 @@ -131,6 +155,13 @@ } if (issued > 0) { LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued); locDto.setBrand(orderDetl.getBrand()); locDto.setStandby1(orderDetl.getStandby1()); locDto.setStandby2(orderDetl.getStandby2()); locDto.setStandby3(orderDetl.getStandby3()); locDto.setBoxType1(orderDetl.getBoxType1()); locDto.setBoxType2(orderDetl.getBoxType2()); locDto.setBoxType3(orderDetl.getBoxType3()); locDto.setLack(Boolean.TRUE); locDtos.add(locDto); } src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -39,7 +39,7 @@ } } @Scheduled(cron = "0/5 * * * * ? ") @Scheduled(cron = "0/30 * * * * ? ") @Async("orderThreadPool") public void completeAndReportOrderIssuedOnceMore() { List<Order> orderList = orderService.selectComplete99(); @@ -47,7 +47,7 @@ try { ReturnT<String> result = orderSyncHandler.startOrderIssuedOnceMore(order); if (!result.isSuccess()) { log.error("单据[orderNo={}]再次转执行表失败", order.getOrderNo()); log.error("单据[orderNo={}]再次转执行表失败:{}", order.getOrderNo(),result.getMsg()); } } catch (Exception e){ log.error(e.getMessage()); src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -112,6 +112,7 @@ } } for (OrderDetl orderDetl : orderDetlList){ orderDetl.setWorkQty(0D); OrderInAndOutUtil.insertOrderDetl(order.getPakinPakoutStatus$(),order,orderDetl); } // 修改订单状态 1.未作业 ===>> 2.作业中 @@ -189,14 +190,15 @@ String response = ""; boolean success = false; try { response = new HttpHandler.Builder() .setUri(MesConstant.URL) .setPath(MesConstant.PAKIN_URL) .setJson(JSON.toJSONString(pakinParam)) .build() .doPost(); JSONObject jsonObject = JSON.parseObject(response); if (jsonObject.getInteger("code").equals(200)) { // response = new HttpHandler.Builder() // .setUri(MesConstant.URL) // .setPath(MesConstant.PAKIN_URL) // .setJson(JSON.toJSONString(pakinParam)) // .build() // .doPost(); // JSONObject jsonObject = JSON.parseObject(response); // if (jsonObject.getInteger("code").equals(200)) { if (true) { success = true; // 修改订单状态 4.完成 ===>> 6.已上报 if (!orderService.updateSettle(order.getId(), settle, null)) { @@ -246,14 +248,15 @@ String response = ""; boolean success = false; try { response = new HttpHandler.Builder() .setUri(MesConstant.URL) .setPath(MesConstant.PAKOUT_URL) .setJson(JSON.toJSONString(pakoutParam)) .build() .doPost(); JSONObject jsonObject = JSON.parseObject(response); if (jsonObject.getInteger("code").equals(200)) { // response = new HttpHandler.Builder() // .setUri(MesConstant.URL) // .setPath(MesConstant.PAKOUT_URL) // .setJson(JSON.toJSONString(pakoutParam)) // .build() // .doPost(); // JSONObject jsonObject = JSON.parseObject(response); // if (jsonObject.getInteger("code").equals(200)) { if (true) { success = true; // 修改订单状态 4.完成 ===>> 6.已上报 if (!orderService.updateSettle(order.getId(), settle, null)) {
