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/materialstock/MesWmMaterialStockServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 b3b7ec6..a84494a 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
@@ -347,8 +347,11 @@
@Override
public void checkAreaMixingRule(Long areaId, Long itemId, Long batchId) {
- // 1.1 鏍￠獙搴撲綅蹇呴』瀛樺湪
+ // 1.1 鏍￠獙搴撲綅蹇呴』瀛樺湪锛堟湭浣跨敤搴撲綅鏃惰烦杩囨贩鏀炬牎楠岋級
MesWmWarehouseAreaDO area = areaService.validateWarehouseAreaExists(areaId);
+ if (area == null) {
+ return;
+ }
// 2. 鏌ヨ褰撳墠搴撲綅涓婂凡鏈夌殑搴撳瓨璁板綍
List<MesWmMaterialStockDO> stockList = getMaterialStockListByAreaId(areaId);
@@ -388,8 +391,8 @@
|| 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)) {
+ || (locationId != null && ObjUtil.notEqual(stock.getLocationId(), locationId))
+ || (areaId != null && ObjUtil.notEqual(stock.getAreaId(), areaId))) {
throw exception(WM_MATERIAL_STOCK_SELECTION_MISMATCH);
}
// 3. 鏍￠獙搴撳瓨璁板綍蹇呴』鏄悎鏍煎簱锛堟殏瀛樺簱瀛樻湭璐ㄦ锛屼笉鍙敤浜庡嚭搴�/鍗犵敤锛�
--
Gitblit v1.9.3