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

whycq

2023-01-30 4f4559efbe2d2f20f2c37d8582b74f0a558a54c7

 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -122,7 +122,9 @@
                    orderService.checkComplete(wrkDetl.getOrderNo());
                } 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) {
                        orderService.checkComplete(one.getOrderNo());
                    }