From 75f4a13cfa4215bacc78bd4c43f451d38a43e54c Mon Sep 17 00:00:00 2001 From: zhengxuming <739390650@QQ.COM> Date: Sat, 11 Oct 2025 09:25:33 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BB=BB=E5=8A=A1=E7=BB=84=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ios_manage/service/impl/PdaIosInServiceImpl.java | 7 +++++-- .../wms/sch_manage/service/util/tasks/VehicleInTask.java | 2 ++ .../inAndOut/service/impl/InBillServiceImpl.java | 8 ++++---- 3 files changed, 11 insertions(+), 6 deletions(-) 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 7d60f25..0f550b0 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 @@ -344,8 +344,11 @@ public class PdaIosInServiceImpl implements PdaIosInService { PageQuery pageQuery = new PageQuery(); IPage sectList = iSectattrService.queryAll(new HashMap(), pageQuery); List selectList = new ArrayList<>(); - sectList.getRecords().forEach(r -> - selectList.add(SelectItemVo.builder().text(r.getStor_name() + "-" + r.getSect_name()).value(r.getSect_id()).build()) + sectList.getRecords().forEach(r -> { + if (StringUtils.isNotBlank(r.getStor_name()) && !r.getStor_name().contains("料桶")) { + selectList.add(SelectItemVo.builder().text(r.getStor_name() + "-" + r.getSect_name()).value(r.getSect_id()).build()); + } + } ); return PdaResponse.requestParamOk(selectList); } 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 c46d4ad..052b943 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 @@ -74,6 +74,7 @@ public class VehicleInTask extends AbstractTask { @Override public String create(JSONObject json) { + String taskGroupId = IdUtil.getStringId(); SchBaseTask task = new SchBaseTask(); task.setTask_id(IdUtil.getStringId()); if(json.containsKey("task_code")){ @@ -86,6 +87,7 @@ public class VehicleInTask extends AbstractTask { task.setPoint_code1(json.getString("point_code1")); task.setPoint_code2(json.getString("point_code2")); task.setVehicle_code(json.getString("vehicle_code")); + task.setTask_group_id(taskGroupId); task.setCreate_mode(json.getString("create_mode")); task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); 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 e67000b..fdf2028 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 @@ -798,18 +798,18 @@ public class InBillServiceImpl extends ServiceImpl i if (ObjectUtil.isEmpty(groupPlate)) { throw new BadRequestException("托盘[" + whereJson.get("vehicle_code") + "]状态为组盘的信息不存在！"); } + String taskGroupId = IdUtil.getStringId(); JSONObject task = new JSONObject(); task.put("config_code", IOSConstant.IN_BILL_TASK); task.put("group_id", groupPlate.getGroup_id()); task.put("priority", whereJson.get("priority")); task.put("task_group_seq", whereJson.get("task_group_seq")); - task.put("task_group_id", whereJson.get("task_group_id")); + task.put("task_group_id", taskGroupId); task.put("task_code", CodeUtil.getNewCode("TASK_CODE")); task.put("point_code1", ioStorInvDis.getStruct_code()); task.put("point_code2", whereJson.get("point_code2")); task.put("point_code3", whereJson.get("point_code3")); task.put("point_code4", ioStorInvDis.getStruct_code()); - task.put("form_data_code", whereJson.get("form_data_code")); //第一个载具为计算得到的，第二个载具为起始点载具 @@ -824,16 +824,16 @@ public class InBillServiceImpl extends ServiceImpl i if (ObjectUtil.isEmpty(groupPlate)) { throw new BadRequestException("托盘[" + ioStorInvDis.getStoragevehicle_code() + "]的信息不存在！"); } + String taskGroupId = IdUtil.getStringId(); JSONObject task = new JSONObject(); task.put("config_code", IOSConstant.BACK_IN_TASK); task.put("group_id", groupPlate.getGroup_id()); task.put("priority", whereJson.get("priority")); task.put("task_group_seq", whereJson.get("task_group_seq")); - task.put("task_group_id", whereJson.get("task_group_id")); + task.put("task_group_id", taskGroupId); task.put("task_code", CodeUtil.getNewCode("TASK_CODE")); 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")); //第一个载具为计算得到的，第二个载具为起始点载具