#优化合并订单功能 加非空判断

LSH

2022-11-01 eec95a61519ed4cc2e7e726c30895bca735cc774

#优化合并订单功能  加非空判断

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

@@ -360,6 +360,7 @@
            // 修改订单明细
            if (BaseController.isJSON(locDto.getOrderNo())) {
                String[] orderNos = GetOrderNo(locDto.getOrderNo());
                if (!Cools.isEmpty(orderNos)){
                Double anfme = locDto.getAnfme();
                for (String orderNo : orderNos) {
                    OrderDetl orderDetl = orderDetlService.selectItem(orderNo, locDto.getMatnr(), locDto.getBatch());
@@ -375,6 +376,16 @@
                        if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), anfme)) {
                            throw new CoolException("修改订单明细数量失败");
                        }
                        }
                        orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
                    }
                }else {
                    OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
                    if (orderDetl == null) {
                        orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
                    }
                    if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {
                        throw new CoolException("修改订单明细数量失败");
                    }
                    orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
                }
@@ -410,6 +421,7 @@
    private String[] GetOrderNo(String orderNo) {
        String[] s3 = orderNo.split("\"");
        String[] s = new String[(s3.length - 1) / 6];
        if (!Cools.isEmpty(s3)){
        int i = 0;
        int j = 0;
        for (String ss : s3) {
@@ -418,6 +430,9 @@
                i++;
            }
            j++;
            }
        }else {
            s=null;
        }
        return s;
    }
@@ -886,6 +901,7 @@
        for (WrkDetl wrkDetl : wrkDetls) {
            if (!Cools.isEmpty(wrkDetl.getOrderNo())){
                String[] orderNos = GetOrderNo(wrkDetl.getOrderNo());
                if (!Cools.isEmpty(orderNos)){
                String[] anfmes = GetAnfme(wrkDetl.getOrderNo());
                int i = 0;
                for (String orderNo : orderNos) {
@@ -907,6 +923,21 @@
                        }
                    }
                }
                }else {
                    if (BaseController.isJSON(wrkDetl.getOrderNo())) {
                        if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
                            throw new CoolException("订单数据回滚失败");
                        }
                    } else {
                        // 订单合并出库
                        List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
                        for (OrderDto orderDto : orderDtoList) {
                            if (!orderDetlService.decrease(orderDto.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), orderDto.getAnfme())) {
                                throw new CoolException("订单数据回滚失败");
                            }
                        }
                    }
                }
            }
        }
        // 取消操作人员记录