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-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java | 100 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 97 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
index f78cdbd..f8f4734 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
@@ -8,7 +8,9 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockAdjustReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockFreezeReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockListReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockMoveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemTypeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
@@ -17,6 +19,7 @@
import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstock.MesWmMaterialStockMapper;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemTypeService;
import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
@@ -52,6 +55,8 @@
@Resource
private MesMdmItemService mdmItemService;
+ @Resource
+ private MesMdItemService mdItemService;
@Resource
private MesMdItemTypeService itemTypeService;
@Resource
@@ -94,10 +99,13 @@
List<MesMdItemTypeDO> children = itemTypeService.getItemTypeChildrenList(pageReqVO.getItemTypeId());
itemTypeIds.addAll(convertSet(children, MesMdItemTypeDO::getId));
}
- // 1.2 瑙ｆ瀽 itemId
+ // 1.2 瑙ｆ瀽 itemId锛氬墠绔紶鐨勬槸 mes_md_item.id锛屽簱瀛樿〃瀛樼殑鏄� mdm_item_id锛岄渶瑕佽浆鎹�
Set<Long> itemIds = null;
if (pageReqVO.getItemId() != null) {
- itemIds = SetUtils.asSet(pageReqVO.getItemId());
+ MesMdItemDO item = mdItemService.getItem(pageReqVO.getItemId());
+ if (item != null && item.getMdmItemId() != null) {
+ itemIds = SetUtils.asSet(item.getMdmItemId());
+ }
}
// 1.3 瑙ｆ瀽 virtualFilter锛氳浆鎹负铏氭嫙浠� warehouseId
Long virtualWarehouseId = null;
@@ -181,7 +189,15 @@
.frozen(false)
.build();
materialStockMapper.insert(newStock);
- return newStock;
+ // 3. 閲嶆柊鏌ヨ锛岀‘淇濇嬁鍒版暟鎹簱鐢熸垚鐨勫畬鏁磋褰曪紙id銆乧reateTime 绛夛級
+ MesWmMaterialStockDO inserted = materialStockMapper.selectById(newStock.getId());
+ return inserted != null ? inserted : newStock;
+ }
+
+ @Override
+ public MesWmMaterialStockDO getMaterialStockByCompositeKey(Long itemId, Long warehouseId, Long locationId, Long areaId,
+ Long batchId, Long vendorId) {
+ return materialStockMapper.selectByCompositeKey(itemId, warehouseId, locationId, areaId, batchId, vendorId);
}
@Override
@@ -400,4 +416,82 @@
throw new IllegalArgumentException("鏃犳晥鐨勮川閲忕姸鎬佺被鍨�: " + qualityStatus.getClass().getName());
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void moveMaterialStock(MesWmMaterialStockMoveReqVO reqVO) {
+ // 1. 鏌ヨ鍘熷簱瀛樿褰�
+ MesWmMaterialStockDO sourceStock = validateMaterialStockExists(reqVO.getMaterialStockId());
+
+ // 2. 鏍￠獙搴撳瓨鏁伴噺鍏呰冻锛堝彲鐢ㄩ噺 = 鍦ㄥ簱鏁伴噺 - 鍐荤粨鏁伴噺 - 鍗犵敤閲忥級
+ BigDecimal availableQty = sourceStock.getQuantity() != null ? sourceStock.getQuantity() : BigDecimal.ZERO;
+ if (sourceStock.getFrozenQuantity() != null) {
+ availableQty = availableQty.subtract(sourceStock.getFrozenQuantity());
+ }
+ if (sourceStock.getReservedQuantity() != null) {
+ availableQty = availableQty.subtract(sourceStock.getReservedQuantity());
+ }
+ if (availableQty.compareTo(reqVO.getQuantity()) < 0) {
+ throw exception(WM_MATERIAL_STOCK_INSUFFICIENT);
+ }
+
+ // 3. 鏍￠獙搴撳瓨鏈喕缁�
+ if (Boolean.TRUE.equals(sourceStock.getFrozen())) {
+ throw exception(WM_MATERIAL_STOCK_FROZEN);
+ }
+
+ // 4. 鏍￠獙鐩爣搴撲綅娣锋斁瑙勫垯
+ checkAreaMixingRule(reqVO.getToAreaId(), sourceStock.getItemId(), sourceStock.getBatchId());
+
+ // 5. 鐢熸垚绉诲簱鍗曞彿
+ String moveCode = "MOVE_" + System.currentTimeMillis();
+
+ // 6. 鍒涘缓璋冩嫧绉诲嚭浜嬪姟锛堣礋鏁帮級
+ MesWmTransactionSaveReqDTO outTransaction = new MesWmTransactionSaveReqDTO()
+ .setType(MesWmTransactionTypeEnum.MOVE_OUT.getType())
+ .setBizType(MesBizTypeConstants.WM_TRANSFER_OUT)
+ .setBizId(sourceStock.getId())
+ .setBizCode(moveCode)
+ .setBizLineId(sourceStock.getId())
+ .setItemId(sourceStock.getItemId())
+ .setQuantity(reqVO.getQuantity().negate())
+ .setBatchId(sourceStock.getBatchId())
+ .setBatchCode(sourceStock.getBatchCode())
+ .setWarehouseId(sourceStock.getWarehouseId())
+ .setLocationId(sourceStock.getLocationId())
+ .setAreaId(sourceStock.getAreaId())
+ .setVendorId(sourceStock.getVendorId())
+ .setMaterialStockId(sourceStock.getId())
+ .setCheckFlag(true);
+ Long outTransactionId = wmTransactionService.createTransaction(outTransaction);
+
+ // 7. 鏌ユ壘鐩爣搴撲綅鐨勫簱瀛樿褰曪紙蹇界暐渚涘簲鍟嗭級锛岀敤浜庡悎骞跺簱瀛�
+ MesWmMaterialStockDO targetStock = materialStockMapper.selectByCompositeKeyIgnoreVendor(
+ sourceStock.getItemId(),
+ reqVO.getToWarehouseId(),
+ reqVO.getToLocationId(),
+ reqVO.getToAreaId(),
+ sourceStock.getBatchId()
+ );
+
+ // 8. 鍒涘缓璋冩嫧绉诲叆浜嬪姟锛堟鏁帮級锛屽叧鑱斿嚭搴撲簨鍔�
+ // 浣跨敤鐩爣搴撲綅宸叉湁搴撳瓨璁板綍鐨� vendorId锛堝鏋滄湁锛夛紝鍚﹀垯涓嶄紶
+ MesWmTransactionSaveReqDTO inTransaction = new MesWmTransactionSaveReqDTO()
+ .setType(MesWmTransactionTypeEnum.MOVE_IN.getType())
+ .setBizType(MesBizTypeConstants.WM_TRANSFER_IN)
+ .setBizId(sourceStock.getId())
+ .setBizCode(moveCode)
+ .setBizLineId(sourceStock.getId())
+ .setItemId(sourceStock.getItemId())
+ .setQuantity(reqVO.getQuantity())
+ .setBatchId(sourceStock.getBatchId())
+ .setBatchCode(sourceStock.getBatchCode())
+ .setWarehouseId(reqVO.getToWarehouseId())
+ .setLocationId(reqVO.getToLocationId())
+ .setAreaId(reqVO.getToAreaId())
+ .setVendorId(targetStock != null ? targetStock.getVendorId() : null)
+ .setRelatedTransactionId(outTransactionId)
+ .setCheckFlag(false);
+ wmTransactionService.createTransaction(inTransaction);
+ }
+
}
--
Gitblit v1.9.3