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

zjj

2023-11-30 46d5aca49be78fccb2c2e64dc2332236085f67e2

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

@@ -757,7 +757,7 @@
            try {
                taskWrkService.distribute(taskWrk.getTaskNo(), 9527L);
            } catch (CoolException e) {
                e.printStackTrace();
                log.info(e.getMessage());
            }
        }
    }
@@ -781,10 +781,6 @@
            Date now = new Date();
            //指令已完成，更新任务
            if (taskWrk.getIoType() == 1) {
                if (taskWrk.getStartPoint() == null || taskWrk.getTargetPoint() == null) {
                    continue;//未接收到起点和终点，不进行派发
                }

                //入库任务
                taskWrk.setWrkSts(4);//3.吊车入库中 => 4.入库完成
                taskWrk.setStatus(TaskStatusType.COMPLETE.id);