From 13dcfda0f75db6aee32c71b567d0a81bb0af4424 Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 16 Oct 2025 13:40:32 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=B5=8B=E8=AF=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/service/impl/AcsToWmsServiceImpl.java | 10 +++++----- .../sch_manage/service/util/AbstractTask.java | 18 ++++++++++++++++++ .../service/util/tasks/BackOutTask.java | 1 + .../service/util/tasks/CheckMoveTask.java | 1 + .../util/tasks/CombinedBoxMoveTask.java | 1 + .../service/util/tasks/EmpVehicleOutTask.java | 1 + .../service/util/tasks/HandOutTask.java | 1 + .../service/util/tasks/HotOutTask.java | 1 + .../service/util/tasks/PdaPointTask.java | 4 ++-- .../service/util/tasks/PieceBoxMoveTask.java | 1 + .../service/util/tasks/QualityOutTask.java | 1 + .../service/util/tasks/ReceiveOutTask.java | 1 + .../service/impl/SelectOutServiceImpl.java | 2 +- 13 files changed, 35 insertions(+), 8 deletions(-) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java index 79dbd81..044542b 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java @@ -125,22 +125,22 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { public BaseResponse resultCar(JSONObject whereJson) { log.info("ACS向WMS反馈任务车号，请求参数：--------------------------------------" + whereJson.toString()); // 任务标识 - String task_id = whereJson.getString("task_id"); + String task_code = whereJson.getString("task_code"); // 车号 String car_no = whereJson.getString("car_no"); if (ObjectUtil.isEmpty(car_no)) { throw new BadRequestException("车号不能为空！"); } - RLock lock = redissonClient.getLock(task_id); + RLock lock = redissonClient.getLock(task_code); boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS); try { if (tryLock) { - SchBaseTask taskObj = iSchBaseTaskService.getById(task_id); + SchBaseTask taskObj = iSchBaseTaskService.getByCode(task_code); taskObj.setCar_no(car_no); iSchBaseTaskService.updateById(taskObj); } else { - throw new BadRequestException("任务标识为：" + task_id + "的任务正在操作中！"); + throw new BadRequestException("任务编码为：" + task_code + "的任务正在操作中！"); } } finally { if (tryLock) { @@ -181,7 +181,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { AbstractTask task = taskFactory.getTask(taskDao.getConfig_code()); JSONObject resultWeigh = task.resultWeigh(taskDao); //调用相机服务保存照片 - HikvisionSnapshotUtil.sync截图(vehicleDao.getStoragevehicle_code(),taskDao.getTask_code()); + // TODO HikvisionSnapshotUtil.sync截图(vehicleDao.getStoragevehicle_code(),taskDao.getTask_code()); log.info("ACS向WMS反馈重量，返回参数：--------------------------------------" + BaseResponse.responseOk(resultWeigh).toString()); return BaseResponse.responseOk(resultWeigh); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java index 9300852..da3e8c2 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java @@ -7,17 +7,21 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.nl.wms.ext.service.WmsToAcsService; import org.nl.wms.ext.service.util.AcsResponse; import org.nl.wms.sch_manage.enums.TaskStatus; +import org.nl.wms.sch_manage.service.ISchBasePointService; import org.nl.wms.sch_manage.service.ISchBaseTaskService; +import org.nl.wms.sch_manage.service.dao.SchBasePoint; import org.nl.wms.sch_manage.service.dao.SchBaseTask; import org.nl.wms.warehouse_management.enums.IOSConstant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -43,6 +47,12 @@ public abstract class AbstractTask { @Autowired private WmsToAcsService wmsToAcsService; + /** + * 点位服务 + */ + @Resource + private ISchBasePointService iSchBasePointService; + /** * 任务创建 * 根据配置生成任务 @@ -153,6 +163,14 @@ public abstract class AbstractTask { this.updateStatus(taskCode, status); } + public void executingTask(SchBaseTask taskObj) { + iSchBasePointService.update( + new UpdateWrapper().lambda() + .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code2()) + .set(SchBasePoint::getIng_task_code, taskObj.getTask_id()) + ); + } + /** * 以下改为public会出现自动注入类出现问题 * diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackOutTask.java index f994429..9f5478a 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackOutTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackOutTask.java @@ -157,6 +157,7 @@ public class BackOutTask extends AbstractTask { } // 根据传来的类型去对任务进行操作 if (status.equals(TaskStatus.EXECUTING)) { + this.executingTask(taskObj); taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); taskService.updateById(taskObj); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckMoveTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckMoveTask.java index 1ede2b6..4da7620 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckMoveTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckMoveTask.java @@ -135,6 +135,7 @@ public class CheckMoveTask extends AbstractTask { // 根据传来的类型去对任务进行操作 if (status.equals(TaskStatus.EXECUTING)) { // 更新明细状态 + this.executingTask(taskObj); taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); taskService.updateById(taskObj); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CombinedBoxMoveTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CombinedBoxMoveTask.java index be6111e..f6d022a 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CombinedBoxMoveTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CombinedBoxMoveTask.java @@ -152,6 +152,7 @@ public class CombinedBoxMoveTask extends AbstractTask { if (status.equals(TaskStatus.EXECUTING)) { // 更新明细状态 iStIvtMoveinvService.executing(taskObj); + this.executingTask(taskObj); taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); taskService.updateById(taskObj); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleOutTask.java index 6e88aaa..1fa7f13 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleOutTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleOutTask.java @@ -127,6 +127,7 @@ public class EmpVehicleOutTask extends AbstractTask { // 根据传来的类型去对任务进行操作 if (status.equals(TaskStatus.EXECUTING)) { // 更新明细状态 + this.executingTask(taskObj); taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); taskService.updateById(taskObj); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java index 93012ea..a1b6735 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java @@ -140,6 +140,7 @@ public class HandOutTask extends AbstractTask { } // 根据传来的类型去对任务进行操作 if (status.equals(TaskStatus.EXECUTING)) { + this.executingTask(taskObj); taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); taskService.updateById(taskObj); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HotOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HotOutTask.java index 8ca0e67..cfb294c 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HotOutTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HotOutTask.java @@ -148,6 +148,7 @@ public class HotOutTask extends AbstractTask { } // 根据传来的类型去对任务进行操作 if (status.equals(TaskStatus.EXECUTING)) { + this.executingTask(taskObj); taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); taskService.updateById(taskObj); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java index ab5673f..dbd80ad 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java @@ -242,7 +242,7 @@ public class PdaPointTask extends AbstractTask { iSchBasePointService.update( new UpdateWrapper().lambda() .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1()) - .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("无货")) + .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位")) ); iStructattrService.update( new UpdateWrapper().lambda() @@ -253,7 +253,7 @@ public class PdaPointTask extends AbstractTask { iSchBasePointService.update( new UpdateWrapper().lambda() .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code2()) - .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("无货")) + .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位")) ); iStructattrService.update( new UpdateWrapper().lambda() diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PieceBoxMoveTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PieceBoxMoveTask.java index 873224f..7a1c848 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PieceBoxMoveTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PieceBoxMoveTask.java @@ -154,6 +154,7 @@ public class PieceBoxMoveTask extends AbstractTask { // 根据传来的类型去对任务进行操作 if (status.equals(TaskStatus.EXECUTING)) { // 更新明细状态 + this.executingTask(taskObj); iStIvtMoveinvService.executing(taskObj); taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/QualityOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/QualityOutTask.java index bf1b5c2..37b89ca 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/QualityOutTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/QualityOutTask.java @@ -131,6 +131,7 @@ public class QualityOutTask extends AbstractTask { } // 根据传来的类型去对任务进行操作 if (status.equals(TaskStatus.EXECUTING)) { + this.executingTask(taskObj); taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); taskService.updateById(taskObj); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ReceiveOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ReceiveOutTask.java index 048e1f7..caac587 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ReceiveOutTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ReceiveOutTask.java @@ -148,6 +148,7 @@ public class ReceiveOutTask extends AbstractTask { } // 根据传来的类型去对任务进行操作 if (status.equals(TaskStatus.EXECUTING)) { + this.executingTask(taskObj); taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); taskService.updateById(taskObj); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/SelectOutServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/SelectOutServiceImpl.java index 399f658..a0a7210 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/SelectOutServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/SelectOutServiceImpl.java @@ -137,7 +137,7 @@ public class SelectOutServiceImpl extends ServiceImpl