#入库流程回调参数修改

zyx

2024-01-31 5b6fb24f831898d0534a67a54f273f7b89683d73

#入库流程回调参数修改

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

@@ -246,8 +246,6 @@
                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);

 src/main/java/com/zy/asrs/entity/GetWmsDto.java

@@ -17,4 +17,12 @@
    private Integer taskTunnel;             //任务巷道
    private String createTime;          //创建时间             YYYY-MM-DD HH24:MI:SS
    private String targetLocationCode;  //目标货位

    //任务号
    private String wrkNo;
    //站点编号
    private Integer staNo;
    //目标库位
    private String locNo;

}

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

@@ -7,7 +7,14 @@
@Data
public class WMSAndAGVInterfaceParam {

    private String taskNo;              //任务号
    //工作号
    private String taskNo;

    //入出库类型
    private int ioType;


    //private String taskNo;              //任务号
    private String warehouseId;         //仓库标识

    //wms出库任务下发接口
@@ -42,5 +49,6 @@
    //AGV请求动作接口
    private String requestType;         //请求类型:         1=取货；2=放货
    private String wharfCode;           //码头编号
//

}

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

@@ -204,7 +204,7 @@
                                // 创新一个入库工作档
                                TaskWrk taskWrk = taskWrkService.selectByTaskNo(getWmsDto.getTaskNo());
                                if(Cools.isEmpty(taskWrk)) {
                                    taskWrk = createTask(getWmsDto,staProtocol.getStaNo().intValue());
                                    taskWrk = createTask(getWmsDto,barcode);
                                    if (Cools.isEmpty(taskWrk)){
                                        log.error("库位异常，库位号：{}", getWmsDto.getTargetLocationCode());
                                    }else {
@@ -1124,27 +1124,26 @@
        return response;
    }

    private TaskWrk createTask(GetWmsDto dto, Integer staNo){
        String wcsLocNo = Utils.getWcsLocNo(dto.getTargetLocationCode());
    private TaskWrk createTask(GetWmsDto dto, String barcode){
        String wcsLocNo = dto.getLocNo();
        if(Cools.isEmpty(wcsLocNo)){
            return null;
        }
        Date now = new Date();
        TaskWrk taskWrk = new TaskWrk();
        taskWrk.setTaskNo(dto.getTaskNo());//任务号
        taskWrk.setTaskNo(dto.getWrkNo());//任务号
        taskWrk.setStatus(TaskStatusType.RECEIVE.id);//任务状态：接收
        taskWrk.setCreateTime(now);
        taskWrk.setIoType(1);//任务类型
        taskWrk.setIoPri(Cools.isEmpty(dto.getTaskPriority()) ? 300 : Integer.parseInt(dto.getTaskPriority()));//优先级
        taskWrk.setBarcode(dto.getContainerCode());//条码
        taskWrk.setBarcode(barcode);//条码
        LocMast locMast = locMastService.selectByLocNo(wcsLocNo);
        taskWrk.setCrnNo(locMast.getCrnNo());
        taskWrk.setTargetPoint(dto.getTargetLocationCode());
        taskWrk.setStartPoint(staNo.toString());
        taskWrk.setTargetPoint(wcsLocNo);
        taskWrk.setStartPoint(dto.getStaNo().toString());
        if(taskWrk.getIoType() == 1){
            taskWrk.setWrkSts(2);
            if (!Cools.isEmpty(taskWrk.getTargetPoint())) {
                taskWrk.setTargetPoint(wcsLocNo);//终点
                taskWrk.setOriginTargetPoint(taskWrk.getTargetPoint());
            }