Merge remote-tracking branch 'origin/bfasrs' into bfasrs

whycq

2023-01-08 30b2d8dde49639824f2a9c8f5b3e9b99b4b09e80

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

@@ -94,7 +94,9 @@
                        orderDetl.setQty(orderDetl.getAnfme());
                    } else {
                        // 订单合并出库
                        List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
//                        List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
                        List<OrderDto> orderDtoList = new ArrayList<>();
                        orderDtoList.add(new OrderDto(wrkDetl.getOrderNo(),wrkDetl.getMatnr(),wrkDetl.getAnfme()));
                        for (OrderDto one : orderDtoList) {
                            if (one.getOrderNo().equals(orderNo)) {
                                orderDetl.setAnfme(one.getAnfme());