#

luxiaotao1123

2022-04-11 fcd883af311ce8770c701c14e4eca484c810dc64

#

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -59,7 +59,7 @@
     */
    @PostMapping("/order/pakin/complete/default/v1")
    public synchronized R orderComplete(@RequestHeader(required = false) String appkey,
                                        @RequestBody OpenOrderCompleteParam param) {
                                        @RequestBody(required = false) OpenOrderCompleteParam param) {
        auth(appkey, param);
        return R.ok().add(openService.pakinOrderComplete(param));
    }

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -114,6 +114,7 @@
            OrderDetl orderDetl = new OrderDetl();
            orderDetl.sync(mat);
            orderDetl.setBatch(detlDto.getBatch());
            orderDetl.setAnfme(detlDto.getAnfme());
            orderDetl.setOrderId(order.getId());
            orderDetl.setOrderNo(order.getOrderNo());
            orderDetl.setCreateBy(9527L);
@@ -132,25 +133,7 @@
    @Transactional
    public List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param) {
        List<OpenOrderCompeteResult> results = new ArrayList<>();
        if (Cools.isEmpty(param.getOrderNo())) {
            // æ‰€æœ‰è®¢å•
            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
            for (Order order : orders) {
                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
                results.add(result);
                result.setOrderNo(order.getOrderNo());
                result.setOrderTime(order.getOrderTime());
                result.setOrderType(order.getDocType$());
                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
                for (OrderDetl orderDetl : orderDetls) {
                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
                }
                // ä¿®æ”¹è®¢å•çŠ¶æ€ 4.完成 ===>> 6.已上报
                if (!orderService.updateSettle(order.getId(), 6L, null)) {
                    throw new CoolException("服务器内部错误，请联系管理员");
                }
            }
        } else {
        if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
            // æŒ‡å®šè®¢å•
            Order order = orderService.selectByNo(param.getOrderNo());
            if (null != order) {
@@ -170,6 +153,24 @@
                    }
                }
            }
        } else {
            // æ‰€æœ‰è®¢å•
            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
            for (Order order : orders) {
                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
                results.add(result);
                result.setOrderNo(order.getOrderNo());
                result.setOrderTime(order.getOrderTime());
                result.setOrderType(order.getDocType$());
                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
                for (OrderDetl orderDetl : orderDetls) {
                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
                }
                // ä¿®æ”¹è®¢å•çŠ¶æ€ 4.完成 ===>> 6.已上报
                if (!orderService.updateSettle(order.getId(), 6L, null)) {
                    throw new CoolException("服务器内部错误，请联系管理员");
                }
            }
        }
        return results;
    }

 version/×Ô¶¯»¯Á¢¿âƽ̨¶Ô½ÓЭÒé.docx

Binary files differ