From 38d39b8c11096668d1a49eea84bbec298489d23e Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 07 九月 2026 16:44:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java | 83 +++++++++++++++++++++++++++++++++++++----
1 files changed, 75 insertions(+), 8 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
index 4f368d9..cccd0c3 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
@@ -278,14 +278,13 @@
throw exception(WM_MATERIAL_STOCK_REQUIRED);
}
MesWmMaterialStockDO stock = validateMaterialStockExists(materialStockId);
- // 2. 鏍￠獙搴撳瓨璁板綍鐨勭墿鏂欍�佹壒娆°�佷粨搴撱�佸簱鍖恒�佸簱浣嶇瓑淇℃伅涓庡墠绔�夋嫨鐨勪竴鑷达紝閬垮厤涓插崟鎴栬秺鏉冩彁浜�
- if (ObjUtil.notEqual(stock.getItemId(), itemId)
- || ObjUtil.notEqual(stock.getBatchId(), batchId)
- || (batchCode != null && ObjUtil.notEqual(stock.getBatchCode(), batchCode))
- || ObjUtil.notEqual(stock.getWarehouseId(), warehouseId)
- || ObjUtil.notEqual(stock.getLocationId(), locationId)
- || ObjUtil.notEqual(stock.getAreaId(), areaId)) {
- throw exception(WM_MATERIAL_STOCK_SELECTION_MISMATCH);
+ // 2. 鏍￠獙搴撳瓨璁板綍鐨勭墿鏂欍�佹壒娆°�佷粨搴撱�佸簱鍖恒�佸簱浣嶇瓑淇℃伅涓庡崟鎹竴鑷达紝閬垮厤涓插崟鎴栬秺鏉冩彁浜ゃ��
+ // 閫愪釜缁村害姣斿锛屽懡涓椂鎻愮ず鍏蜂綋宸紓锛堝簱瀛樹晶 vs 鍗曟嵁渚э級骞剁粰鍑哄鐞嗗姙娉曪紝閬垮厤绗肩粺鎶�"淇℃伅涓嶄竴鑷�"
+ String mismatch = buildSelectedStockMismatch(
+ stock, itemId, batchId, batchCode, warehouseId, locationId, areaId);
+ if (mismatch != null) {
+ throw new ServiceException(WM_MATERIAL_STOCK_SELECTION_MISMATCH.getCode(),
+ "鎵�閫夊簱瀛樿褰曚笌鍗曟嵁涓嶄竴鑷达細" + mismatch + "銆傝閲嶆柊閫夋嫨璇ョ墿鏂欐纭殑搴撳瓨锛涜嫢浠撳簱/搴撳尯/搴撲綅/鎵规琚鐢ㄦ棤娉曚慨鏀癸紝璇峰垹闄ゆ湰鏉℃槑缁嗗悗閲嶆柊娣诲姞銆�");
}
// 3. 鏍￠獙搴撳瓨鏁伴噺鍏呰冻锛堝鏋滃墠绔紶浜� quantity锛屽垯蹇呴』淇濊瘉搴撳瓨鏁伴噺 >= quantity锛�
if (quantity != null && stock.getQuantity() != null && stock.getQuantity().compareTo(quantity) < 0) {
@@ -294,6 +293,74 @@
return stock;
}
+ /**
+ * 閫愮淮搴︽瘮瀵瑰緟閫夊簱瀛樹笌鍗曟嵁浼犲叆鐨勪俊鎭紝杩斿洖绗竴涓笉涓�鑷寸淮搴︾殑鍙鎻忚堪锛涘叏閮ㄤ竴鑷磋繑鍥� null
+ */
+ private String buildSelectedStockMismatch(MesWmMaterialStockDO stock, Long itemId, Long batchId, String batchCode,
+ Long warehouseId, Long locationId, Long areaId) {
+ if (ObjUtil.notEqual(stock.getItemId(), itemId)) {
+ return "鎵�閫夊簱瀛樺綊灞炵墿鏂橻" + itemIdText(itemId) + "]锛屽崟鎹墿鏂欎负[" + itemIdText(stock.getItemId()) + "]";
+ }
+ if (ObjUtil.notEqual(stock.getBatchId(), batchId)) {
+ return "鎵�閫夊簱瀛樻壒娆" + batchText(stock.getBatchId(), stock.getBatchCode())
+ + "]锛屽崟鎹壒娆′负[" + batchText(batchId, batchCode) + "]";
+ }
+ if (batchCode != null && ObjUtil.notEqual(stock.getBatchCode(), batchCode)) {
+ return "鎵�閫夊簱瀛樻壒娆″彿[" + stock.getBatchCode() + "]锛屽崟鎹壒娆″彿涓篬" + batchCode + "]";
+ }
+ if (ObjUtil.notEqual(stock.getWarehouseId(), warehouseId)) {
+ return "鎵�閫夊簱瀛樹粨搴揫" + warehouseText(stock.getWarehouseId())
+ + "]锛屽崟鎹粨搴撲负[" + warehouseText(warehouseId) + "]";
+ }
+ if (ObjUtil.notEqual(stock.getLocationId(), locationId)) {
+ return "鎵�閫夊簱瀛樺簱鍖篬" + locationText(stock.getLocationId())
+ + "]锛屽崟鎹簱鍖轰负[" + locationText(locationId) + "]";
+ }
+ if (ObjUtil.notEqual(stock.getAreaId(), areaId)) {
+ return "鎵�閫夊簱瀛樺簱浣峓" + areaText(stock.getAreaId())
+ + "]锛屽崟鎹簱浣嶄负[" + areaText(areaId) + "]";
+ }
+ return null;
+ }
+
+ private String itemIdText(Long itemId) {
+ return itemId == null ? "鏈�夋嫨" : ("鐗╂枡ID=" + itemId);
+ }
+
+ private String batchText(Long batchId, String batchCode) {
+ if (StrUtil.isNotBlank(batchCode)) {
+ return batchCode;
+ }
+ return batchId == null ? "鏈�夋嫨" : ("鎵规ID=" + batchId);
+ }
+
+ private String warehouseText(Long warehouseId) {
+ if (warehouseId == null) {
+ return "鏈�夋嫨";
+ }
+ MesWmWarehouseDO warehouse = warehouseService.getWarehouse(warehouseId);
+ return warehouse != null && StrUtil.isNotBlank(warehouse.getName())
+ ? warehouse.getName() : ("浠撳簱ID=" + warehouseId);
+ }
+
+ private String locationText(Long locationId) {
+ if (locationId == null) {
+ return "鏈�夋嫨";
+ }
+ MesWmWarehouseLocationDO location = locationService.getWarehouseLocation(locationId);
+ return location != null && StrUtil.isNotBlank(location.getName())
+ ? location.getName() : ("搴撳尯ID=" + locationId);
+ }
+
+ private String areaText(Long areaId) {
+ if (areaId == null) {
+ return "鏈�夋嫨";
+ }
+ MesWmWarehouseAreaDO area = areaService.getWarehouseArea(areaId);
+ return area != null && StrUtil.isNotBlank(area.getName())
+ ? area.getName() : ("搴撲綅ID=" + areaId);
+ }
+
@Override
@Transactional(rollbackFor = Exception.class)
public Long adjustMaterialStockIn(MesWmMaterialStockAdjustReqVO reqVO) {
--
Gitblit v1.9.3