From 227eff61120aaca63e068035d745d86452e6499a Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 09:35:12 +0800
Subject: [PATCH] feat(mes): 优化生产订单与排产任务列表显示，新增启停工及校验逻辑 1. 生产订单列表展示优化 (WorkOrder) - 新增「生产状态」列，全局注册 `ORDER_PRODUCTION_STATUS` 常量并绑定系统动态字典。 - 彻底重构「工序生产进度」单元格显示：弃用臃肿的 Steps 组件，改为极简横向布局（彩色状态圆点 + 进度百分比），解决表格行高被强行撑开及内容截断问题，支持横向滚动。 - 优化「完成进度」列宽及展示样式，将百分比数值外置同行显示，更加直观。 2. 排产任务列表改造 (Task) - 顶部表头重构，由单一标题重构为「全部 / 未完成 / 已完成」的 Tabs 标签页切换结构。 - 重写数据过滤逻辑，剥离写死的 status 查询，改为使用 `scheduleStatus` 字段动态响应 Tabs 切换 (0: 未完成, 1: 已完成)。 3. 工单业务逻辑增强与状态流转 - 落实「工单查询逻辑设计方案」，优化底层的工单条件检索逻辑。 - 实现「添加工单启停功能」与「停工状态」，支持工单在执行过程中的暂停与恢复业务流转。 - 强化容错与防呆设计：操作「完成订单」时增加前置校验 `handleCheckFinish`，若生产状态为未完成，强制弹出二次确认 Modal，避免误操作。 # 相关讨论/参考方案 # - 添加工单启停功能 # - 停工状态功能设计方案 # - 工单查询逻辑设计方案 # - 工单完成进度显示优化
---
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/warehouse/MdmWarehouseServiceImpl.java | 126 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 126 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/warehouse/MdmWarehouseServiceImpl.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/warehouse/MdmWarehouseServiceImpl.java
new file mode 100644
index 0000000..eafa0c6
--- /dev/null
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/warehouse/MdmWarehouseServiceImpl.java
@@ -0,0 +1,126 @@
+package cn.iocoder.yudao.module.mdm.service.warehouse;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mdm.controller.admin.warehouse.vo.MdmWarehousePageReqVO;
+import cn.iocoder.yudao.module.mdm.controller.admin.warehouse.vo.MdmWarehouseSaveReqVO;
+import cn.iocoder.yudao.module.mdm.dal.dataobject.warehouse.MdmWarehouseDO;
+import cn.iocoder.yudao.module.mdm.dal.mysql.warehouse.MdmWarehouseMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.*;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mdm.enums.ErrorCodeConstants.*;
+
+/**
+ * MDM 浠撳簱 Service 瀹炵幇绫�
+ *
+ * @author 瓒呯骇绠＄悊鍛�
+ */
+@Service
+@Validated
+public class MdmWarehouseServiceImpl implements MdmWarehouseService {
+
+ @Resource
+ private MdmWarehouseMapper warehouseMapper;
+
+ @Override
+ public Long createWarehouse(MdmWarehouseSaveReqVO createReqVO) {
+ // 鏍￠獙鏁版嵁
+ validateWarehouseSaveData(createReqVO);
+
+ // 鎻掑叆
+ MdmWarehouseDO warehouse = BeanUtils.toBean(createReqVO, MdmWarehouseDO.class);
+ warehouseMapper.insert(warehouse);
+ return warehouse.getId();
+ }
+
+ @Override
+ public void updateWarehouse(MdmWarehouseSaveReqVO updateReqVO) {
+ // 鏍￠獙瀛樺湪
+ validateWarehouseExists(updateReqVO.getId());
+ // 鏍￠獙鏁版嵁
+ validateWarehouseSaveData(updateReqVO);
+
+ // 鏇存柊
+ MdmWarehouseDO updateObj = BeanUtils.toBean(updateReqVO, MdmWarehouseDO.class);
+ warehouseMapper.updateById(updateObj);
+ }
+
+ @Override
+ public void updateWarehouseStatus(Long id, Integer status) {
+ // 鏍￠獙瀛樺湪
+ validateWarehouseExists(id);
+ // 鏇存柊鐘舵��
+ warehouseMapper.updateById(new MdmWarehouseDO().setId(id).setStatus(status));
+ }
+
+ @Override
+ public void deleteWarehouse(Long id) {
+ // 鏍￠獙瀛樺湪
+ validateWarehouseExists(id);
+ // TODO: 鏍￠獙鏄惁琚簱瀛樹娇鐢�
+ // 鍒犻櫎
+ warehouseMapper.deleteById(id);
+ }
+
+ @Override
+ public MdmWarehouseDO validateWarehouseExists(Long id) {
+ MdmWarehouseDO warehouse = warehouseMapper.selectById(id);
+ if (warehouse == null) {
+ throw exception(MDM_WAREHOUSE_NOT_EXISTS);
+ }
+ return warehouse;
+ }
+
+ @Override
+ public MdmWarehouseDO validateWarehouseExistsAndEnable(Long id) {
+ MdmWarehouseDO warehouse = validateWarehouseExists(id);
+ if (warehouse.getStatus() != null && warehouse.getStatus() != 0) {
+ throw exception(MDM_WAREHOUSE_IS_DISABLE);
+ }
+ return warehouse;
+ }
+
+ private void validateWarehouseSaveData(MdmWarehouseSaveReqVO reqVO) {
+ // 鏍￠獙缂栫爜鍞竴
+ MdmWarehouseDO warehouse = warehouseMapper.selectByCode(reqVO.getCode());
+ if (warehouse != null && ObjUtil.notEqual(warehouse.getId(), reqVO.getId())) {
+ throw exception(MDM_WAREHOUSE_CODE_DUPLICATE);
+ }
+ // 鏍￠獙鍚嶇О鍞竴
+ MdmWarehouseDO sameName = warehouseMapper.selectByName(reqVO.getName());
+ if (sameName != null && ObjUtil.notEqual(sameName.getId(), reqVO.getId())) {
+ throw exception(MDM_WAREHOUSE_NAME_DUPLICATE);
+ }
+ }
+
+ @Override
+ public MdmWarehouseDO getWarehouse(Long id) {
+ return warehouseMapper.selectById(id);
+ }
+
+ @Override
+ public PageResult<MdmWarehouseDO> getWarehousePage(MdmWarehousePageReqVO pageReqVO) {
+ return warehouseMapper.selectPage(pageReqVO);
+ }
+
+ @Override
+ public List<MdmWarehouseDO> getWarehouseList(Collection<Long> ids) {
+ if (CollUtil.isEmpty(ids)) {
+ return Collections.emptyList();
+ }
+ return warehouseMapper.selectListByIds(ids);
+ }
+
+ @Override
+ public MdmWarehouseDO getWarehouseByCode(String code) {
+ return warehouseMapper.selectByCode(code);
+ }
+
+}
--
Gitblit v1.9.3