diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java index f87874b..05acfc1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java @@ -299,6 +299,7 @@ public class MesToWmsServiceImpl implements MesToWmsService { taskParam.put("point_code2", pointCode); taskParam.put("group_id", groupPlate.getGroup_id()); taskParam.put("task_code", dto.getTask_code()); + taskParam.put("ext_task_code", dto.getTask_code()); if (dto.getIsManual() != null && dto.getIsManual()) { taskParam.put("create_mode", "手动"); } else { @@ -424,6 +425,7 @@ public class MesToWmsServiceImpl implements MesToWmsService { taskParam.put("point_code4", sonSchBasePointList.get(1).getPoint_code()); taskParam.put("group_id", groupPlate.getGroup_id()); taskParam.put("task_code", dto.getTask_code()); + taskParam.put("ext_task_code", dto.getTask_code()); if (dto.getIsManual() != null && dto.getIsManual()) { taskParam.put("create_mode", "手动"); } else { @@ -503,8 +505,8 @@ public class MesToWmsServiceImpl implements MesToWmsService { } else { param.put("create_mode", "自动"); } - param.put("task_code", dto.getTask_code()); //退料 + param.put("ext_task_code", dto.getTask_code()); if ("1".equals(dto.getTask_type())) { //查询组盘 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java index 45527e6..aa5ca75 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java @@ -1325,6 +1325,7 @@ public class PdaIosInServiceImpl implements PdaIosInService { // 组织主数据 Map jsonMst = new HashMap<>(); jsonMst.put("point_code", whereJson.getString("point_code")); + jsonMst.put("ext_task_code", whereJson.getString("ext_task_code")); // 组织明细数据 IOStorInvDtl dtlDao = ioStorInvDtlMapper.selectOne( new QueryWrapper().lambda() diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java index f3ac23f..1678b70 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java @@ -72,9 +72,7 @@ public class BackInTask extends AbstractTask { public String create(JSONObject json) { SchBaseTask task = new SchBaseTask(); task.setTask_id(IdUtil.getStringId()); - if (json.containsKey("task_code")) { - task.setExt_task_code(json.getString("task_code")); - } + task.setExt_task_code(json.getString("ext_task_code")); task.setTask_code(CodeUtil.getNewCode("TASK_CODE")); task.setTask_status(TaskStatus.CREATED.getCode()); task.setConfig_code(json.getString("config_code")); @@ -207,6 +205,10 @@ public class BackInTask extends AbstractTask { .set(Structattr::getTask_code, null) .set(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定")) ); + + iMdPbGroupplateService.update(new GroupPlate(), new LambdaUpdateWrapper() + .set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("出库")) + .eq(GroupPlate::getStoragevehicle_code, taskObj.getVehicle_code())); // 更新任务 taskObj.setRemark("已取消"); taskObj.setTask_status(TaskStatus.CANCELED.getCode()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java index a1d1cef..b28cfdf 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java @@ -77,11 +77,8 @@ public class VehicleInTask extends AbstractTask { String taskGroupId = IdUtil.getStringId(); SchBaseTask task = new SchBaseTask(); task.setTask_id(IdUtil.getStringId()); - if(json.containsKey("task_code")){ - task.setTask_code(json.getString("task_code")); - } else { - task.setTask_code(CodeUtil.getNewCode("TASK_CODE")); - } + task.setTask_code(CodeUtil.getNewCode("TASK_CODE")); + task.setExt_task_code(json.getString("ext_task_code")); task.setTask_status(TaskStatus.CREATED.getCode()); task.setConfig_code(json.getString("config_code")); task.setPoint_code1(json.getString("point_code1")); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java index fa0ab82..fd443b8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java @@ -85,9 +85,7 @@ public class DownEmptyUpFullTask extends AbstractTask { SchBaseTask task = new SchBaseTask(); task.setTask_id(IdUtil.getStringId()); task.setTask_code(CodeUtil.getNewCode("TASK_CODE")); - if(json.containsKey("task_code")){ - task.setExt_task_code(json.getString("task_code")); - } + task.setExt_task_code(json.getString("ext_task_code")); task.setTask_status(TaskStatus.CREATED.getCode()); task.setConfig_code(json.getString("task_type")); task.setPoint_code1(json.getString("point_code1")); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java index aa884fc..a670c2e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java @@ -83,9 +83,7 @@ public class SeparateMaterialTask extends AbstractTask { SchBaseTask task = new SchBaseTask(); task.setTask_id(IdUtil.getStringId()); task.setTask_code(CodeUtil.getNewCode("TASK_CODE")); - if(json.containsKey("task_code")){ - task.setExt_task_code(json.getString("task_code")); - } + task.setExt_task_code(json.getString("ext_task_code")); task.setTask_status(TaskStatus.CREATED.getCode()); task.setConfig_code(json.getString("task_type")); task.setPoint_code1(json.getString("point_code1")); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java index fdf2028..27ee099 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java @@ -835,6 +835,8 @@ public class InBillServiceImpl extends ServiceImpl i task.put("point_code1", whereJson.get("point_code")); task.put("point_code2", ioStorInvDis.getStruct_code()); task.put("form_data_code", whereJson.get("form_data_code")); + task.put("ext_task_code", whereJson.get("ext_task_code")); + //第一个载具为计算得到的,第二个载具为起始点载具 task.put("vehicle_code", ioStorInvDis.getStoragevehicle_code()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java index d8aaeb0..e799744 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java @@ -1022,6 +1022,7 @@ public class OutBillServiceImpl extends ServiceImpl i task_form.put("vehicle_code", ioStorInvDis.getStoragevehicle_code()); task_form.put("group_id", whereJson.getString("group_id")); task_form.put("create_mode", whereJson.getString("create_mode")); + task_form.put("ext_task_code", whereJson.getString("ext_task_code")); task_id = separateMaterialTask.create(task_form); rkPoint.setIng_task_code(task_id); rkPoint.setPoint_status("3"); @@ -1055,6 +1056,7 @@ public class OutBillServiceImpl extends ServiceImpl i task_form.put("task_group_id", taskGroupId); task_form.put("task_group_seq", "1"); task_form.put("create_mode", whereJson.getString("create_mode")); + task_form.put("ext_task_code", whereJson.getString("ext_task_code")); downEmptyUpFullTask.create(task_form); JSONObject task_form2 = new JSONObject();