*

lsh

1 天以前 3759a40aad8191f82f4a2eac54c9045dcf6a0fb3

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

@@ -346,7 +346,7 @@

        try{
            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
            deviceErrorService.addDeviceError("wms/taskCreate", 1, "wms任务下发,任务数:"+params.size());
            deviceErrorService.addDeviceError("wms下发任务", 1, "wms任务下发,任务数:"+params.size());
        } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
        }
@@ -356,7 +356,7 @@
            if (Cools.isEmpty(param)){
                try{
                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                    deviceErrorService.addDeviceError("wmsErr", 1, "参数为空,param:"+JSON.toJSONString(param));
                    deviceErrorService.addDeviceError("wms下发任务异常", 1, "参数为空,param:"+JSON.toJSONString(param));
                } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
                }
@@ -364,7 +364,7 @@
            } else if (Cools.isEmpty(param.getTaskNo())){
                try{
                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                    deviceErrorService.addDeviceError("wmsErr", 1, "任务号为空,taskNo:"+JSON.toJSONString(param));
                    deviceErrorService.addDeviceError("wms下发任务异常", 1, "任务号为空,taskNo:"+JSON.toJSONString(param));
                } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
                }
@@ -372,7 +372,7 @@
            } else if (Cools.isEmpty(param.getIoType())){
                try{
                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                    deviceErrorService.addDeviceError("wmsErr", 1, "任务类型为空,ioType:"+JSON.toJSONString(param));
                    deviceErrorService.addDeviceError("wms下发任务异常", 1, "任务类型为空,ioType:"+JSON.toJSONString(param));
                } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
                }
@@ -381,7 +381,7 @@
            if (Cools.isEmpty(param.getStartPoint()) || Cools.isEmpty(param.getTargetPoint())){
                try{
                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                    deviceErrorService.addDeviceError("wmsErr", 1, "初始目标或者目标位为空,Point:"+JSON.toJSONString(param));
                    deviceErrorService.addDeviceError("wms下发任务异常", 1, "初始目标或者目标位为空,Point:"+JSON.toJSONString(param));
                } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
                }
@@ -413,7 +413,7 @@
            if(Cools.isEmpty(locMast)){
                try{
                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                    deviceErrorService.addDeviceError("wmsErr", 1, "初始库位无法找到,locNo:"+JSON.toJSONString(locNo));
                    deviceErrorService.addDeviceError("wms下发任务异常", 1, "初始库位无法找到,locNo:"+JSON.toJSONString(locNo));
                } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
                }
@@ -431,11 +431,21 @@
                if(Cools.isEmpty(staDesc)){
                    try{
                        DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                        deviceErrorService.addDeviceError("wmsErr", 1, "入库路劲不存在,param:"+JSON.toJSONString(param));
                        deviceErrorService.addDeviceError("wms下发任务异常", 1, "入库路劲不存在,param:"+JSON.toJSONString(param));
                    } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
                    }
                    return R.error("入库路劲不存在");
                }
                TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("TARGET_POINT", param.getTargetPoint()));
                if(!Cools.isEmpty(taskWrk)){
                    try{
                        DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                        deviceErrorService.addDeviceError("wms下发任务异常", 1, "目标库位存在执行中任务！！！,param:"+JSON.toJSONString(param));
                    } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
                    }
                    return R.error("目标库位存在执行中任务！！！");
                }
                r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo(),staDesc.getCrnStn()));

@@ -448,11 +458,21 @@
                if(Cools.isEmpty(staDesc)){
                    try{
                        DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                        deviceErrorService.addDeviceError("wmsErr", 1, "出库路劲不存在,param:"+JSON.toJSONString(param));
                        deviceErrorService.addDeviceError("wms下发任务异常", 1, "出库路劲不存在,param:"+JSON.toJSONString(param));
                    } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
                    }
                    return R.error("出库路劲不存在");
                }
                TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("START_POINT", param.getStartPoint()));
                if(!Cools.isEmpty(taskWrk)){
                    try{
                        DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                        deviceErrorService.addDeviceError("wms下发任务异常", 1, "出口库位存在执行中任务！！！,param:"+JSON.toJSONString(param));
                    } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
                    }
                    return R.error("出口库位存在执行中任务！！！");
                }
                r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo(),staDesc.getStnNo()));
            }else if (param.getIoType() == 3){
@@ -460,7 +480,7 @@
                if(Cools.isEmpty(locMast2)){
                    try{
                        DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                        deviceErrorService.addDeviceError("wmsErr", 1, "目标库位无法找到,locNo:"+JSON.toJSONString(param.getTargetPoint()));
                        deviceErrorService.addDeviceError("wms下发任务异常", 1, "目标库位无法找到,locNo:"+JSON.toJSONString(param.getTargetPoint()));
                    } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
                    }
@@ -469,7 +489,7 @@
                if (!locMast2.getCrnNo().equals(locMast.getCrnNo())){
                    try{
                        DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                        deviceErrorService.addDeviceError("wmsErr", 1, "起始库位与目标库位不再同一巷道,param:"+JSON.toJSONString(param));
                        deviceErrorService.addDeviceError("wms下发任务异常", 1, "起始库位与目标库位不再同一巷道,param:"+JSON.toJSONString(param));
                    } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
                    }
@@ -499,6 +519,7 @@
                               @RequestBody WMSAndAGVInterfaceParam param,//中航下发  1：出库，2：移库 3：入库    1：取消  2 完成
                               HttpServletRequest request) {
        auth(appkey, param, request);
        param.updateIoTyoe(param.getIoType());//中航下发  1：出库，2：移库 3：入库   ====转换为====>  1：入库，2：出库，3：移库
//        param.updateTaskStatus(param.getTaskStatus());
        if (Cools.isEmpty(param)){
            return R.error("参数为空！");
@@ -506,14 +527,11 @@
            return R.error("工作号为空！");
        } else if (Cools.isEmpty(param.getIoType())){
            return R.error("操作类型为空！");
        } else if (Cools.isEmpty(param.getBarcode())){
            return R.error("托盘码不能为空！");
        }

        TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>()
                .eq("task_no", param.getTaskNo())
                .eq("io_type",param.getIoType())
                .eq("barcode",param.getBarcode()));
                .eq("io_type",param.getIoType()));
        if (Cools.isEmpty(taskWrk)){
            return R.error("未查到当前任务---"+param);
        }