From 1eff31efeaaf616701f258a437987663741a546e Mon Sep 17 00:00:00 2001 From: zhengxuming <739390650@QQ.COM> Date: Fri, 31 Oct 2025 17:38:30 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E6=A0=AA=E6=B4=B2=E4=B8=AD=E9=92=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/ext_manage/service/impl/WmsToMesServiceImpl.java | 2 +- .../org/nl/wms/sch_manage/service/util/tasks/BackInTask.java | 4 +++- .../org/nl/wms/sch_manage/service/util/tasks/MoveTask.java | 4 ++++ .../nl/wms/sch_manage/service/util/tasks/PdaPointTask.java | 4 ++++ .../org/nl/wms/sch_manage/service/util/tasks/StInTask.java | 3 +++ .../org/nl/wms/sch_manage/service/util/tasks/StOutTask.java | 3 +++ .../nl/wms/sch_manage/service/util/tasks/VehicleInTask.java | 3 +++ .../nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java | 3 +++ .../service/util/tasks/zw/SeparateMaterialTask.java | 3 +++ .../inAndOut/service/impl/OutBillServiceImpl.java | 1 + 10 files changed, 28 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToMesServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToMesServiceImpl.java index 0a158e4..6f8b677 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToMesServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToMesServiceImpl.java @@ -88,7 +88,7 @@ public class WmsToMesServiceImpl implements WmsToMesService { log.info("uploadMes回传接口输出参数为：-------------------" + result.toString()); - Integer status = result.getInteger("code"); + Integer status = result.getInteger("status"); if (status != HttpStatus.OK.value()) { throw new BadRequestException(result.getString("message")); } 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 a3fcda1..e9efc4c 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 @@ -29,7 +29,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -; +;import java.math.BigDecimal; /** * @Author: Liuxy @@ -81,6 +81,8 @@ public class BackInTask extends AbstractTask { task.setVehicle_code(json.getString("vehicle_code")); task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); + task.setTask_group_id(IdUtil.getStringId()); + task.setTask_group_seq(new BigDecimal(1)); task.setCreate_mode(json.getString("create_mode")); task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveTask.java index 9f01f81..db2d1e2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveTask.java @@ -21,6 +21,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; + /** * @Author: Liuxy * @Description: 移库任务类 @@ -60,6 +62,8 @@ public class MoveTask extends AbstractTask { task.setVehicle_code(json.getString("vehicle_code")); task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); + task.setTask_group_id(IdUtil.getStringId()); + task.setTask_group_seq(new BigDecimal(1)); task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java index 706aeb5..9baff47 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java @@ -23,6 +23,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; + /** * @Author: Liuxy * @Description: 手持定点任务 @@ -62,6 +64,8 @@ public class PdaPointTask extends AbstractTask { task.setVehicle_code(json.getString("vehicle_code")); task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); + task.setTask_group_id(IdUtil.getStringId()); + task.setTask_group_seq(new BigDecimal(1)); task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java index 3c306a8..3fd5eca 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java @@ -23,6 +23,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; /** * @Author: Liuxy @@ -51,6 +52,8 @@ public class StInTask extends AbstractTask { task.setPoint_code1(json.getString("PickingLocation")); task.setPoint_code2(json.getString("PlacedLocation")); task.setVehicle_code(json.getString("vehicle_code")); + task.setTask_group_id(IdUtil.getStringId()); + task.setTask_group_seq(new BigDecimal(1)); task.setGroup_id(json.getString("group_id")); task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java index 63a3d75..b3f0118 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java @@ -29,6 +29,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; /** * @Author: Liuxy @@ -73,6 +74,8 @@ public class StOutTask extends AbstractTask { task.setPoint_code1(json.getString("PickingLocation")); task.setPoint_code2(json.getString("PlacedLocation")); task.setVehicle_code(json.getString("vehicle_code")); + task.setTask_group_id(IdUtil.getStringId()); + task.setTask_group_seq(new BigDecimal(1)); task.setGroup_id(json.getString("group_id")); task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); 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 220c8df..3234d54 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 @@ -30,6 +30,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.List; import java.util.stream.Collectors; @@ -84,6 +85,8 @@ 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(IdUtil.getStringId()); + task.setTask_group_seq(new BigDecimal(1)); task.setTask_group_id(taskGroupId); task.setCreate_mode(json.getString("create_mode")); task.setRequest_param(json.toString()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java index 4e26cf3..edc2341 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java @@ -32,6 +32,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.Collections; import java.util.Set; import java.util.stream.Collectors; @@ -77,6 +78,8 @@ public class VehicleOutTask extends AbstractTask { task.setPoint_code1(json.getString("PickingLocation")); task.setPoint_code2(json.getString("PlacedLocation")); task.setVehicle_code(json.getString("vehicle_code")); + task.setTask_group_id(IdUtil.getStringId()); + task.setTask_group_seq(new BigDecimal(1)); task.setGroup_id(json.getString("group_id")); task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); 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 6fa7903..d79ce3b 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 @@ -32,6 +32,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -90,6 +91,8 @@ public class SeparateMaterialTask extends AbstractTask { task.setPoint_code2(json.getString("point_code2")); task.setVehicle_code(json.getString("vehicle_code")); task.setGroup_id(json.getString("group_id")); + task.setTask_group_id(IdUtil.getStringId()); + task.setTask_group_seq(new BigDecimal(1)); task.setCreate_mode(json.getString("create_mode")); task.setRequest_param(json.toString()); task.setPriority("1"); 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 e799744..ed9e26d 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 @@ -1073,6 +1073,7 @@ public class OutBillServiceImpl extends ServiceImpl i task_form2.put("task_group_id", taskGroupId); task_form2.put("task_group_seq", "2"); task_form2.put("create_mode", whereJson.getString("create_mode")); + task_form.put("ext_task_code", whereJson.getString("ext_task_code")); //这个需求特殊，因为会产生2个task,并且第二个task后结束，因此以第二个task_id为准！！ task_id = downEmptyUpFullTask.create(task_form2);