*

lsh

2025-04-28 e386fa74739a128349c9c0e60913896713044e43

*

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

@@ -92,7 +92,7 @@
    }

    //创建任务
    @PostMapping("/taskCreate")
    @PostMapping("/taskCreate2")
    @AppAuth(memo = "WMS任务下发")
    @Transactional
    public synchronized R taskCreate(@RequestHeader String appkey,
@@ -332,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：入库
@@ -366,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("初始库位无法找到");
            }

 src/main/java/com/zy/asrs/entity/param/CarryParam.java

@@ -10,6 +10,9 @@
    //入出库类型
    private Integer ioType;

    //优先级
    private Integer taskPriority;

    //容器编码
    private String barcode;


 src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java

@@ -70,7 +70,7 @@
        this.taskNo = param.getTaskNo();
        this.ioType = param.getIoType();
        this.barcode = param.getBarcode();
        this.taskPriority = 300;
        this.taskPriority = param.getTaskPriority();
        this.startPoint = param.getStartPoint();
        this.targetPoint = param.getTargetPoint();
        this.emptyContainer = "N";

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

@@ -73,8 +73,12 @@

        Date now = new Date();
        taskWrk = new TaskWrk();
        LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",param.getStartPoint()));
        int workNo1 = commonService.getWorkNo(WorkNoType.PAKOUT.type);//获取入库工作号
        int workNo1 = 0;//获取入库工作号
        if (param.getIoType() .equals(1)){
            commonService.getWorkNo(WorkNoType.PAKOUT.type);
        } else {
            commonService.getWorkNo(WorkNoType.PAKIN.type);
        }
        taskWrk.setTaskNo(param.getTaskNo());//任务号
        taskWrk.setWrkNo(workNo1);
        taskWrk.setStatus(TaskStatusType.RECEIVE.id);//任务状态：接收
@@ -82,18 +86,21 @@
        taskWrk.setModiTime(now);
        taskWrk.setAssignTime(new Date());
        taskWrk.setModiUser(6666L);
        try{
            if (param.getIoType()>1){
                if (Utils.locNoRowBoolean(locMast.getRow1())){
                    param.setTaskPriority(11);
                }
            }
        }catch (Exception e){
        }
//        try{
//            if (param.getIoType()>1){
//                LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",param.getStartPoint()));
//                if (Utils.locNoRowBoolean(locMast.getRow1())){
//                      param.setTaskPriority(11);
//                }
//            }
//        }catch (Exception e){
//        }
        taskWrk.setIoPri(param.getTaskPriority());

        taskWrk.setIoType(param.getIoType());//任务类型
        taskWrk.setIoPri(param.getTaskPriority());//优先级
        taskWrk.setBarcode(param.getBarcode());//条码
        taskWrk.setCrnNo(locMast.getCrnNo());
        taskWrk.setCrnNo(param.getCrn());
        if(param.getIoType() == 1){
            taskWrk.setWrkSts(1);
            if (!Cools.isEmpty(param.getTargetPoint())) {