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

TQS

2023-02-02 7b983df0c9fc8b1eb99429dd37699443c62e1d9d

 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());