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

TQS

2022-11-29 d759220378927d1481882de1c7c476ac47ce2dea

 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 {
                    // 订单合并出库