From ee523f576cad3f3fb1902b31913b9f26d79c29e1 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 2 Sep 2025 14:30:53 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BB=BB=E5=8A=A1=E7=B1=BB?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ISchBaseTaskService.java | 8 +++++ .../service/impl/SchBaseTaskServiceImpl.java | 10 +++++++ .../service/util/tasks/BackInTask.java | 4 +-- .../service/util/tasks/CheckBackMoveTask.java | 4 +-- .../service/util/tasks/CombinedBoxInTask.java | 4 +-- .../service/util/tasks/DetainInTask.java | 4 +-- .../service/util/tasks/EmpVehicleInTask.java | 6 ++-- .../service/util/tasks/HandInTask.java | 4 +-- .../service/util/tasks/PdaPointTask.java | 6 ++-- .../service/util/tasks/PieceBoxInTask.java | 4 +-- .../service/util/tasks/SelectBackInTask.java | 4 +-- .../controller/PieceBoxController.java | 2 +- .../warehouse_management/enums/IOSEnum.java | 2 +- .../service/dao/StIvtPieceBoxMst.java | 7 +++++ .../impl/StIvtPieceBoxMstServiceImpl.java | 7 +++++ .../src/views/wms/basedata/group/index.vue | 29 ++++++++++++++++++- .../views/wms/st/piecebox/ConfirmDialog.vue | 28 +++++++++++++++++- .../src/views/wms/st/piecebox/index.vue | 10 +++---- 18 files changed, 114 insertions(+), 29 deletions(-) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBaseTaskService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBaseTaskService.java index 6e33ab1..38a342d 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBaseTaskService.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBaseTaskService.java @@ -7,6 +7,7 @@ import org.nl.common.domain.query.PageQuery; import org.nl.wms.sch_manage.service.dao.SchBaseTask; import org.nl.wms.sch_manage.service.dto.SchBaseTaskQuery; +import java.util.List; import java.util.Map; import java.util.Set; @@ -68,4 +69,11 @@ public interface ISchBaseTaskService extends IService { * @return / */ SchBaseTask getByCode(String taskCode); + + /** + * 根据配置编码货位未完成的任务 + * @param config_code 配置编码 + * @return List + */ + List getTaskConfigList(String config_code); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseTaskServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseTaskServiceImpl.java index f6b6f6d..043505d 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseTaskServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseTaskServiceImpl.java @@ -160,4 +160,14 @@ public class SchBaseTaskServiceImpl extends ServiceImpl getTaskConfigList(String config_code) { + return this.list( + new QueryWrapper().lambda() + .eq(SchBaseTask::getConfig_code, config_code) + .lt(SchBaseTask::getTask_status, TaskStatus.FINISHED.getCode()) + .eq(SchBaseTask::getIs_delete, BaseDataEnum.IS_YES_NOT.code("否")) + ); + } + } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java index 6638e9d..2783c55 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java @@ -158,8 +158,8 @@ public class BackInTask extends AbstractTask { // 更新起点 iSchBasePointService.update( new UpdateWrapper().lambda() - .set(SchBasePoint::getVehicle_code, null) - .set(SchBasePoint::getIng_task_code, null) + .set(SchBasePoint::getVehicle_code, "") + .set(SchBasePoint::getIng_task_code, "") .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位")) .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1()) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckBackMoveTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckBackMoveTask.java index 39c55de..0ef4522 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckBackMoveTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckBackMoveTask.java @@ -200,8 +200,8 @@ public class CheckBackMoveTask extends AbstractTask { // 更新起点 iSchBasePointService.update( new UpdateWrapper().lambda() - .set(SchBasePoint::getVehicle_code, null) - .set(SchBasePoint::getIng_task_code, null) + .set(SchBasePoint::getVehicle_code, "") + .set(SchBasePoint::getIng_task_code, "") .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位")) .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1()) ); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CombinedBoxInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CombinedBoxInTask.java index 188aa0a..a46ddd0 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CombinedBoxInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CombinedBoxInTask.java @@ -178,8 +178,8 @@ public class CombinedBoxInTask extends AbstractTask { // 更新起点 iSchBasePointService.update( new UpdateWrapper().lambda() - .set(SchBasePoint::getVehicle_code, null) - .set(SchBasePoint::getIng_task_code, null) + .set(SchBasePoint::getVehicle_code, "") + .set(SchBasePoint::getIng_task_code, "") .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位")) .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1()) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/DetainInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/DetainInTask.java index a5a1b1f..bc84897 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/DetainInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/DetainInTask.java @@ -159,8 +159,8 @@ public class DetainInTask extends AbstractTask { // 更新起点 iSchBasePointService.update( new UpdateWrapper().lambda() - .set(SchBasePoint::getVehicle_code, null) - .set(SchBasePoint::getIng_task_code, null) + .set(SchBasePoint::getVehicle_code, "") + .set(SchBasePoint::getIng_task_code, "") .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位")) .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1()) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java index 9bcdd48..a9ec762 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java @@ -152,9 +152,9 @@ public class EmpVehicleInTask extends AbstractTask { iSchBasePointService.update( new UpdateWrapper().lambda() .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1()) - .set(SchBasePoint::getVehicle_code, null) - .set(SchBasePoint::getIos_id, null) - .set(SchBasePoint::getIng_task_code, null) + .set(SchBasePoint::getVehicle_code, "") + .set(SchBasePoint::getIos_id, "") + .set(SchBasePoint::getIng_task_code, "") .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位")) ); // 更新终点 diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandInTask.java index f45ca1a..330416c 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandInTask.java @@ -158,10 +158,10 @@ public class HandInTask extends AbstractTask { // 更新起点 iSchBasePointService.update( new UpdateWrapper().lambda() - .set(SchBasePoint::getVehicle_code, null) + .set(SchBasePoint::getVehicle_code, "") .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位")) .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1()) - .set(SchBasePoint::getIng_task_code, null) + .set(SchBasePoint::getIng_task_code, "") ); } 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 da41b0a..cd70b5c 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 @@ -155,14 +155,14 @@ public class PdaPointTask extends AbstractTask { iSchBasePointService.update( new UpdateWrapper().lambda() .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1()) - .set(SchBasePoint::getVehicle_code, null) + .set(SchBasePoint::getVehicle_code, "") .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位")) - .set(SchBasePoint::getIng_task_code, null) + .set(SchBasePoint::getIng_task_code, "") ); iStructattrService.update( new UpdateWrapper().lambda() .eq(Structattr::getStruct_code, taskObj.getPoint_code1()) - .set(Structattr::getStoragevehicle_code, null) + .set(Structattr::getStoragevehicle_code, "") .set(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定")) ); // 更新终点 diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PieceBoxInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PieceBoxInTask.java index e7b893f..6746682 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PieceBoxInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PieceBoxInTask.java @@ -185,8 +185,8 @@ public class PieceBoxInTask extends AbstractTask { // 更新起点 iSchBasePointService.update( new UpdateWrapper().lambda() - .set(SchBasePoint::getVehicle_code, null) - .set(SchBasePoint::getIng_task_code, null) + .set(SchBasePoint::getVehicle_code, "") + .set(SchBasePoint::getIng_task_code, "") .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位")) .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1()) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/SelectBackInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/SelectBackInTask.java index 683f910..5e68969 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/SelectBackInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/SelectBackInTask.java @@ -209,10 +209,10 @@ public class SelectBackInTask extends AbstractTask { // 更新起点 iSchBasePointService.update( new UpdateWrapper().lambda() - .set(SchBasePoint::getVehicle_code, null) + .set(SchBasePoint::getVehicle_code, "") .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位")) .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1()) - .set(SchBasePoint::getIng_task_code, null) + .set(SchBasePoint::getIng_task_code, "") ); } } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/PieceBoxController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/PieceBoxController.java index 9553e32..d12be83 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/PieceBoxController.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/PieceBoxController.java @@ -56,7 +56,7 @@ public class PieceBoxController { } @DeleteMapping - @Log("删除合箱") + @Log("删除拼箱") public ResponseEntity delete(@RequestBody Set ids) { iStIvtPieceBoxMstService.delete(ids); return new ResponseEntity<>(HttpStatus.OK); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSEnum.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSEnum.java index a16d4e7..48081e8 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSEnum.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSEnum.java @@ -52,7 +52,7 @@ public enum IOSEnum { // 移库任务配置类编码 MOVE_CONFIG_CODE(MapOf.of("2001","InsideMoveTask", "2002", "CombinedBoxMoveTask", - "2003", "PieceBoxMoveTask", "CheckMoveTask", "2004" + "2003", "PieceBoxMoveTask", "2004", "CheckMoveTask" )), //入库分配明细状态 diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtPieceBoxMst.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtPieceBoxMst.java index d428608..5243c9e 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtPieceBoxMst.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtPieceBoxMst.java @@ -1,5 +1,6 @@ package org.nl.wms.warehouse_management.service.dao; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -94,4 +95,10 @@ public class StIvtPieceBoxMst implements Serializable { */ private String create_time; + /** + * 拼箱明细 + */ + @TableField(exist = false) + private String piece_dtl_id; + } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtPieceBoxMstServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtPieceBoxMstServiceImpl.java index 32b63fc..6bfa59a 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtPieceBoxMstServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtPieceBoxMstServiceImpl.java @@ -1,6 +1,7 @@ package org.nl.wms.warehouse_management.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -211,12 +212,18 @@ public class StIvtPieceBoxMstServiceImpl extends ServiceImpl taskConfigList = iSchBaseTaskService.getTaskConfigList(IOSEnum.MOVE_CONFIG_CODE.code("2003")); + if (ObjectUtil.isNotEmpty(taskConfigList)) { + throw new BadRequestException("当前有正在执行的拼箱移库任务，不允许下发任务!"); + } StIvtPieceBoxMst mstDao = this.getById(dao.getId()); // 查询明细 List dtlDaoList = iStIvtPieceBoxDtlService.list( new QueryWrapper().lambda() .eq(StIvtPieceBoxDtl::getPiece_id, mstDao.getId()) + .eq(ObjectUtil.isNotEmpty(dao.getPiece_dtl_id()), StIvtPieceBoxDtl::getId, dao.getPiece_dtl_id()) .eq(StIvtPieceBoxDtl::getBill_status, IOSEnum.PIECE_DTL_STATUS.code("生成")) ); diff --git a/wms/nladmin-ui/src/views/wms/basedata/group/index.vue b/wms/nladmin-ui/src/views/wms/basedata/group/index.vue index a84059a..73895ac 100644 --- a/wms/nladmin-ui/src/views/wms/basedata/group/index.vue +++ b/wms/nladmin-ui/src/views/wms/basedata/group/index.vue @@ -70,6 +70,17 @@ > 复制新增 + + 物料标签 + - +