#

1

2025-05-09 3ceabb21c1fd2b7fbdbc5c77c23f26152ec7f9aa

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

@@ -92,9 +92,10 @@
    }

    //创建任务
    @PostMapping("/taskCreate")
    @PostMapping("/taskCreate2")
    @AppAuth(memo = "WMS任务下发")
    @Transactional
    public R taskCreate(@RequestHeader String appkey,
    public synchronized R taskCreate(@RequestHeader String appkey,
                          @RequestBody List<TaskCreateParam> param1,
                          HttpServletRequest request) {
        auth(appkey, param1, request);
@@ -105,15 +106,19 @@
                if (Cools.isEmpty(param)) {
                    return R.parse(BaseRes.PARAM);
                }

                if (Cools.isEmpty(param.getTaskNo())) {
                    return R.error("任务号[taskNo]不能为空");
                }
                if (Cools.isEmpty(param.getIoType())) {
                    return R.error("任务类型[ioType]不能为空");
                }
                param.updateIoTyoe(param.getIoType());//中航下发  1：出库，2：移库 3：入库   ====转换为====>  1：入库，2：出库，3：移库

                if (Cools.isEmpty(param.getBarcode())) {
                    return R.error("条码[barcode]不能为空");
                }

                String locNo=null;
                if(param.getIoType()==1){
                    locNo=param.getTargetPoint();
@@ -327,9 +332,9 @@
    }

    //任务下发接口
    @PostMapping("/outboundTaskSend")
//    @PostMapping("/taskCreate")
//    @AppAuth(memo = "任务下发接口")
//    @PostMapping("/outboundTaskSend")
    @PostMapping("/taskCreate")
    @AppAuth(memo = "任务下发接口")
    @Transactional
    public R outboundTaskSend(@RequestHeader String appkey,
                              @RequestBody List<CarryParam> params,//中航下发  1：出库，2：移库 3：入库
@@ -361,7 +366,14 @@
//                }
//            }

            LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());

            String locNo=null;
            if(param.getIoType()==1){
                locNo=param.getTargetPoint();
            }else{
                locNo=param.getStartPoint();
            }
            LocMast locMast = locMastService.selectByLocNo(locNo);
            if(Cools.isEmpty(locMast)){
                return R.error("初始库位无法找到");
            }
@@ -377,7 +389,7 @@
                if(Cools.isEmpty(staDesc)){
                    return R.error("入库路劲不存在");
                }
                r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo()));
                r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo(),staDesc.getCrnStn()));

            }else if(param.getIoType() == 2){
                //出库任务创建
@@ -388,7 +400,7 @@
                if(Cools.isEmpty(staDesc)){
                    return R.error("出库路劲不存在");
                }
                r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo()));
                r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo(),staDesc.getStnNo()));
            }else if (param.getIoType() == 3){
                LocMast locMast2 = locMastService.selectByLocNo(param.getTargetPoint());
                if(Cools.isEmpty(locMast2)){