diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/SecondFloorAgvTransferTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/SecondFloorAgvTransferTask.java index b01fd70d..fa11702a 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/SecondFloorAgvTransferTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/SecondFloorAgvTransferTask.java @@ -85,8 +85,8 @@ public class SecondFloorAgvTransferTask extends AbstractTask { SchBaseTask schBaseTask = iSchBaseTaskService.getOne(new QueryWrapper().eq("task_code", data.getString("task_code"))); //货架解绑 TableDataInfo tableDataInfo = wmsToAcsService.bindPodAndBerth(schBaseTask.getPoint_code3(), schBaseTask.getPoint_code1(), "0", "bindPodAndBerth"); - String bindResult = "200".equals(tableDataInfo.getCode()) ? "地面站点:" + schBaseTask.getPoint_code1() + "解绑" + schBaseTask.getPoint_code3() + "指令下发CTU,返回解绑成功!" : - "地面站点:" + schBaseTask.getPoint_code1() + "解绑" + schBaseTask.getPoint_code3() + "指令下发CTU,返回解绑失败,请操作站点解绑,失败原因:" + tableDataInfo.getMsg(); + String bindResult = "200".equals(tableDataInfo.getCode()) ?"任务:"+schBaseTask.getTask_code()+"完成,地面站点:"+ schBaseTask.getPoint_code1() + "解绑" + schBaseTask.getPoint_code3() + "指令下发CTU,返回解绑成功!" : + "任务:"+schBaseTask.getTask_code()+"完成,地面站点:" + schBaseTask.getPoint_code1() + "解绑" + schBaseTask.getPoint_code3() + "指令下发CTU,返回解绑失败,请操作站点解绑,失败原因:" + tableDataInfo.getMsg(); iSchBaseTaskService.update(new LambdaUpdateWrapper() .set(SchBaseTask::getRemark, bindResult) .eq(SchBaseTask::getId, schBaseTask.getId())); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/SecondFloorEmptyShelfTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/SecondFloorEmptyShelfTask.java index 43f495a2..2709bb23 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/SecondFloorEmptyShelfTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/SecondFloorEmptyShelfTask.java @@ -87,12 +87,19 @@ public class SecondFloorEmptyShelfTask extends AbstractTask { .eq(SchBasePoint::getCode, schBaseTask.getPoint_code1())); //货架绑定 TableDataInfo tableDataInfo = iSchBasePointService.bindOrUnbind(schBaseTask.getPoint_code2(), schBaseTask.getVehicle_code(), "1"); - String bindResult = "200".equals(tableDataInfo.getCode()) ? "地面站点:" + schBaseTask.getPoint_code2() + "绑定" + schBaseTask.getVehicle_code() + "指令下发CTU,返回绑定成功!" : - "地面站点:" + schBaseTask.getPoint_code2() + "绑定" + schBaseTask.getVehicle_code() + "指令下发CTU,返回绑定失败,请操作站点绑定,失败原因:" + tableDataInfo.getMsg(); + String bindResult = "200".equals(tableDataInfo.getCode()) ? "任务:"+schBaseTask.getTask_code()+"完成,地面站点:" + schBaseTask.getPoint_code2() + "绑定" + schBaseTask.getVehicle_code() + "指令下发CTU,返回绑定成功!" : + "任务:"+schBaseTask.getTask_code()+"完成,地面站点:"+ schBaseTask.getPoint_code2() + "绑定" + schBaseTask.getVehicle_code() + "指令下发CTU,返回绑定失败,请操作站点绑定,失败原因:" + tableDataInfo.getMsg(); iSchBaseTaskService.update(new LambdaUpdateWrapper() + .set(SchBaseTask::getUpdate_time, DateUtil.now()) .set(SchBaseTask::getRemark, bindResult) + .set(SchBaseTask::getUpdate_name, SecurityUtils.getCurrentNickName()) .eq(SchBaseTask::getId, schBaseTask.getId())); - + //点位状态更新 + iSchBasePointService.update(new LambdaUpdateWrapper() + .set(SchBasePoint::getUpdate_time, DateUtil.now()) + .set(SchBasePoint::getRemark, bindResult) + .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) + .eq(SchBasePoint::getCode,schBaseTask.getPoint_code2())); } @Override diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/ToPickPlatformTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/ToPickPlatformTask.java index cf5c86f5..fa35bf29 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/ToPickPlatformTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/ToPickPlatformTask.java @@ -49,6 +49,9 @@ public class ToPickPlatformTask extends AbstractTask { @Autowired private ISchBasePointService iSchBasePointService; + /** + * 拣选出库任务 + */ @Override @Transactional public JSONObject createTask(JSONObject from) { @@ -84,6 +87,7 @@ public class ToPickPlatformTask extends AbstractTask { throw new BadRequestException("创建任务失败:未找到该物料对应起点仓位"); } String start_struct_code = struct.getStruct_code(); + //移库判断 if (struct.getStor_code().equals("FStockId")){ synchronized ("FStockId"){ start_struct_code= SpringContextHolder.getBean(OutStorageTask.class).DoubleStor(struct); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java index 4ea95e40..9cd38c9c 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java @@ -159,7 +159,7 @@ public class SchBaseTaskServiceImpl extends ServiceImpl