From 87733eb3623593da247c051593d64b8ff9e1d3a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 06 十一月 2026 19:00:39 +0800
Subject: [PATCH] feat(crm,mes): 扩展客户字段与重构批次号生成逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/MesWmTransactionServiceImpl.java | 85 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 76 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 17d0dc8..a6341be 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
@@ -14,7 +14,9 @@
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.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;
@@ -22,6 +24,7 @@
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;
@@ -57,6 +60,9 @@
@Resource
private MesWmWarehouseAreaService areaService;
+ @Resource
+ private MesWmMaterialStockBagService materialStockBagService;
+
@Override
@Transactional(rollbackFor = Exception.class)
public Long createTransaction(MesWmTransactionSaveReqDTO reqDTO) {
@@ -88,10 +94,11 @@
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())) {
+ || (reqDTO.getLocationId() != null && ObjUtil.notEqual(materialStock.getLocationId(), reqDTO.getLocationId()))
+ || (reqDTO.getAreaId() != null && ObjUtil.notEqual(materialStock.getAreaId(), reqDTO.getAreaId()))) {
throw exception(WM_MATERIAL_STOCK_SELECTION_MISMATCH);
}
} else if (isInbound) {
@@ -100,12 +107,20 @@
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) {
- throw exception(WM_MATERIAL_STOCK_NOT_EXISTS);
+ // 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) {
@@ -116,17 +131,68 @@
// 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())
+ .shipmentId(reqDTO.getShipmentId())
.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
@@ -215,20 +281,21 @@
if (Boolean.TRUE.equals(warehouse.getFrozen())) {
throw exception(WM_TRANSACTION_WAREHOUSE_FROZEN, warehouse.getName());
}
- // 1.2 妫�鏌ュ簱鍖哄喕缁�
+ // 1.2 妫�鏌ュ簱鍖哄喕缁擄紙鏈娇鐢ㄥ簱鍖烘椂璺宠繃锛�
MesWmWarehouseLocationDO location = locationService.validateWarehouseLocationExists(reqDTO.getLocationId());
- if (Boolean.TRUE.equals(location.getFrozen())) {
+ if (location != null && Boolean.TRUE.equals(location.getFrozen())) {
throw exception(WM_TRANSACTION_LOCATION_FROZEN, location.getName());
}
- // 1.3 妫�鏌ュ簱浣嶅喕缁�
+ // 1.3 妫�鏌ュ簱浣嶅喕缁擄紙鏈娇鐢ㄥ簱浣嶆椂璺宠繃锛�
MesWmWarehouseAreaDO area = areaService.validateWarehouseAreaExists(reqDTO.getAreaId());
- if (Boolean.TRUE.equals(area.getFrozen())) {
+ if (area != null && Boolean.TRUE.equals(area.getFrozen())) {
throw exception(WM_TRANSACTION_AREA_FROZEN, area.getName());
}
// 2. 妫�鏌ュ簱瀛樿褰曞喕缁�
if (Boolean.TRUE.equals(materialStock.getFrozen())) {
- throw exception(WM_TRANSACTION_STOCK_FROZEN, warehouse.getName(), location.getName(), area.getName());
+ throw exception(WM_TRANSACTION_STOCK_FROZEN, warehouse.getName(),
+ location != null ? location.getName() : "", area != null ? area.getName() : "");
}
}
--
Gitblit v1.9.3