#

zjj

2025-07-02 d3f3d4b309cfb285fcbbc48b91c4046111c7e9cd

 src/main/java/com/zy/asrs/controller/TaskWrkController.java

@@ -11,6 +11,7 @@
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.entity.param.TaskOverToWms;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.CommandInfoService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.TaskWrkService;
@@ -47,6 +48,8 @@
    private CommandInfoService commandInfoService;
    @Autowired
    private LocMastService locMastService;
    @Autowired
    private ApiLogService apiLogService;

    @RequestMapping(value = "/taskWrk/{wrkNo}/auth")
    @ManagerAuth
@@ -108,6 +111,22 @@
        if (taskWrk1 == null) {
            return R.error();
        }
        if ((taskWrk1.getIoType() == 1 || taskWrk1.getIoType() == 3) &&  taskWrk1.getWrkSts() >= 3  ){
            return R.error("任务已在执行，无法修改");
        }
        if ((taskWrk1.getIoType() == 2 ) &&  taskWrk1.getWrkSts() >= 12  ){
            return R.error("任务已在执行，无法修改");
        }
        if (Cools.isEmpty(taskWrk1.getStartPoint()) || Cools.isEmpty(taskWrk1.getTargetPoint())){
            return R.error("任务未分配库位，无法修改");
        }

        List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskWrk.getTaskNo());
        if (!Cools.isEmpty(commandInfos)){
            for (CommandInfo commandInfo:commandInfos){
                commandInfoService.deleteById(commandInfo);
            }
        }
        InetAddress localHost = InetAddress.getLocalHost();
        String ipAddress = localHost.getHostAddress();

@@ -124,6 +143,7 @@
            taskWrk1.setOriginTargetPoint(Utils.getWmsLocNo(taskWrk.getTargetPoint()));
            taskWrk1.setOriginStartPoint(Utils.getWmsLocNo(taskWrk.getStartPoint()));
        }
        taskWrk1.setStatus(1);
        taskWrk1.setModiTime(new Date());
        taskWrk1.setModiUser(getUserId());

@@ -228,6 +248,14 @@
        }

        JSONObject jsonObject = JSON.parseObject(response);
        apiLogService.save("手动完成任务"
                ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
                ,null
                ,"127.0.0.1"
                ,JSON.toJSONString(taskOverToWms)
                ,response
                ,true
        );
        if (jsonObject.getInteger("code").equals(200)){
            if (taskWrk == null) {
                return R.error();