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 | 132 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 132 insertions(+), 0 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 2715d91..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,19 +2,28 @@
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;
@@ -26,6 +35,8 @@
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;
@@ -42,8 +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.*;
@@ -57,11 +71,19 @@
@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
@@ -107,6 +129,70 @@
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();
}
@@ -414,4 +500,50 @@
}
}
+ @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