From 1ba0dbfde5634c8bf2ec20891d6b226b996f6b59 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 02 九月 2026 14:24:38 +0800
Subject: [PATCH] refactor(mes): 优化MES生产扫码入库功能支持多类型扫码
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/MesWmTransactionServiceImpl.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 110 insertions(+), 9 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/MesWmTransactionServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/MesWmTransactionServiceImpl.java
index 83f1115..eb43c7e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/MesWmTransactionServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/MesWmTransactionServiceImpl.java
@@ -4,7 +4,9 @@
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.transaction.vo.MesWmTransactionPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.transaction.MesWmTransactionDO;
@@ -12,14 +14,17 @@
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.mysql.wm.transaction.MesWmTransactionMapper;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmStockStateEnum;
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.enums.wm.MesWmWarehouseTypeEnum;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
+import cn.iocoder.yudao.module.mes.service.wm.materialstockbag.MesWmMaterialStockBagService;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -47,13 +52,16 @@
@Resource
private MesWmBatchService batchService;
@Resource
- private MesMdItemService itemService;
+ private MesMdmItemService mdmItemService;
@Resource
private MesWmWarehouseService warehouseService;
@Resource
private MesWmWarehouseLocationService locationService;
@Resource
private MesWmWarehouseAreaService areaService;
+
+ @Resource
+ private MesWmMaterialStockBagService materialStockBagService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -75,26 +83,114 @@
// 1.5 鍏宠仈浜嬪姟鏍￠獙
checkRelatedTransaction(reqDTO);
- // 2.1 鑾峰彇鎴栧垱寤哄簱瀛樿褰�
- MesWmMaterialStockDO materialStock = materialStockService.getOrCreateMaterialStock(
- reqDTO.getItemId(), reqDTO.getWarehouseId(), reqDTO.getLocationId(), reqDTO.getAreaId(),
- reqDTO.getBatchId(), reqDTO.getBatchCode(), reqDTO.getVendorId(), reqDTO.getReceiptTime());
+ // 2.1 鑾峰彇搴撳瓨璁板綍
+ MesWmMaterialStockDO materialStock;
+ MesWmTransactionTypeEnum transactionType = MesWmTransactionTypeEnum.valueOf(reqDTO.getType());
+ boolean isInbound = transactionType != null && transactionType.isInbound();
+ if (reqDTO.getMaterialStockId() != null) {
+ // 浼犲叆浜� materialStockId锛岀洿鎺ヤ娇鐢�
+ materialStock = materialStockService.getMaterialStock(reqDTO.getMaterialStockId());
+ if (materialStock == null) {
+ throw exception(WM_MATERIAL_STOCK_NOT_EXISTS);
+ }
+ // 鏍￠獙鐗╂枡銆佹壒娆°�佷粨搴撶瓑缁村害涓�鑷达紙闃叉浼犲叆閿欒鐨� materialStockId锛�
+ if (ObjUtil.notEqual(materialStock.getItemId(), reqDTO.getItemId())
+ || ObjUtil.notEqual(materialStock.getWarehouseId(), reqDTO.getWarehouseId())
+ || ObjUtil.notEqual(materialStock.getLocationId(), reqDTO.getLocationId())
+ || ObjUtil.notEqual(materialStock.getAreaId(), reqDTO.getAreaId())) {
+ throw exception(WM_MATERIAL_STOCK_SELECTION_MISMATCH);
+ }
+ } else if (isInbound) {
+ // 鍏ュ簱浜嬪姟锛氭壘涓嶅埌鍒欒嚜鍔ㄥ垱寤哄簱瀛樿褰�
+ materialStock = materialStockService.getOrCreateMaterialStock(
+ reqDTO.getItemId(), reqDTO.getWarehouseId(), reqDTO.getLocationId(), reqDTO.getAreaId(),
+ reqDTO.getBatchId(), reqDTO.getBatchCode(), reqDTO.getVendorId(), reqDTO.getReceiptTime());
+ } else {
+ // 鍑哄簱浜嬪姟锛氬簱瀛樿褰曞繀椤诲凡瀛樺湪锛屼笉鍏佽鑷姩鍒涘缓锛堥櫎闈� checkFlag=false 鍏佽璐熷簱瀛橈級
+ materialStock = materialStockService.getMaterialStockByCompositeKey(
+ reqDTO.getItemId(), reqDTO.getWarehouseId(), reqDTO.getLocationId(), reqDTO.getAreaId(),
+ reqDTO.getBatchId(), reqDTO.getVendorId());
+ if (materialStock == null) {
+ // checkFlag=false 鏃跺厑璁歌礋搴撳瓨锛岃嚜鍔ㄥ垱寤哄簱瀛樿褰曪紙鏁伴噺灏嗕粠 0 鎵ｅ噺涓鸿礋鏁帮級
+ boolean allowNegative = !ObjUtil.defaultIfNull(reqDTO.getCheckFlag(), true);
+ if (allowNegative) {
+ materialStock = materialStockService.getOrCreateMaterialStock(
+ reqDTO.getItemId(), reqDTO.getWarehouseId(), reqDTO.getLocationId(), reqDTO.getAreaId(),
+ reqDTO.getBatchId(), reqDTO.getBatchCode(), reqDTO.getVendorId(), reqDTO.getReceiptTime());
+ } else {
+ throw exception(WM_MATERIAL_STOCK_NOT_EXISTS);
+ }
+ }
+ }
+ if (materialStock == null || materialStock.getId() == null) {
+ throw exception(WM_MATERIAL_STOCK_NOT_EXISTS);
+ }
// 2.2 鍐荤粨鏍￠獙锛堜粨搴撱�佸簱鍖恒�佸簱浣嶃�佸簱瀛樿褰曪級
checkFrozen(reqDTO, materialStock);
// 2.3 鏇存柊搴撳瓨鏁伴噺
boolean checkFlag = ObjUtil.defaultIfNull(reqDTO.getCheckFlag(), true);
materialStockService.updateMaterialStockQuantity(materialStock.getId(), reqDTO.getQuantity(), checkFlag);
+ MesWmMaterialStockDO updatedStock = materialStockService.getMaterialStock(materialStock.getId());
+ BigDecimal newQuantity = updatedStock.getQuantity();
+ // 搴撳瓨鐘舵�侊細鏄惧紡鎸囧畾浼樺厛锛堝鎵爜鍏ユ殏瀛樺簱锛夛紝鍚﹀垯鑷姩鍒ゅ畾鈥斺�斺墹0 宸插嚭搴擄紱
+ // >0 鏃朵粎鐩爣浠撳簱涓哄悎鏍煎簱(20)鎵嶇疆鍚堟牸鎬侊紝鍚﹀垯淇濇寔鏆傚瓨鎬�(10)锛�
+ // 閬垮厤鐩樼偣/璋冩暣/璋冩嫧绛夋搷浣滄妸鏆傚瓨浠撳簱搴撳瓨缈绘垚鍚堟牸鎬�
+ Integer stockState = reqDTO.getStockState();
+ if (stockState == null) {
+ if (newQuantity.signum() <= 0) {
+ stockState = MesWmStockStateEnum.OUT.getState();
+ } else {
+ MesWmWarehouseDO warehouse = warehouseService.getWarehouse(reqDTO.getWarehouseId());
+ boolean qualifiedWarehouse = warehouse != null
+ && MesWmWarehouseTypeEnum.QUALIFIED.getType().equals(warehouse.getType());
+ stockState = qualifiedWarehouse
+ ? MesWmStockStateEnum.QUALIFIED.getState() : MesWmStockStateEnum.TEMP.getState();
+ }
+ }
+ materialStockService.updateMaterialStockState(updatedStock.getId(), stockState);
// 3. 鎻掑叆浜嬪姟娴佹按
MesWmTransactionDO transaction = MesWmTransactionDO.builder()
.type(reqDTO.getType()).quantity(reqDTO.getQuantity()).transactionTime(LocalDateTime.now())
.itemId(reqDTO.getItemId()).batchId(reqDTO.getBatchId()).batchCode(reqDTO.getBatchCode())
+ .bagCodeId(reqDTO.getBagCodeId()).bagCode(reqDTO.getBagCode())
.warehouseId(reqDTO.getWarehouseId()).locationId(reqDTO.getLocationId()).areaId(reqDTO.getAreaId())
.bizType(reqDTO.getBizType()).bizId(reqDTO.getBizId()).bizCode(reqDTO.getBizCode()).bizLineId(reqDTO.getBizLineId())
.materialStockId(materialStock.getId()).relatedTransactionId(reqDTO.getRelatedTransactionId())
.build();
transactionMapper.insert(transaction);
+ // 4. 甯﹁鐮佹椂锛屽悓姝ョ淮鎶ゅ簱瀛樿鐮佹槑缁嗭紙鍏ュ簱寤虹珛/婵�娲汇�佸嚭搴撶疆宸插嚭搴撱�佺Щ鍏ヨ縼绉汇�佹姤搴燂級
+ boolean skipBagManage = ObjUtil.defaultIfNull(reqDTO.getSkipBagManage(), false);
+ if (!skipBagManage && (StrUtil.isNotBlank(reqDTO.getBagCode()) || reqDTO.getBagCodeId() != null)) {
+ handleStockBag(reqDTO, materialStock, transaction.getId(), transactionType);
+ }
return transaction.getId();
+ }
+
+ /**
+ * 鎸変簨鍔＄被鍨嬬淮鎶よ鐮佹槑缁嗭紝淇濊瘉姹囨�诲簱瀛樸�佽鐮佹槑缁嗐�佷簨鍔℃祦姘翠笁鑰呬竴鑷淬��
+ */
+ private void handleStockBag(MesWmTransactionSaveReqDTO reqDTO, MesWmMaterialStockDO materialStock,
+ Long transactionId, MesWmTransactionTypeEnum transactionType) {
+ switch (transactionType) {
+ case MOVE_IN:
+ // 绉诲叆/璋冩嫧/璐ㄦ杩佺Щ锛氭洿鏂版槑缁嗕綅缃笌鐘舵��
+ materialStockBagService.moveIn(reqDTO, materialStock, transactionId);
+ break;
+ case IN:
+ case ADJUST_IN:
+ // 鍏ュ簱/鐩樼泩锛氬缓绔嬫垨婵�娲绘槑缁�
+ materialStockBagService.inbound(reqDTO, materialStock, transactionId);
+ break;
+ case MOVE_OUT:
+ case OUT:
+ case ADJUST_OUT:
+ // 绉诲嚭/鍑哄簱/鐩樹簭锛氱疆涓哄凡鍑哄簱
+ materialStockBagService.outbound(reqDTO, transactionId);
+ break;
+ default:
+ break;
+ }
}
@Override
@@ -104,6 +200,11 @@
throw exception(WM_TRANSACTION_LIST_EMPTY);
}
reqDTOs.forEach(this::createTransaction);
+ }
+
+ @Override
+ public PageResult<MesWmTransactionDO> getTransactionPage(MesWmTransactionPageReqVO pageReqVO) {
+ return transactionMapper.selectPage(pageReqVO);
}
// ==================== 绉佹湁鏍￠獙鏂规硶 ====================
@@ -144,8 +245,8 @@
}
// 2. 鍏ュ簱鏃讹細鍚敤鎵规绠＄悊鐨勭墿鏂欙紝蹇呴』浼犻�掓壒娆″彿
if (inbound) {
- MesMdItemDO item = itemService.validateItemExists(reqDTO.getItemId());
- if (Boolean.TRUE.equals(item.getBatchFlag())) {
+ MesMdmItemDO item = mdmItemService.validateItemExists(reqDTO.getItemId());
+ if (Boolean.TRUE.equals(item.getIsBatchManaged())) {
if (StrUtil.isEmpty(reqDTO.getBatchCode()) && reqDTO.getBatchId() == null) {
throw exception(WM_TRANSACTION_BATCH_REQUIRED);
}
--
Gitblit v1.9.3