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/unit/MdmUnitMeasureServiceImpl.java | 128 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 128 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/unit/MdmUnitMeasureServiceImpl.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/unit/MdmUnitMeasureServiceImpl.java
new file mode 100644
index 0000000..3b393d3
--- /dev/null
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/unit/MdmUnitMeasureServiceImpl.java
@@ -0,0 +1,128 @@
+package cn.iocoder.yudao.module.mdm.service.unit;
+
+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.unit.vo.MdmUnitMeasurePageReqVO;
+import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureSaveReqVO;
+import cn.iocoder.yudao.module.mdm.dal.dataobject.unit.MdmUnitMeasureDO;
+import cn.iocoder.yudao.module.mdm.dal.mysql.item.MdmItemMapper;
+import cn.iocoder.yudao.module.mdm.dal.mysql.unit.MdmUnitMeasureMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+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 MdmUnitMeasureServiceImpl implements MdmUnitMeasureService {
+
+ @Resource
+ private MdmUnitMeasureMapper unitMeasureMapper;
+
+ @Resource
+ private MdmItemMapper itemMapper;
+
+ @Override
+ public Long createUnitMeasure(MdmUnitMeasureSaveReqVO createReqVO) {
+ // 鏍￠獙鏁版嵁
+ validateUnitMeasureSaveData(createReqVO);
+
+ // 鎻掑叆
+ MdmUnitMeasureDO unitMeasure = BeanUtils.toBean(createReqVO, MdmUnitMeasureDO.class);
+ unitMeasureMapper.insert(unitMeasure);
+ return unitMeasure.getId();
+ }
+
+ @Override
+ public void updateUnitMeasure(MdmUnitMeasureSaveReqVO updateReqVO) {
+ // 鏍￠獙瀛樺湪
+ validateUnitMeasureExists(updateReqVO.getId());
+ // 鏍￠獙鏁版嵁
+ validateUnitMeasureSaveData(updateReqVO);
+
+ // 鏇存柊
+ MdmUnitMeasureDO updateObj = BeanUtils.toBean(updateReqVO, MdmUnitMeasureDO.class);
+ unitMeasureMapper.updateById(updateObj);
+ }
+
+ @Override
+ public void updateUnitMeasureStatus(Long id, Integer status) {
+ // 鏍￠獙瀛樺湪
+ validateUnitMeasureExists(id);
+ // 鏇存柊鐘舵��
+ unitMeasureMapper.updateById(new MdmUnitMeasureDO().setId(id).setStatus(status));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteUnitMeasure(Long id) {
+ // 鏍￠獙瀛樺湪
+ MdmUnitMeasureDO unitMeasure = validateUnitMeasureExists(id);
+ // 鏍￠獙鏄惁琚墿鏂欎娇鐢紙鐩存帴浣跨敤 Mapper 閬垮厤寰幆渚濊禆锛�
+ if (itemMapper.selectCountByUnitMeasureId(id) > 0) {
+ throw exception(MDM_UNIT_MEASURE_EXISTS_ITEM);
+ }
+ // 鍏堟竻鐞嗗悓缂栫爜鐨勫凡杞垹闄よ剰鏁版嵁锛岄伩鍏嶅綋鍓嶈褰曡蒋鍒犳椂瑙﹀彂鍞竴閿啿绐�
+ unitMeasureMapper.physicalDeleteByCode(unitMeasure.getCode());
+ // 鍒犻櫎
+ unitMeasureMapper.deleteById(id);
+ }
+
+ @Override
+ public MdmUnitMeasureDO validateUnitMeasureExists(Long id) {
+ MdmUnitMeasureDO unitMeasure = unitMeasureMapper.selectById(id);
+ if (unitMeasure == null) {
+ throw exception(MDM_UNIT_MEASURE_NOT_EXISTS);
+ }
+ return unitMeasure;
+ }
+
+ private void validateUnitMeasureSaveData(MdmUnitMeasureSaveReqVO reqVO) {
+ // 鏍￠獙缂栫爜鍞竴
+ MdmUnitMeasureDO unit = unitMeasureMapper.selectByCode(reqVO.getCode());
+ if (unit != null && ObjUtil.notEqual(unit.getId(), reqVO.getId())) {
+ throw exception(MDM_UNIT_MEASURE_CODE_DUPLICATE);
+ }
+ // 鏍￠獙鍚嶇О鍞竴
+ MdmUnitMeasureDO sameName = unitMeasureMapper.selectByName(reqVO.getName());
+ if (sameName != null && ObjUtil.notEqual(sameName.getId(), reqVO.getId())) {
+ throw exception(MDM_UNIT_MEASURE_NAME_DUPLICATE);
+ }
+ }
+
+ @Override
+ public MdmUnitMeasureDO getUnitMeasure(Long id) {
+ return unitMeasureMapper.selectById(id);
+ }
+
+ @Override
+ public PageResult<MdmUnitMeasureDO> getUnitMeasurePage(MdmUnitMeasurePageReqVO pageReqVO) {
+ return unitMeasureMapper.selectPage(pageReqVO);
+ }
+
+ @Override
+ public List<MdmUnitMeasureDO> getUnitMeasureList(Collection<Long> ids) {
+ if (CollUtil.isEmpty(ids)) {
+ return Collections.emptyList();
+ }
+ return unitMeasureMapper.selectBatchIds(ids);
+ }
+
+ @Override
+ public MdmUnitMeasureDO getUnitMeasureByCode(String code) {
+ return unitMeasureMapper.selectByCode(code);
+ }
+
+}
--
Gitblit v1.9.3