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

TQS

2022-12-03 7e5e4b43f4bcd7248325e1e1a5f10c61d64e93d3

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

@@ -118,7 +118,7 @@
            }
            // 修改订单状态 作业中 ===>> 已完成
            for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
                if (!BaseController.isJSON(wrkDetl.getOrderNo())) {
                if (BaseController.isJSON(wrkDetl.getOrderNo())) {
                    orderService.checkComplete(wrkDetl.getOrderNo());
                } else {
                    // 订单合并出库