From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java | 250 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 245 insertions(+), 5 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java
index b193252..3f13334 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java
@@ -2,22 +2,41 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssueImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssueImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssuePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssueSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskIssueDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeDetailDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeLineDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productissue.MesWmProductIssueDetailDO;
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.mysql.pro.task.MesProTaskIssueMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productissue.MesWmProductIssueDetailMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productissue.MesWmProductIssueLineMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.productissue.MesWmProductIssueMapper;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductIssueStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductIssueTypeEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmStockReserveBizTypeEnum;
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.md.workstation.MesMdWorkstationService;
+import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskIssueService;
+import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
+import cn.iocoder.yudao.module.mes.service.wm.itemconsume.MesWmItemConsumeDetailService;
+import cn.iocoder.yudao.module.mes.service.wm.itemconsume.MesWmItemConsumeLineService;
import cn.iocoder.yudao.module.mes.service.wm.stockreserve.MesWmStockReserveService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
@@ -34,7 +53,11 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -48,15 +71,31 @@
@Resource
private MesWmProductIssueMapper issueMapper;
+ @Resource
+ private MesWmProductIssueLineMapper issueLineMapper;
+ @Resource
+ private MesWmProductIssueDetailMapper issueDetailMapper;
@Resource
private MesWmProductIssueLineService issueLineService;
@Resource
private MesWmProductIssueDetailService issueDetailService;
@Resource
+ private MesWmItemConsumeLineService itemConsumeLineService;
+ @Resource
+ private MesWmItemConsumeDetailService itemConsumeDetailService;
+ @Resource
private MesMdWorkstationService workstationService;
@Resource
private MesProWorkOrderService workOrderService;
+ @Resource
+ private MesProTaskService taskService;
+ @Resource
+ private MesProTaskIssueService taskIssueService;
+ @Resource
+ private MesProTaskIssueMapper taskIssueMapper;
+ @Resource
+ private MesMdItemService mdmItemService;
@Resource
private MesWmTransactionService wmTransactionService;
@Resource
@@ -74,10 +113,86 @@
// 1. 鏍￠獙鍏宠仈鏁版嵁
validateProductIssueSaveData(createReqVO);
- // 2. 鎻掑叆涓昏〃
+ // 2. 浠� task 鑷姩甯﹀叆 workOrderId 鍜� workstationId
+ MesProTaskDO task = taskService.validateTaskExists(createReqVO.getTaskId());
+ if (createReqVO.getWorkOrderId() == null) {
+ createReqVO.setWorkOrderId(task.getWorkOrderId());
+ }
+ if (createReqVO.getWorkstationId() == null) {
+ createReqVO.setWorkstationId(task.getWorkstationId());
+ }
+
+ // 3. 鎻掑叆涓昏〃
MesWmProductIssueDO issue = BeanUtils.toBean(createReqVO, MesWmProductIssueDO.class);
issue.setStatus(MesWmProductIssueStatusEnum.PREPARE.getStatus());
+ if (issue.getIssueType() == null) {
+ issue.setIssueType(MesWmProductIssueTypeEnum.NORMAL.getType());
+ }
issueMapper.insert(issue);
+ return issue.getId();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long generateBackflushProductIssue(MesProFeedbackDO feedback, MesWmItemConsumeDO consume) {
+ String code = "AUTO-BC-" + consume.getId();
+ MesWmProductIssueDO existing = issueMapper.selectByCode(code);
+ if (existing != null) {
+ return existing.getId();
+ }
+
+ LocalDateTime now = LocalDateTime.now();
+ MesWmProductIssueDO issue = MesWmProductIssueDO.builder()
+ .code(code)
+ .name("鍊掑啿鑷姩棰嗘枡-" + feedback.getCode())
+ .taskId(feedback.getTaskId())
+ .workOrderId(feedback.getWorkOrderId())
+ .workstationId(feedback.getWorkstationId())
+ .issueType(MesWmProductIssueTypeEnum.NORMAL.getType())
+ .issueDate(now)
+ .requiredTime(now)
+ .status(MesWmProductIssueStatusEnum.FINISHED.getStatus())
+ .remark("宸ュ簭鍊掑啿鑷姩鐢熸垚锛岀墿鏂欐秷鑰楀崟ID锛�" + consume.getId())
+ .build();
+ issueMapper.insert(issue);
+
+ List<MesWmItemConsumeLineDO> consumeLines = itemConsumeLineService
+ .getItemConsumeLineListByConsumeId(consume.getId());
+ List<MesWmItemConsumeDetailDO> consumeDetails = itemConsumeDetailService
+ .getItemConsumeDetailListByConsumeId(consume.getId());
+ Map<Long, List<MesWmItemConsumeDetailDO>> detailsByLineId = CollectionUtils.convertMultiMap(
+ consumeDetails, MesWmItemConsumeDetailDO::getLineId);
+
+ for (MesWmItemConsumeLineDO consumeLine : consumeLines) {
+ MesWmProductIssueLineDO issueLine = MesWmProductIssueLineDO.builder()
+ .issueId(issue.getId())
+ .taskId(feedback.getTaskId())
+ .itemId(consumeLine.getItemId())
+ .quantity(consumeLine.getQuantity())
+ .remark("宸ュ簭鍊掑啿鑷姩鐢熸垚")
+ .build();
+ issueLineMapper.insert(issueLine);
+
+ for (MesWmItemConsumeDetailDO consumeDetail : detailsByLineId
+ .getOrDefault(consumeLine.getId(), List.of())) {
+ MesMdItemDO item = mdmItemService.getItem(consumeDetail.getItemId());
+ Long mdmItemId = item != null && item.getMdmItemId() != null
+ ? item.getMdmItemId() : consumeDetail.getItemId();
+ issueDetailMapper.insert(MesWmProductIssueDetailDO.builder()
+ .issueId(issue.getId())
+ .lineId(issueLine.getId())
+ .materialStockId(consumeDetail.getMaterialStockId())
+ .itemId(mdmItemId)
+ .quantity(consumeDetail.getQuantity())
+ .batchId(consumeDetail.getBatchId())
+ .batchCode(consumeDetail.getBatchCode())
+ .warehouseId(consumeDetail.getWarehouseId())
+ .locationId(consumeDetail.getLocationId())
+ .areaId(consumeDetail.getAreaId())
+ .remark("宸ュ簭鍊掑啿鑷姩鐢熸垚")
+ .build());
+ }
+ }
return issue.getId();
}
@@ -89,7 +204,16 @@
// 1.2 鏍￠獙鍏宠仈鏁版嵁
validateProductIssueSaveData(updateReqVO);
- // 2. 鏇存柊涓昏〃
+ // 2. 浠� task 鑷姩甯﹀叆 workOrderId 鍜� workstationId
+ MesProTaskDO task = taskService.validateTaskExists(updateReqVO.getTaskId());
+ if (updateReqVO.getWorkOrderId() == null) {
+ updateReqVO.setWorkOrderId(task.getWorkOrderId());
+ }
+ if (updateReqVO.getWorkstationId() == null) {
+ updateReqVO.setWorkstationId(task.getWorkstationId());
+ }
+
+ // 3. 鏇存柊涓昏〃
MesWmProductIssueDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductIssueDO.class);
issueMapper.updateById(updateObj);
}
@@ -192,7 +316,10 @@
// 3. 閬嶅巻鎵�鏈夋槑缁嗭紝鍒涘缓搴撳瓨浜嬪姟锛堟墸鍑忓簱瀛� + 璁板綍娴佹按锛�
createTransactionList(issue);
- // 4. 鏇存柊鍑哄簱鍗曠姸鎬� + 棰嗘枡鏃ユ湡
+ // 4. 鑷姩鍒涘缓浠诲姟鎶曟枡璁板綍
+ createTaskIssueRecords(issue);
+
+ // 5. 鏇存柊鍑哄簱鍗曠姸鎬� + 棰嗘枡鏃ユ湡
issueMapper.updateById(new MesWmProductIssueDO()
.setId(id).setStatus(MesWmProductIssueStatusEnum.FINISHED.getStatus())
.setIssueDate(LocalDateTime.now()));
@@ -211,7 +338,7 @@
Long outTransactionId = wmTransactionService.createTransaction(new MesWmTransactionSaveReqDTO()
.setType(MesWmTransactionTypeEnum.OUT.getType()).setItemId(detail.getItemId())
.setQuantity(detail.getQuantity().negate()) // 搴撳瓨鍑忓皯
- .setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode())
+ .setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode()).setMaterialStockId(detail.getMaterialStockId())
.setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId())
.setBizType(MesBizTypeConstants.WM_ISSUE).setBizId(issue.getId())
.setBizCode(issue.getCode()).setBizLineId(detail.getLineId()));
@@ -224,6 +351,64 @@
.setBizType(MesBizTypeConstants.WM_ISSUE).setBizId(issue.getId())
.setBizCode(issue.getCode()).setBizLineId(detail.getLineId())
.setRelatedTransactionId(outTransactionId)); // 鍏宠仈鍑哄簱浜嬪姟
+ }
+ }
+
+ /**
+ * 棰嗘枡鍑哄簱瀹屾垚鏃讹紝鑷姩鍒涘缓浠诲姟鎶曟枡璁板綍
+ * 鎸夎閬嶅巻锛屾瘡琛屽垱寤轰竴鏉� task_issue 璁板綍
+ */
+ private void createTaskIssueRecords(MesWmProductIssueDO issue) {
+ List<MesWmProductIssueLineDO> lines = issueLineService.getProductIssueLineListByIssueId(issue.getId());
+ if (CollUtil.isEmpty(lines)) {
+ return;
+ }
+
+ // 鎵归噺鏌ヨ鐗╂枡淇℃伅锛堣幏鍙� unitMeasureId锛�
+ Map<Long, MesMdItemDO> itemMap = mdmItemService.getItemMap(
+ CollectionUtils.convertSet(lines, MesWmProductIssueLineDO::getItemId));
+
+ // 鑾峰彇鏄庣粏鍒楄〃锛岀敤浜庢彁鍙� batchCode
+ List<MesWmProductIssueDetailDO> details = issueDetailService.getProductIssueDetailListByIssueId(issue.getId());
+ Map<Long, List<MesWmProductIssueDetailDO>> detailMapByLineId = CollectionUtils.convertMultiMap(
+ details, MesWmProductIssueDetailDO::getLineId);
+
+ for (MesWmProductIssueLineDO line : lines) {
+ // 琛岀殑 taskId 浼樺厛锛屽惁鍒欏彇涓昏〃鐨� taskId
+ Long taskId = line.getTaskId() != null ? line.getTaskId() : issue.getTaskId();
+ if (taskId == null) {
+ continue;
+ }
+
+ // 鑾峰彇鐗╂枡鍗曚綅
+ MesMdItemDO item = itemMap.get(line.getItemId());
+ Long unitMeasureId = item != null ? item.getUnitMeasureId() : null;
+
+ // 鑾峰彇鎵规鍙凤細鍙栬琛岀涓�涓槑缁嗙殑 batchCode
+ String batchCode = null;
+ List<MesWmProductIssueDetailDO> lineDetails = detailMapByLineId.get(line.getId());
+ if (CollUtil.isNotEmpty(lineDetails)) {
+ MesWmProductIssueDetailDO firstDetail = lineDetails.get(0);
+ batchCode = firstDetail.getBatchCode();
+ }
+
+ // 鍒涘缓浠诲姟鎶曟枡璁板綍
+ MesProTaskIssueDO taskIssue = MesProTaskIssueDO.builder()
+ .taskId(taskId)
+ .workOrderId(issue.getWorkOrderId())
+ .workstationId(issue.getWorkstationId())
+ .sourceDocType("PRODUCT_ISSUE")
+ .sourceDocId(issue.getId())
+ .sourceLineId(line.getId())
+ .sourceDocCode(issue.getCode())
+ .batchCode(batchCode)
+ .itemId(line.getItemId())
+ .unitMeasureId(unitMeasureId)
+ .issuedQuantity(line.getQuantity())
+ .availableQuantity(line.getQuantity()) // 鍒濆鍏ㄥ彲鐢�
+ .usedQuantity(BigDecimal.ZERO)
+ .build();
+ taskIssueMapper.insert(taskIssue);
}
}
@@ -241,6 +426,9 @@
// 閲婃斁搴撳瓨鍗犵敤
stockReserveService.releaseReserve(MesWmStockReserveBizTypeEnum.PRODUCT_ISSUE.getType(), id);
+
+ // 鍒犻櫎閫氳繃璇ラ鏂欏崟鍒涘缓鐨勪换鍔℃姇鏂欒褰�
+ taskIssueService.deleteTaskIssueBySourceDoc("PRODUCT_ISSUE", id);
// 鍙栨秷
issueMapper.updateById(new MesWmProductIssueDO()
@@ -300,10 +488,62 @@
*/
private void validateProductIssueSaveData(MesWmProductIssueSaveReqVO reqVO) {
validateCodeUnique(reqVO.getId(), reqVO.getCode());
- workOrderService.validateWorkOrderConfirmed(reqVO.getWorkOrderId());
+ // 鏍￠獙 task 瀛樺湪
+ MesProTaskDO task = taskService.validateTaskExists(reqVO.getTaskId());
+ // 鏍￠獙 task 鍏宠仈鐨勫伐鍗曞凡纭
+ Long workOrderId = reqVO.getWorkOrderId() != null ? reqVO.getWorkOrderId() : task.getWorkOrderId();
+ if (workOrderId != null) {
+ workOrderService.validateWorkOrderConfirmed(workOrderId);
+ }
if (reqVO.getWorkstationId() != null) {
workstationService.validateWorkstationExistsAndEnable(reqVO.getWorkstationId());
}
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesWmProductIssueImportRespVO importProductIssueList(List<MesWmProductIssueImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(WM_PRODUCT_ISSUE_IMPORT_LIST_IS_EMPTY);
+ }
+ MesWmProductIssueImportRespVO respVO = MesWmProductIssueImportRespVO.builder()
+ .createCodes(new ArrayList<>()).updateCodes(new ArrayList<>())
+ .failureCodes(new LinkedHashMap<>()).build();
+ AtomicInteger index = new AtomicInteger(1);
+ importList.forEach(importItem -> {
+ int currentIndex = index.getAndIncrement();
+ String code = importItem.getCode();
+ String key = StrUtil.blankToDefault(code, "绗� " + currentIndex + " 琛�");
+ if (StrUtil.isBlank(code)) {
+ respVO.getFailureCodes().put(key, "鍗曞彿涓嶈兘涓虹┖");
+ return;
+ }
+ if (StrUtil.isBlank(importItem.getName())) {
+ respVO.getFailureCodes().put(key, "鍚嶇О涓嶈兘涓虹┖");
+ return;
+ }
+ MesWmProductIssueDO existing = issueMapper.selectByCode(code);
+ if (existing != null && updateSupport) {
+ if (!MesWmProductIssueStatusEnum.PREPARE.getStatus().equals(existing.getStatus())) {
+ respVO.getFailureCodes().put(key, "鍗曟嵁闈炶崏绋跨姸鎬侊紝涓嶅厑璁歌鐩栨洿鏂�");
+ return;
+ }
+ MesWmProductIssueDO updateObj = BeanUtils.toBean(importItem, MesWmProductIssueDO.class);
+ updateObj.setId(existing.getId());
+ updateObj.setStatus(existing.getStatus());
+ issueMapper.updateById(updateObj);
+ respVO.getUpdateCodes().add(code);
+ } else if (existing != null) {
+ respVO.getFailureCodes().put(key, "鍗曞彿宸插瓨鍦細" + code);
+ } else {
+ MesWmProductIssueDO createObj = BeanUtils.toBean(importItem, MesWmProductIssueDO.class);
+ createObj.setId(null);
+ createObj.setStatus(MesWmProductIssueStatusEnum.PREPARE.getStatus());
+ issueMapper.insert(createObj);
+ respVO.getCreateCodes().add(code);
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3