From 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:50:53 +0800
Subject: [PATCH] feat: 完善质检、生产、销售、财务与人事模块并接入审批流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferServiceImpl.java
index f9d5110..750e498 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferServiceImpl.java
@@ -59,6 +59,10 @@
// 鎻掑叆
MesWmTransferDO transfer = BeanUtils.toBean(createReqVO, MesWmTransferDO.class);
transfer.setStatus(MesWmTransferStatusEnum.PREPARE.getStatus());
+ // 鍐呴儴璋冩嫧锛堟垨鏈�夋嫨閰嶉�佹ā寮忥級鏃朵笉浼犫�滄槸鍚﹂厤閫佲�濓紝缁熶竴鎸夐潪閰嶉�佸鐞嗭紝閬垮厤蹇呭～鏍￠獙鎷︽埅
+ if (transfer.getDeliveryFlag() == null) {
+ transfer.setDeliveryFlag(false);
+ }
transferMapper.insert(transfer);
return transfer.getId();
}
@@ -72,6 +76,10 @@
// 鏇存柊
MesWmTransferDO updateObj = BeanUtils.toBean(updateReqVO, MesWmTransferDO.class);
+ // 鍐呴儴璋冩嫧锛堟垨鏈�夋嫨閰嶉�佹ā寮忥級鏃跺墠绔笉浼犫�滄槸鍚﹂厤閫佲�濓紝缁熶竴鎸夐潪閰嶉�佸鐞嗭紝閬垮厤蹇呭～鏍￠獙鎷︽埅
+ if (updateObj.getDeliveryFlag() == null) {
+ updateObj.setDeliveryFlag(false);
+ }
transferMapper.updateById(updateObj);
}
@@ -212,11 +220,12 @@
.setBizType(MesBizTypeConstants.WM_TRANSFER_OUT).setBizId(transfer.getId())
.setBizCode(transfer.getCode()).setBizLineId(line.getId()));
// 2.2 鍐嶆墽琛屽叆搴擄細璋冩嫧绉诲叆锛堝悜鐩爣浠撳簱澧炲姞搴撳瓨锛夛紝鍏ュ簱鏁伴噺绛変簬鐩稿悓鏄庣粏鐨勬暟閲�
- // 娉ㄦ剰锛氬叆搴撴椂涓嶄紶 vendorId锛屼互蹇界暐渚涘簲鍟嗙淮搴︼紝鍚堝苟鍒扮洰鏍囧簱浣嶅凡鏈夊簱瀛�
+ // 璋冨叆娌跨敤鏉ユ簮搴撳瓨鐨勪緵搴斿晢锛岄伩鍏嶄笌鐩爣搴撲綅鍏跺畠渚涘簲鍟嗙殑鍚岀墿鏂欏簱瀛樻贩鍚堛��
wmTransactionService.createTransaction(new MesWmTransactionSaveReqDTO()
.setType(MesWmTransactionTypeEnum.MOVE_IN.getType()).setItemId(line.getItemId()) // 鐗╂枡淇℃伅鏉ヨ嚜 line
.setQuantity(detail.getQuantity()) // 搴撳瓨澧炲姞锛堟寜 detail 鐨勬暟閲忓叆锛�
.setBatchId(line.getBatchId()).setBatchCode(batchCode) // 鎵规淇℃伅鏉ヨ嚜 line
+ .setVendorId(vendorId)
.setWarehouseId(detail.getToWarehouseId()).setLocationId(detail.getToLocationId()).setAreaId(detail.getToAreaId())
.setBizType(MesBizTypeConstants.WM_TRANSFER_IN).setBizId(transfer.getId())
.setBizCode(transfer.getCode()).setBizLineId(line.getId())
@@ -333,7 +342,7 @@
}
List<Long> materialStockIds = convertList(lines,
MesWmTransferLineDO::getMaterialStockId, line -> line.getMaterialStockId() != null);
- materialStockService.updateMaterialStockFrozen(materialStockIds, frozen);
+ materialStockService.setMaterialStockFreeze(materialStockIds, "TRANSFER", transferId, frozen);
}
@Override
--
Gitblit v1.9.3