#

LSH

2023-10-12 4a06fe15a333805d0f8678fde6274b9c20d13602

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

@@ -16,6 +16,7 @@
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
@@ -146,28 +147,31 @@

    //任务下发接口
    @PostMapping("/outboundTaskSend")
    @Transactional
    public R outboundTaskSend(@RequestHeader String appkey,
                              @RequestBody WMSAndAGVInterfaceParam param,
                              @RequestBody List<WMSAndAGVInterfaceParam> params,
                              HttpServletRequest request) {
        try {
            if (Cools.isEmpty(param)){
                return R.error("参数为空！");
            } else if (Cools.isEmpty(param.getTaskNo())){
                return R.error("任务号为空！");
            } else if (Cools.isEmpty(param.getTaskType())){
                return R.error("任务类型为空！");
            } else if (Cools.isEmpty(param.getWarehouseId())){
                return R.error("仓库标识为空！");
            }
            if (Cools.isEmpty(param.getTaskPriority())){
                param.setTaskPriority(1);
            }
            if (Cools.isEmpty(param.getContainerCode())){
                return R.error("容器编码(托盘码)为空！");
            }
            if (Cools.isEmpty(param.getEmptyContainer())){
                return R.error("是否空托盘信号为空！");
            }
        List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
        for (WMSAndAGVInterfaceParam param:params){
            try {
                if (Cools.isEmpty(param)){
                    return R.error("参数为空！");
                } else if (Cools.isEmpty(param.getTaskNo())){
                    return R.error("任务号为空！");
                } else if (Cools.isEmpty(param.getTaskType())){
                    return R.error("任务类型为空！");
                } else if (Cools.isEmpty(param.getWarehouseId())){
                    return R.error("仓库标识为空！");
                }
                if (Cools.isEmpty(param.getTaskPriority())){
                    param.setTaskPriority(1);
                }
                if (Cools.isEmpty(param.getContainerCode())){
                    return R.error("容器编码(托盘码)为空！");
                }
                if (Cools.isEmpty(param.getEmptyContainer())){
                    return R.error("是否空托盘信号为空！");
                }
//        if (Cools.isEmpty(param.getTaskTunnel())){
//            return R.error("任务巷道为空！");
//        }
@@ -177,17 +181,20 @@
//        if (Cools.isEmpty(param.getTaskSerialNo())){
//            return R.error("任务执行顺序为空！");
//        }
            if (Cools.isEmpty(param.getTargetWharf())){
                return R.error("目标码头区域为空！");//G开头=7车间，H开头=8层，J开头=9车间
                if (Cools.isEmpty(param.getTargetWharf())){
                    return R.error("目标码头区域为空！");//G开头=7车间，H开头=8层，J开头=9车间
                }

                openService.taskCreate(new taskCreateParam(param));

                params1.add(param);
//                return R.ok(param);
            }catch (Exception e){
                String errorMsg = Cools.isEmpty(e.getLocalizedMessage()) ? "" : e.getLocalizedMessage();
                return R.error("生成任务失败，请联系管理员!"+ errorMsg);
            }

            openService.taskCreate(new taskCreateParam(param));

            return R.ok(param);
        }catch (Exception e){
            String errorMsg = Cools.isEmpty(e.getLocalizedMessage()) ? "" : e.getLocalizedMessage();
            return R.ok("生成任务失败，请联系管理员!"+ errorMsg);
        }
        return R.ok(params1);
    }

    //任务取消接口