From d6ffbf2958eefb57fb36acc12709fe42f7bce556 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 09 十月 2026 14:51:13 +0800
Subject: [PATCH] fix: HRM 删除员工级联删除关联系统用户；MES 首页统计 summary 兼容设备状态为空
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueLineServiceImpl.java | 123 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 117 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueLineServiceImpl.java
index 4ed4684..2b84d90 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueLineServiceImpl.java
@@ -2,25 +2,42 @@
import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.line.MesWmProductIssueLinePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.line.MesWmProductIssueLineRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.line.MesWmProductIssueLineReturnableRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.line.MesWmProductIssueLineSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderBomDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productissue.MesWmProductIssueDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productissue.MesWmProductIssueLineDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueLineDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.productissue.MesWmProductIssueLineMapper;
-import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductIssueStatusEnum;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderBomService;
+import cn.iocoder.yudao.module.mes.service.wm.productissue.MesWmProductIssueDetailService;
+import cn.iocoder.yudao.module.mes.service.wm.productissue.MesWmProductIssueLineService;
+import cn.iocoder.yudao.module.mes.service.wm.productissue.MesWmProductIssueService;
+import cn.iocoder.yudao.module.mes.service.wm.returnissue.MesWmReturnIssueLineService;
+import cn.iocoder.yudao.module.mes.service.wm.unitconvert.MesWmItemUnitConvertService;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
+import java.util.Map;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_PRODUCT_ISSUE_LINE_ITEM_NOT_IN_BOM;
-import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_PRODUCT_ISSUE_LINE_NOT_EXISTS;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
/**
* MES 棰嗘枡鍑哄簱鍗曡 Service 瀹炵幇绫�
@@ -36,16 +53,25 @@
@Lazy
private MesWmProductIssueService issueService;
@Resource
- private MesMdmItemService mdmItemService;
+ private MesMdItemService mdmItemService;
@Resource
- private MesProWorkOrderBomService workOrderBomService;
+ @Lazy
+ private MesWmReturnIssueLineService returnIssueLineService;
+ @Resource
+ private MesMdUnitMeasureService unitMeasureService;
@Resource
@Lazy
private MesWmProductIssueDetailService issueDetailService;
+ @Resource
+ private MesProWorkOrderBomService workOrderBomService;
+ @Resource
+ private MesWmItemUnitConvertService itemUnitConvertService;
@Override
public Long createProductIssueLine(MesWmProductIssueLineSaveReqVO createReqVO) {
validateProductIssueLineSaveData(createReqVO);
+ // 鍙屽崟浣嶆崲绠楋細鎸夊綍鍏ュ崟浣嶆崲绠椾负鐗╂枡涓诲崟浣嶆暟閲�
+ fillPrimaryQuantity(createReqVO);
// 鎻掑叆
MesWmProductIssueLineDO line = BeanUtils.toBean(createReqVO, MesWmProductIssueLineDO.class);
@@ -58,10 +84,31 @@
// 鏍￠獙瀛樺湪
validateProductIssueLineExists(updateReqVO.getId());
validateProductIssueLineSaveData(updateReqVO);
+ // 鍙屽崟浣嶆崲绠楋細鎸夊綍鍏ュ崟浣嶆崲绠椾负鐗╂枡涓诲崟浣嶆暟閲�
+ fillPrimaryQuantity(updateReqVO);
// 鏇存柊
MesWmProductIssueLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductIssueLineDO.class);
issueLineMapper.updateById(updateObj);
+ }
+
+ /**
+ * 鍙屽崟浣嶆崲绠楋細閫夋嫨浜嗗綍鍏ュ崟浣嶆椂锛屾寜銆屽綍鍏ユ暟閲� 脳 鎹㈢畻姣旂巼銆嶅緱鍒扮墿鏂欎富鍗曚綅鍙ｅ緞鐨勯鏂欐暟閲�
+ *
+ * 鏈寜杈呭崟浣嶅綍鍏ユ椂蹇呴』鐩存帴濉啓棰嗘枡鏁伴噺
+ */
+ private void fillPrimaryQuantity(MesWmProductIssueLineSaveReqVO reqVO) {
+ if (reqVO.getEnterUnitMeasureId() != null) {
+ BigDecimal primaryQuantity = itemUnitConvertService.convertToPrimaryUnit(
+ reqVO.getItemId(), reqVO.getItemModelId(),
+ reqVO.getEnterUnitMeasureId(), reqVO.getEnterQuantity());
+ if (primaryQuantity != null) {
+ reqVO.setQuantity(primaryQuantity);
+ }
+ }
+ if (reqVO.getQuantity() == null) {
+ throw exception(WM_PRODUCT_ISSUE_LINE_QUANTITY_REQUIRED);
+ }
}
@Override
@@ -114,7 +161,7 @@
// 鏍￠獙鐗╂枡鍦ㄥ伐鍗� BOM 涓�
validateItemInWorkOrderBom(reqVO.getIssueId(), reqVO.getItemId());
// 鏍￠獙鐗╂枡瀛樺湪
- mdmItemService.mesValidateItemExists(reqVO.getItemId());
+ mdmItemService.validateItemExists(reqVO.getItemId());
}
private void validateItemInWorkOrderBom(Long issueId, Long itemId) {
@@ -132,4 +179,68 @@
}
}
+ @Override
+ public List<MesWmProductIssueLineReturnableRespVO> getReturnableList(Long workOrderId) {
+ // 1. 鏌ヨ璇ュ伐鍗曚笅宸插畬鎴愮殑棰嗘枡鍗�
+ List<MesWmProductIssueDO> finishedIssues = issueService.getFinishedIssuesByWorkOrderId(workOrderId);
+ if (CollUtil.isEmpty(finishedIssues)) {
+ return Collections.emptyList();
+ }
+
+ // 2. 鑾峰彇杩欎簺棰嗘枡鍗曠殑鎵�鏈夎
+ List<Long> issueIds = CollectionUtils.convertList(finishedIssues, MesWmProductIssueDO::getId);
+ List<MesWmProductIssueLineDO> lines = issueLineMapper.selectListByIssueIds(issueIds);
+ if (CollUtil.isEmpty(lines)) {
+ return Collections.emptyList();
+ }
+
+ // 3. 鎵归噺鏌ヨ宸查��鏁伴噺锛堟寜 issueLineId 姹囨�伙級
+ List<Long> lineIds = CollectionUtils.convertList(lines, MesWmProductIssueLineDO::getId);
+ List<MesWmReturnIssueLineDO> returnLines = returnIssueLineService.getReturnIssueLineListByIssueLineIds(lineIds);
+ // 鎸� issueLineId 姹囨�婚��鏂欐暟閲�
+ Map<Long, BigDecimal> returnedQtyMap = new java.util.HashMap<>();
+ for (MesWmReturnIssueLineDO returnLine : returnLines) {
+ if (returnLine.getIssueLineId() != null && returnLine.getQuantity() != null) {
+ returnedQtyMap.merge(returnLine.getIssueLineId(), returnLine.getQuantity(), BigDecimal::add);
+ }
+ }
+
+ // 4. 鎵归噺鏌ヨ鐗╂枡鍜屽崟浣嶄俊鎭�
+ Map<Long, MesMdItemDO> itemMap = mdmItemService.getItemMap(
+ CollectionUtils.convertSet(lines, MesWmProductIssueLineDO::getItemId));
+ Map<Long, MesMdUnitMeasureDO> unitMap = unitMeasureService.getUnitMeasureMap(
+ CollectionUtils.convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+
+ // 5. 缁勮缁撴灉锛岃繃婊ゅ彲閫�鏁伴噺 > 0 鐨勮
+ List<MesWmProductIssueLineReturnableRespVO> result = new ArrayList<>();
+ for (MesWmProductIssueLineDO line : lines) {
+ BigDecimal issuedQty = line.getQuantity() != null ? line.getQuantity() : BigDecimal.ZERO;
+ BigDecimal returnedQty = returnedQtyMap.getOrDefault(line.getId(), BigDecimal.ZERO);
+ BigDecimal returnableQty = issuedQty.subtract(returnedQty);
+
+ if (returnableQty.compareTo(BigDecimal.ZERO) > 0) {
+ MesWmProductIssueLineReturnableRespVO vo = new MesWmProductIssueLineReturnableRespVO();
+ vo.setId(line.getId());
+ vo.setItemId(line.getItemId());
+ vo.setBatchId(line.getBatchId());
+ vo.setQuantity(returnableQty);
+
+ // 濉厖鐗╂枡淇℃伅
+ MesMdItemDO item = itemMap.get(line.getItemId());
+ if (item != null) {
+ vo.setItemCode(item.getCode());
+ vo.setItemName(item.getName());
+ vo.setSpecification(item.getSpecification());
+ // 濉厖鍗曚綅淇℃伅
+ MesMdUnitMeasureDO unit = unitMap.get(item.getUnitMeasureId());
+ vo.setUnitMeasureName(unit != null ? unit.getName() : null);
+ }
+
+ result.add(vo);
+ }
+ }
+
+ return result;
+ }
+
}
--
Gitblit v1.9.3