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/returnissue/MesWmReturnIssueServiceImpl.java | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 154 insertions(+), 8 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java
index 41d05d5..0a067f0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java
@@ -3,16 +3,22 @@
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.returnissue.vo.MesWmReturnIssueImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.MesWmReturnIssueImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.MesWmReturnIssuePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.MesWmReturnIssueSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
+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.returnissue.MesWmReturnIssueDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueDetailDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueLineDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.task.MesProTaskIssueMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnissue.MesWmReturnIssueMapper;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
@@ -20,6 +26,7 @@
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
+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.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
@@ -29,15 +36,20 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.transaction.MesWmTransactionDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.transaction.MesWmTransactionMapper;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Collections;
+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.*;
@@ -61,6 +73,10 @@
@Resource
private MesProWorkOrderService workOrderService;
@Resource
+ private MesProTaskService taskService;
+ @Resource
+ private MesProTaskIssueMapper taskIssueMapper;
+ @Resource
private MesMdmItemService mdmItemService;
@Resource
private MesWmTransactionService wmTransactionService;
@@ -70,6 +86,8 @@
private MesWmWarehouseLocationService locationService;
@Resource
private MesWmWarehouseAreaService areaService;
+ @Resource
+ private MesWmTransactionMapper transactionMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -77,7 +95,18 @@
// 1. 鏍￠獙鍏宠仈鏁版嵁
validateReturnIssueSaveData(createReqVO);
- // 2. 鎻掑叆涓昏〃
+ // 2. 浠� task 鑷姩甯﹀叆 workOrderId 鍜� workstationId锛坱askId 闈炲繀濉級
+ if (createReqVO.getTaskId() != null) {
+ MesProTaskDO task = taskService.validateTaskExists(createReqVO.getTaskId());
+ if (createReqVO.getWorkOrderId() == null) {
+ createReqVO.setWorkOrderId(task.getWorkOrderId());
+ }
+ if (createReqVO.getWorkstationId() == null) {
+ createReqVO.setWorkstationId(task.getWorkstationId());
+ }
+ }
+
+ // 3. 鎻掑叆涓昏〃
MesWmReturnIssueDO issue = BeanUtils.toBean(createReqVO, MesWmReturnIssueDO.class);
issue.setStatus(MesWmReturnIssueStatusEnum.PREPARE.getStatus());
issueMapper.insert(issue);
@@ -92,11 +121,22 @@
// 1.2 鏍￠獙鍏宠仈鏁版嵁
validateReturnIssueSaveData(updateReqVO);
- // 2. 鏇存柊涓昏〃
+ // 2. 浠� task 鑷姩甯﹀叆 workOrderId 鍜� workstationId锛坱askId 闈炲繀濉級
+ if (updateReqVO.getTaskId() != null) {
+ MesProTaskDO task = taskService.validateTaskExists(updateReqVO.getTaskId());
+ if (updateReqVO.getWorkOrderId() == null) {
+ updateReqVO.setWorkOrderId(task.getWorkOrderId());
+ }
+ if (updateReqVO.getWorkstationId() == null) {
+ updateReqVO.setWorkstationId(task.getWorkstationId());
+ }
+ }
+
+ // 3. 鏇存柊涓昏〃
MesWmReturnIssueDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnIssueDO.class);
issueMapper.updateById(updateObj);
- // 3. 閫�鏂欑被鍨嬪彉鏇存椂锛屽埛鏂版墍鏈夎鐨勮川閲忕姸鎬�
+ // 4. 閫�鏂欑被鍨嬪彉鏇存椂锛屽埛鏂版墍鏈夎鐨勮川閲忕姸鎬�
if (ObjUtil.notEqual(oldIssue.getType(), updateReqVO.getType())) {
issueLineService.updateReturnIssueQualityStatusByIssueId(updateReqVO.getId(), updateReqVO.getType());
}
@@ -192,7 +232,10 @@
// 2. 閬嶅巻鎵�鏈夋槑缁嗭紝鍒涘缓搴撳瓨浜嬪姟锛堝鍔犲簱瀛� + 璁板綍娴佹按锛�
createTransactionList(issue);
- // 3. 鏇存柊閫�鏂欏崟鐘舵��
+ // 3. 鎵ｅ噺浠诲姟鎶曟枡璁板綍鐨勫彲鐢ㄩ噺
+ updateTaskIssueOnReturn(issue);
+
+ // 4. 鏇存柊閫�鏂欏崟鐘舵��
issueMapper.updateById(new MesWmReturnIssueDO()
.setId(id).setStatus(MesWmReturnIssueStatusEnum.FINISHED.getStatus()));
}
@@ -203,7 +246,7 @@
MesWmWarehouseLocationDO virtualLocation = locationService.getWarehouseLocationByCode(MesWmWarehouseLocationDO.WIP_VIRTUAL_LOCATION);
MesWmWarehouseAreaDO virtualArea = areaService.getWarehouseAreaByCode(MesWmWarehouseAreaDO.WIP_VIRTUAL_AREA);
- // 2. 閬嶅巻鏄庣粏锛屾瘡鏉℃槑缁嗕骇鐢� OUT锛堣櫄鎷熺嚎杈瑰簱鎵ｅ噺锛�+ IN锛堝疄闄呬粨搴撳鍔狅級
+ // 2. 閬嶅巻鏄庣粏锛屾瘡鏉℃槑缁嗕骇鐢� OUT锛堣櫄鎷熺嚎杈瑰簱鎵ｅ噺锛�+ IN锛堜笂鏋剁洰鏍囦粨搴撳鍔狅級
List<MesWmReturnIssueDetailDO> details = issueDetailService.getReturnIssueDetailListByIssueId(issue.getId());
for (MesWmReturnIssueDetailDO detail : details) {
// 2.1 鍏堜粠铏氭嫙绾胯竟搴撳嚭搴擄紙搴撳瓨鍑忓皯锛�
@@ -212,18 +255,64 @@
.setQuantity(detail.getQuantity().negate()) // 搴撳瓨鍑忓皯
.setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode())
.setWarehouseId(virtualWarehouse.getId()).setLocationId(virtualLocation.getId()).setAreaId(virtualArea.getId())
+ .setMaterialStockId(detail.getMaterialStockId()) // 鎸囧畾铏氭嫙绾胯竟搴撳簱瀛樿褰�
.setCheckFlag(false) // 绾胯竟搴撳厑璁歌礋搴撳瓨
.setBizType(MesBizTypeConstants.WM_RETURN_ISSUE).setBizId(issue.getId())
.setBizCode(issue.getCode()).setBizLineId(detail.getLineId()));
- // 2.2 鍐嶅叆瀹為檯浠撳簱锛堝簱瀛樺鍔狅級
+
+ // 2.2 纭畾涓婃灦鐩爣浠撳簱锛歞etail 鐨� warehouseId/locationId/areaId 鏄笂鏋剁洰鏍囷紙瀹為檯浠撳簱锛�
+ // 濡傛灉鍓嶇浠嶄紶浜嗚櫄鎷熺嚎杈瑰簱锛堝吋瀹规棫鏁版嵁锛夛紝鍒欓�氳繃浜嬪姟娴佹按鍙嶆煡鍘熷浠撳簱
+ Long targetWarehouseId = detail.getWarehouseId();
+ Long targetLocationId = detail.getLocationId();
+ Long targetAreaId = detail.getAreaId();
+ if (virtualWarehouse.getId().equals(targetWarehouseId) && detail.getMaterialStockId() != null) {
+ MesWmTransactionDO originalOutTx = transactionMapper.selectOriginalOutTransaction(detail.getMaterialStockId());
+ if (originalOutTx != null) {
+ targetWarehouseId = originalOutTx.getWarehouseId();
+ targetLocationId = originalOutTx.getLocationId();
+ targetAreaId = originalOutTx.getAreaId();
+ }
+ }
+
+ // 2.3 鍏ヤ笂鏋剁洰鏍囦粨搴擄紙搴撳瓨澧炲姞锛�
wmTransactionService.createTransaction(new MesWmTransactionSaveReqDTO()
.setType(MesWmTransactionTypeEnum.IN.getType()).setItemId(detail.getItemId())
.setQuantity(detail.getQuantity()) // 搴撳瓨澧炲姞锛堥��鏂欏洖浠擄級
.setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode())
- .setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId())
+ .setWarehouseId(targetWarehouseId).setLocationId(targetLocationId).setAreaId(targetAreaId)
.setBizType(MesBizTypeConstants.WM_RETURN_ISSUE).setBizId(issue.getId())
.setBizCode(issue.getCode()).setBizLineId(detail.getLineId())
.setRelatedTransactionId(outTransactionId)); // 鍏宠仈鍑哄簱浜嬪姟
+ }
+ }
+
+ /**
+ * 閫�鏂欏畬鎴愭椂锛屾墸鍑忎换鍔℃姇鏂欒褰曠殑鍙敤閲�
+ * 鎸夎閬嶅巻锛屾壘鍒板搴旂殑 task_issue 璁板綍锛屾墸鍑� availableQuantity銆乮ssuedQuantity
+ */
+ private void updateTaskIssueOnReturn(MesWmReturnIssueDO issue) {
+ List<MesWmReturnIssueLineDO> lines = issueLineService.getReturnIssueLineListByIssueId(issue.getId());
+ if (CollUtil.isEmpty(lines)) {
+ return;
+ }
+ for (MesWmReturnIssueLineDO line : lines) {
+ Long taskId = line.getTaskId() != null ? line.getTaskId() : issue.getTaskId();
+ if (taskId == null) {
+ continue;
+ }
+ // 鏌ユ壘璇� task + item + 鏉ユ簮涓洪鏂欏嚭搴撳崟 鐨勬姇鏂欒褰�
+ List<MesProTaskIssueDO> taskIssues = taskIssueMapper.selectListByTaskId(taskId);
+ MesProTaskIssueDO matchedIssue = CollUtil.findOne(taskIssues,
+ ti -> ti.getItemId().equals(line.getItemId())
+ && "PRODUCT_ISSUE".equals(ti.getSourceDocType()));
+ if (matchedIssue != null) {
+ // 鎵ｅ噺鎶曟枡閲忓拰鍙敤閲�
+ BigDecimal newIssuedQty = matchedIssue.getIssuedQuantity().subtract(line.getQuantity());
+ BigDecimal newAvailableQty = matchedIssue.getAvailableQuantity().subtract(line.getQuantity());
+ matchedIssue.setIssuedQuantity(newIssuedQty.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : newIssuedQty);
+ matchedIssue.setAvailableQuantity(newAvailableQty.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : newAvailableQty);
+ taskIssueMapper.updateById(matchedIssue);
+ }
}
}
@@ -289,10 +378,67 @@
*/
private void validateReturnIssueSaveData(MesWmReturnIssueSaveReqVO reqVO) {
validateCodeUnique(reqVO.getId(), reqVO.getCode());
- workOrderService.validateWorkOrderConfirmed(reqVO.getWorkOrderId());
+ // 鏍￠獙 task 瀛樺湪锛坱askId 闈炲繀濉紝浼犱簡鎵嶆牎楠岋級
+ if (reqVO.getTaskId() != null) {
+ MesProTaskDO task = taskService.validateTaskExists(reqVO.getTaskId());
+ // 鏍￠獙 task 鍏宠仈鐨勫伐鍗曞凡纭
+ Long workOrderId = reqVO.getWorkOrderId() != null ? reqVO.getWorkOrderId() : task.getWorkOrderId();
+ if (workOrderId != null) {
+ workOrderService.validateWorkOrderConfirmed(workOrderId);
+ }
+ } else if (reqVO.getWorkOrderId() != null) {
+ // 娌′紶 taskId 浣嗕紶浜� workOrderId锛屾牎楠屽伐鍗曞凡纭
+ workOrderService.validateWorkOrderConfirmed(reqVO.getWorkOrderId());
+ }
if (reqVO.getWorkstationId() != null) {
workstationService.validateWorkstationExistsAndEnable(reqVO.getWorkstationId());
}
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesWmReturnIssueImportRespVO importReturnIssueList(List<MesWmReturnIssueImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(WM_RETURN_ISSUE_IMPORT_LIST_IS_EMPTY);
+ }
+ MesWmReturnIssueImportRespVO respVO = MesWmReturnIssueImportRespVO.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;
+ }
+ MesWmReturnIssueDO existing = issueMapper.selectByCode(code);
+ if (existing != null && updateSupport) {
+ if (!MesWmReturnIssueStatusEnum.PREPARE.getStatus().equals(existing.getStatus())) {
+ respVO.getFailureCodes().put(key, "鍗曟嵁闈炶崏绋跨姸鎬侊紝涓嶅厑璁歌鐩栨洿鏂�");
+ return;
+ }
+ MesWmReturnIssueDO updateObj = BeanUtils.toBean(importItem, MesWmReturnIssueDO.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 {
+ MesWmReturnIssueDO createObj = BeanUtils.toBean(importItem, MesWmReturnIssueDO.class);
+ createObj.setId(null);
+ createObj.setStatus(MesWmReturnIssueStatusEnum.PREPARE.getStatus());
+ issueMapper.insert(createObj);
+ respVO.getCreateCodes().add(code);
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3