From 0f792c9b3b88dc4b1b7b306f89e257d931d2d0bd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:38:57 +0800
Subject: [PATCH] 代码提交
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java | 75 ++++++++++++++++++++++++++-----------
1 files changed, 52 insertions(+), 23 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 529c4df..c84bcc0 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
@@ -33,6 +33,8 @@
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;
@@ -78,6 +80,8 @@
private MesWmWarehouseLocationService locationService;
@Resource
private MesWmWarehouseAreaService areaService;
+ @Resource
+ private MesWmTransactionMapper transactionMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -85,13 +89,15 @@
// 1. 鏍￠獙鍏宠仈鏁版嵁
validateReturnIssueSaveData(createReqVO);
- // 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());
+ // 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. 鎻掑叆涓昏〃
@@ -109,13 +115,15 @@
// 1.2 鏍￠獙鍏宠仈鏁版嵁
validateReturnIssueSaveData(updateReqVO);
- // 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());
+ // 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. 鏇存柊涓昏〃
@@ -232,7 +240,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 鍏堜粠铏氭嫙绾胯竟搴撳嚭搴擄紙搴撳瓨鍑忓皯锛�
@@ -241,15 +249,31 @@
.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)); // 鍏宠仈鍑哄簱浜嬪姟
@@ -348,12 +372,17 @@
*/
private void validateReturnIssueSaveData(MesWmReturnIssueSaveReqVO reqVO) {
validateCodeUnique(reqVO.getId(), reqVO.getCode());
- // 鏍￠獙 task 瀛樺湪
- MesProTaskDO task = taskService.validateTaskExists(reqVO.getTaskId());
- // 鏍￠獙 task 鍏宠仈鐨勫伐鍗曞凡纭
- Long workOrderId = reqVO.getWorkOrderId() != null ? reqVO.getWorkOrderId() : task.getWorkOrderId();
- if (workOrderId != null) {
- workOrderService.validateWorkOrderConfirmed(workOrderId);
+ // 鏍￠獙 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());
--
Gitblit v1.9.3