From ffca46b39d25439a06a27cafda2ec523a3fb67cf Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 27 十月 2026 17:53:02 +0800
Subject: [PATCH] feat(mes): 增加盘号字段支持和优化报工质检流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java | 166 ++++++++++++++++++++++++++++---------------------------
1 files changed, 84 insertions(+), 82 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
index e380ac7..616cb63 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
@@ -5,13 +5,14 @@
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsSaveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.mps.MesProMpsDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.pro.mps.MesProMpsMergeItemDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.mps.MesProMpsMapper;
-import cn.iocoder.yudao.module.mes.dal.mysql.pro.mps.MesProMpsMergeItemMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.feedback.MesProFeedbackMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderMapper;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
@@ -22,6 +23,7 @@
import cn.iocoder.yudao.module.mes.enums.pro.MesProMpsStatusEnum;
import cn.iocoder.yudao.module.mes.enums.pro.MesProFeedbackStatusEnum;
import cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderSourceTypeEnum;
+import cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderStatusEnum;
import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProductService;
@@ -53,7 +55,7 @@
/**
* MES 鐢熶骇涓昏鍒掞紙MPS锛塖ervice 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -68,7 +70,9 @@
@Resource
private MesProMpsMapper mpsMapper;
@Resource
- private MesProMpsMergeItemMapper mergeItemMapper;
+ private ErpSaleOrderApi saleOrderApi;
+ @Resource
+ private PermissionApi permissionApi;
@Resource
private MesProWorkOrderService workOrderService;
@Resource
@@ -92,7 +96,7 @@
@Transactional(rollbackFor = Exception.class)
public Long createMps(Long saleOrderId, String saleOrderNo, Long saleOrderItemId,
Long mdmItemId, String productName, BigDecimal quantity, Long clientId,
- String requestDate, String remark) {
+ String requestDate, String remark, String reelNo) {
// 1. 鏍规嵁 MDM 鐗╂枡 ID 鏌ユ壘 MES 浜у搧
cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO mesItem = itemService.getItemByMdmItemId(mdmItemId);
if (mesItem == null) {
@@ -120,6 +124,7 @@
mps.setSaleOrderId(saleOrderId);
mps.setSaleOrderNo(saleOrderNo);
mps.setSaleOrderItemId(saleOrderItemId);
+ mps.setReelNo(reelNo);
mps.setProductId(mesItem.getId()); // 浣跨敤 MES 浜у搧 ID
mps.setQuantity(quantity);
mps.setQuantityProduced(BigDecimal.ZERO);
@@ -193,7 +198,14 @@
@Transactional(rollbackFor = Exception.class)
public Long issueMps(Long id) {
// 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
- MesProMpsDO mps = validateMpsExistsAndDraft(id);
+ MesProMpsDO mps = mpsMapper.selectByIdForUpdate(id);
+ if (mps == null) {
+ throw exception(PRO_MPS_NOT_EXISTS);
+ }
+ if (!MesProMpsStatusEnum.DRAFT.getStatus().equals(mps.getStatus())) {
+ throw exception(PRO_MPS_NOT_DRAFT);
+ }
+ validateIssuePermission(mps);
// 鍒涘缓鐢熶骇宸ュ崟
Long workOrderId = createWorkOrderFromMps(mps, mps.getQuantity());
@@ -209,66 +221,30 @@
return workOrderId;
}
+ private void validateIssuePermission(MesProMpsDO mps) {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ if (userId == null) {
+ throw exception(PRO_MPS_ISSUE_FORBIDDEN);
+ }
+ if (permissionApi.hasAnyRoles(userId, "super_admin")) {
+ return;
+ }
+ // 鎵嬪伐鍒涘缓涓旀病鏈夐攢鍞鍗曠殑璁″垝浠ヨ鍒掑垱寤轰汉涓哄噯銆�
+ String creator = mps.getCreator();
+ if (mps.getSaleOrderId() != null) {
+ var order = saleOrderApi.getSaleOrder(mps.getSaleOrderId()).getCheckedData();
+ creator = order != null ? order.getCreator() : null;
+ }
+ if (!String.valueOf(userId).equals(creator)) {
+ throw exception(PRO_MPS_ISSUE_FORBIDDEN);
+ }
+ }
+
+ /** 鏃у悎骞朵笅鍙戝叆鍙ｅ凡鍋滅敤锛涘巻鍙插悎骞惰褰曚粛鐢卞彇娑堝拰鏌ヨ閫昏緫澶勭悊銆� */
+ @Deprecated
@Override
- @Transactional(rollbackFor = Exception.class)
public Long mergeAndIssueMps(List<Long> mpsIds) {
- // 鏍￠獙 MPS 鍒楄〃
- if (CollUtil.isEmpty(mpsIds) || mpsIds.size() < 2) {
- throw exception(PRO_MPS_MERGE_AT_LEAST_TWO);
- }
-
- List<MesProMpsDO> mpsList = mpsMapper.selectBatchIds(mpsIds);
- if (mpsList.size() != mpsIds.size()) {
- throw exception(PRO_MPS_NOT_EXISTS);
- }
-
- // 鏍￠獙锛氬繀椤绘槸鐩稿悓浜у搧銆佽崏绋跨姸鎬�
- Long productId = null;
- for (MesProMpsDO mps : mpsList) {
- if (!MesProMpsStatusEnum.DRAFT.getStatus().equals(mps.getStatus())) {
- throw exception(PRO_MPS_NOT_DRAFT);
- }
- if (productId == null) {
- productId = mps.getProductId();
- } else if (!productId.equals(mps.getProductId())) {
- throw exception(PRO_MPS_MERGE_PRODUCT_MISMATCH);
- }
- }
-
- // 璁＄畻鍚堝苟鏁伴噺
- BigDecimal totalQuantity = mpsList.stream()
- .map(MesProMpsDO::getQuantity)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
-
- // 鍙栫涓�鏉� MPS 浣滀负涓昏褰曪紝鍒涘缓鐢熶骇宸ュ崟
- MesProMpsDO firstMps = mpsList.get(0);
- Long workOrderId = createWorkOrderFromMps(firstMps, totalQuantity);
-
- // 鐢熸垚鍚堝苟鎵规鍙�
- String mergeBatchNo = generateMergeBatchNo();
-
- // 鏇存柊鎵�鏈� MPS 鐘舵�侊紝璁板綍鍚堝苟鍏崇郴
- for (MesProMpsDO mps : mpsList) {
- mpsMapper.updateById(new MesProMpsDO()
- .setId(mps.getId())
- .setStatus(MesProMpsStatusEnum.ISSUED.getStatus())
- .setWorkOrderId(workOrderId)
- .setMergeFlag(1)
- .setMergeBatchNo(mergeBatchNo)
- .setIssueDate(LocalDateTime.now()));
-
- // 璁板綍鍚堝苟鏄庣粏
- MesProMpsMergeItemDO mergeItem = new MesProMpsMergeItemDO();
- mergeItem.setMergeBatchNo(mergeBatchNo);
- mergeItem.setMpsId(mps.getId());
- mergeItem.setWorkOrderId(workOrderId);
- mergeItem.setQuantity(mps.getQuantity());
- mergeItemMapper.insert(mergeItem);
- }
-
- log.info("[mergeAndIssueMps] MPS 鍚堝苟涓嬪彂鎴愬姛锛宮psIds={}, workOrderId={}, totalQuantity={}",
- mpsIds, workOrderId, totalQuantity);
- return workOrderId;
+ throw exception(PRO_MPS_MERGE_ISSUE_DISABLED);
}
@Override
@@ -282,14 +258,32 @@
throw exception(PRO_MPS_NOT_ISSUED);
}
- // 绾ц仈鍙栨秷鍏宠仈鐨勭敓浜у伐鍗�
+ // 绾ц仈鍙栨秷鍏宠仈鐨勭敓浜у伐鍗曪紙璺熼殢宸ュ崟褰撳墠鐘舵�侊紝涓斾笉璇激鍚堝苟涓嬪彂鐨勫叡浜伐鍗曪級
if (mps.getWorkOrderId() != null) {
- try {
- workOrderService.cancelWorkOrder(mps.getWorkOrderId());
- log.info("[cancelMps] 绾ц仈鍙栨秷鐢熶骇宸ュ崟锛寃orkOrderId={}", mps.getWorkOrderId());
- } catch (Exception e) {
- // 宸ュ崟鍙兘宸插畬鎴愭垨宸插彇娑堬紝璁板綍鏃ュ織浣嗕笉闃绘 MPS 鍙栨秷
- log.warn("[cancelMps] 鍙栨秷鐢熶骇宸ュ崟澶辫触锛寃orkOrderId={}锛屽師鍥狅細{}", mps.getWorkOrderId(), e.getMessage());
+ // 鏂板閫昏緫锛氳嫢璇ュ伐鍗曟湁鎶ュ伐璁板綍锛屽垯涓嶅厑璁稿彇娑� MPS
+ Long feedbackCount = feedbackMapper.selectCount(MesProFeedbackDO::getWorkOrderId, mps.getWorkOrderId());
+ if (feedbackCount != null && feedbackCount > 0) {
+ throw exception(PRO_MPS_WORK_ORDER_HAS_FEEDBACK);
+ }
+
+ // 1. 缁熻璇ュ伐鍗曡澶氬皯鏉� MPS 寮曠敤锛氬悎骞朵笅鍙戠殑澶氭潯 MPS 鍏变韩鍚屼竴涓伐鍗�
+ Long refCount = mpsMapper.selectCount(MesProMpsDO::getWorkOrderId, mps.getWorkOrderId());
+ if (refCount != null && refCount > 1) {
+ // 鍏变韩宸ュ崟锛氬彧鍙栨秷褰撳墠 MPS锛屼笉鍔ㄥ伐鍗�
+ log.info("[cancelMps] 鐢熶骇宸ュ崟({}) 琚� {} 鏉� MPS 鍏辩敤锛岃烦杩囩骇鑱斿彇娑堝伐鍗�",
+ mps.getWorkOrderId(), refCount);
+ } else {
+ MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(mps.getWorkOrderId());
+ if (workOrder != null
+ && MesProWorkOrderStatusEnum.CONFIRMED.getStatus().equals(workOrder.getStatus())) {
+ // 鍙湁"宸茬‘璁�"鐘舵�佺殑宸ュ崟鎵嶉渶瑕佺骇鑱斿彇娑�
+ workOrderService.cancelWorkOrder(mps.getWorkOrderId());
+ log.info("[cancelMps] 绾ц仈鍙栨秷鐢熶骇宸ュ崟锛寃orkOrderId={}", mps.getWorkOrderId());
+ } else {
+ // 宸ュ崟宸叉槸鑽夌/宸插畬鎴�/宸插彇娑堬紝鏃犻渶绾ц仈鍙栨秷锛岀洿鎺ュ彇娑� MPS
+ log.info("[cancelMps] 鐢熶骇宸ュ崟({}) 鐘舵�佷负 {}锛屾棤闇�绾ц仈鍙栨秷",
+ mps.getWorkOrderId(), workOrder != null ? workOrder.getStatus() : "null");
+ }
}
}
@@ -329,9 +323,7 @@
@Override
public PageResult<MesProMpsDO> getMpsPage(MesProMpsPageReqVO pageReqVO) {
- // 鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑瀹㈡埛 ID 鍒楄〃
- List<Long> permittedClientIds = customerApi.getPermittedCustomerIds();
- return mpsMapper.selectPage(pageReqVO, permittedClientIds);
+ return mpsMapper.selectPage(pageReqVO, (List<Long>) null);
}
@Override
@@ -424,6 +416,10 @@
* 鍒ゆ柇鍗曚釜 MPS 鏄惁瀹屾垚
*/
private boolean isMpsFinished(MesProMpsDO mps) {
+ // 宸插彇娑堢殑 MPS 瑙嗕负缁堟�侊紝涓嶅啀闃诲鐢熶骇瀹屾垚鍒ゆ柇锛堜笌 checkCanCreateSalesNotice 鐨勫彛寰勪繚鎸佷竴鑷达級
+ if (MesProMpsStatusEnum.CANCELED.getStatus().equals(mps.getStatus())) {
+ return true;
+ }
// 1. 宸茬敓浜ф暟閲� >= 璁″垝鏁伴噺
BigDecimal quantityProduced = ObjUtil.defaultIfNull(mps.getQuantityProduced(), BigDecimal.ZERO);
if (quantityProduced.compareTo(mps.getQuantity()) < 0) {
@@ -431,12 +427,13 @@
mps.getId(), quantityProduced, mps.getQuantity());
return false;
}
- // 2. 妫�鏌ュ伐鍗曚笅鎵�鏈夋姤宸ユ槸鍚﹀畬鎴愶紙纭繚璐ㄦ瀹屾垚锛�
+ // 2. 宸插鎵瑰緟妫�鐨勬姤宸ュ凡璁″叆鐢熶骇杩涘害锛屼笉浠ヨ川妫�鐘舵�侀樆濉炵敓浜у畬鎴愩��
if (mps.getWorkOrderId() != null) {
Long unfinishedCount = feedbackMapper.selectCount(
new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<MesProFeedbackDO>()
.eq(MesProFeedbackDO::getWorkOrderId, mps.getWorkOrderId())
- .ne(MesProFeedbackDO::getStatus, MesProFeedbackStatusEnum.FINISHED.getStatus()));
+ .notIn(MesProFeedbackDO::getStatus, MesProFeedbackStatusEnum.FINISHED.getStatus(),
+ MesProFeedbackStatusEnum.UNCHECK.getStatus()));
log.debug("[isMpsFinished] MPS {} unfinished feedback count: {}", mps.getId(), unfinishedCount);
if (unfinishedCount > 0) {
return false;
@@ -460,9 +457,8 @@
}
}
- /**
- * 鐢熸垚鍚堝苟鎵规鍙�
- */
+ /** 宸插仠鐢細鏃у悎骞朵笅鍙戞壒娆″彿鐢熸垚閫昏緫锛屼粎渚涜瘑鍒巻鍙插疄鐜帮紝涓嶅啀璋冪敤銆� */
+ @Deprecated
private String generateMergeBatchNo() {
return "MERGE" + System.currentTimeMillis();
}
@@ -519,8 +515,9 @@
}
Long routeId = routeProduct.getRouteId();
- // 2. 鏍￠獙宸ヨ壓璺嚎鏄惁鏈夊伐搴�
- List<MesProRouteProcessDO> routeProcesses = routeProcessService.getRouteProcessListByRouteId(routeId);
+ // 2. 鏍￠獙宸ヨ壓璺嚎鏄惁鏈夊伐搴忥紙鎸変骇鍝佽繃婊ゅ叾瀹冧骇鍝佺殑浜у嚭鐗╂枡锛�
+ List<MesProRouteProcessDO> routeProcesses = routeProcessService
+ .getRouteProcessListByProductId(mps.getProductId());
if (CollUtil.isEmpty(routeProcesses)) {
throw exception(PRO_ROUTE_ENABLE_NO_PROCESS);
}
@@ -533,6 +530,7 @@
workOrderReq.setOrderSourceType(MesProWorkOrderSourceTypeEnum.ORDER.getType());
workOrderReq.setOrderSourceCode(mps.getSaleOrderNo());
workOrderReq.setProductId(mps.getProductId());
+ workOrderReq.setReelNo(mps.getReelNo());
workOrderReq.setQuantity(quantity);
workOrderReq.setClientId(mps.getClientId());
workOrderReq.setRequestDate(mps.getRequestDate() != null ? mps.getRequestDate() : LocalDateTime.now());
@@ -560,6 +558,10 @@
.map(Long::valueOf).collect(Collectors.toList()));
}
process.setColorCode(rp.getColorCode());
+ // 甯﹀叆宸ヨ壓璺嚎浜у搧閰嶇疆鐨勬姤宸ヤ粨搴�
+ process.setWarehouseId(routeProduct.getWarehouseId());
+ process.setLocationId(routeProduct.getLocationId());
+ process.setAreaId(routeProduct.getAreaId());
// 甯﹀叆宸ュ簭鎶曟枡BOM
List<MesProRouteProductBomDO> routeBomItems = bomMap != null ? bomMap.get(rp.getProcessId()) : null;
if (CollUtil.isNotEmpty(routeBomItems)) {
@@ -595,4 +597,4 @@
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3