From 0889e6b6045796115b254e34237a932d9241c0f8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 10:54:50 +0800
Subject: [PATCH] 诚发五金:入库/调整/移库/调拨/退料/盘点不再要求手选库区库位,后端自动落到仓库默认库区库位

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java                             |   28 ++++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockAdjustReqVO.java                 |    6 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesDetailServiceImpl.java                           |   12 ++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/detail/MesWmReturnIssueDetailSaveReqVO.java          |    6 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptLineServiceImpl.java                             |   21 +++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java                       |   12 +
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/result/MesWmStockTakingTaskResultSaveReqVO.java |    6 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/vo/detail/MesWmTransferDetailSaveReqVO.java                |    6 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockMoveReqVO.java                   |    6 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueDetailServiceImpl.java                           |   12 ++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskResultServiceImpl.java                  |   39 +++++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/detail/MesWmReturnSalesDetailSaveReqVO.java          |    6 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseDefaultService.java                                  |   31 +++++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferDetailServiceImpl.java                                 |   12 ++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/line/MesWmMiscReceiptLineSaveReqVO.java              |    6 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/MesWmTransactionServiceImpl.java                                 |   22 +++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseDefaultServiceImpl.java                              |   92 +++++++++++++++
 17 files changed, 286 insertions(+), 37 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockAdjustReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockAdjustReqVO.java
index 612d289..c1eecb1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockAdjustReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockAdjustReqVO.java
@@ -27,12 +27,10 @@
     @NotNull(message = "浠撳簱ID涓嶈兘涓虹┖")
     private Long warehouseId;
 
-    @Schema(description = "搴撳尯ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "搴撳尯ID涓嶈兘涓虹┖")
+    @Schema(description = "搴撳尯ID锛堝彲閫夛紝鏈紶鏃惰惤鍒颁粨搴撶殑榛樿搴撳尯锛�", example = "1")
     private Long locationId;
 
-    @Schema(description = "搴撲綅ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "搴撲綅ID涓嶈兘涓虹┖")
+    @Schema(description = "搴撲綅ID锛堝彲閫夛紝鏈紶鏃惰惤鍒颁粨搴撶殑榛樿搴撲綅锛�", example = "1")
     private Long areaId;
 
     // ========== 鎵规鐩稿叧瀛楁 ==========
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockMoveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockMoveReqVO.java
index d045090..8c6cf28 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockMoveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockMoveReqVO.java
@@ -18,12 +18,10 @@
     @NotNull(message = "鐩爣浠撳簱涓嶈兘涓虹┖")
     private Long toWarehouseId;
 
-    @Schema(description = "鐩爣搴撳尯ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "鐩爣搴撳尯涓嶈兘涓虹┖")
+    @Schema(description = "鐩爣搴撳尯ID锛堝彲閫夛紝鏈紶鏃惰惤鍒扮洰鏍囦粨搴撶殑榛樿搴撳尯锛�", example = "1")
     private Long toLocationId;
 
-    @Schema(description = "鐩爣搴撲綅ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "鐩爣搴撲綅涓嶈兘涓虹┖")
+    @Schema(description = "鐩爣搴撲綅ID锛堝彲閫夛紝鏈紶鏃惰惤鍒扮洰鏍囦粨搴撶殑榛樿搴撲綅锛�", example = "1")
     private Long toAreaId;
 
     @Schema(description = "绉诲簱鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/line/MesWmMiscReceiptLineSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/line/MesWmMiscReceiptLineSaveReqVO.java
index 5eaf187..0a12dd5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/line/MesWmMiscReceiptLineSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/line/MesWmMiscReceiptLineSaveReqVO.java
@@ -34,12 +34,10 @@
     @NotNull(message = "浠撳簱涓嶈兘涓虹┖")
     private Long warehouseId;
 
-    @Schema(description = "搴撳尯缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "搴撳尯涓嶈兘涓虹┖")
+    @Schema(description = "搴撳尯缂栧彿锛堜笉浼犳椂浣跨敤浠撳簱鐨勯粯璁ゅ簱鍖猴級", example = "1")
     private Long locationId;
 
-    @Schema(description = "搴撲綅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "搴撲綅涓嶈兘涓虹┖")
+    @Schema(description = "搴撲綅缂栧彿锛堜笉浼犳椂浣跨敤浠撳簱鐨勯粯璁ゅ簱浣嶏級", example = "1")
     private Long areaId;
 
     @Schema(description = "澶囨敞", example = "澶囨敞")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/detail/MesWmReturnIssueDetailSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/detail/MesWmReturnIssueDetailSaveReqVO.java
index e5ff434..19dc2f6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/detail/MesWmReturnIssueDetailSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/detail/MesWmReturnIssueDetailSaveReqVO.java
@@ -44,12 +44,10 @@
     @NotNull(message = "浠撳簱缂栧彿涓嶈兘涓虹┖")
     private Long warehouseId;
 
-    @Schema(description = "搴撳尯缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "搴撳尯缂栧彿涓嶈兘涓虹┖")
+    @Schema(description = "搴撳尯缂栧彿锛堜笉浼犳椂浣跨敤浠撳簱鐨勯粯璁ゅ簱鍖猴級", example = "1")
     private Long locationId;
 
-    @Schema(description = "搴撲綅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "搴撲綅缂栧彿涓嶈兘涓虹┖")
+    @Schema(description = "搴撲綅缂栧彿锛堜笉浼犳椂浣跨敤浠撳簱鐨勯粯璁ゅ簱浣嶏級", example = "1")
     private Long areaId;
 
     @Schema(description = "澶囨敞", example = "澶囨敞")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/detail/MesWmReturnSalesDetailSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/detail/MesWmReturnSalesDetailSaveReqVO.java
index 2df2281..54a8d5c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/detail/MesWmReturnSalesDetailSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/detail/MesWmReturnSalesDetailSaveReqVO.java
@@ -46,12 +46,10 @@
     @NotNull(message = "浠撳簱ID涓嶈兘涓虹┖")
     private Long warehouseId;
 
-    @Schema(description = "搴撳尯ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "搴撳尯ID涓嶈兘涓虹┖")
+    @Schema(description = "搴撳尯ID锛堜笉浼犳椂浣跨敤浠撳簱鐨勯粯璁ゅ簱鍖猴級", example = "1")
     private Long locationId;
 
-    @Schema(description = "搴撲綅ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "搴撲綅ID涓嶈兘涓虹┖")
+    @Schema(description = "搴撲綅ID锛堜笉浼犳椂浣跨敤浠撳簱鐨勯粯璁ゅ簱浣嶏級", example = "1")
     private Long areaId;
 
     @Schema(description = "澶囨敞", example = "澶囨敞")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/result/MesWmStockTakingTaskResultSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/result/MesWmStockTakingTaskResultSaveReqVO.java
index 9835883..ca9e526 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/result/MesWmStockTakingTaskResultSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/result/MesWmStockTakingTaskResultSaveReqVO.java
@@ -37,12 +37,10 @@
     @NotNull(message = "浠撳簱 ID 涓嶈兘涓虹┖")
     private Long warehouseId;
 
-    @Schema(description = "搴撳尯 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "搴撳尯 ID 涓嶈兘涓虹┖")
+    @Schema(description = "搴撳尯 ID锛堜笉浼犳椂浣跨敤浠撳簱鐨勯粯璁ゅ簱鍖猴級", example = "1")
     private Long locationId;
 
-    @Schema(description = "搴撲綅 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "搴撲綅 ID 涓嶈兘涓虹┖")
+    @Schema(description = "搴撲綅 ID锛堜笉浼犳椂浣跨敤浠撳簱鐨勯粯璁ゅ簱浣嶏級", example = "1")
     private Long areaId;
 
     @Schema(description = "鐩樼偣鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.000000")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/vo/detail/MesWmTransferDetailSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/vo/detail/MesWmTransferDetailSaveReqVO.java
index 7e93f25..15997ad 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/vo/detail/MesWmTransferDetailSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/vo/detail/MesWmTransferDetailSaveReqVO.java
@@ -38,12 +38,10 @@
     @NotNull(message = "绉诲叆浠撳簱缂栧彿涓嶈兘涓虹┖")
     private Long toWarehouseId;
 
-    @Schema(description = "绉诲叆搴撳尯缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "绉诲叆搴撳尯缂栧彿涓嶈兘涓虹┖")
+    @Schema(description = "绉诲叆搴撳尯缂栧彿锛堜笉浼犳椂浣跨敤绉诲叆浠撳簱鐨勯粯璁ゅ簱鍖猴級", example = "1")
     private Long toLocationId;
 
-    @Schema(description = "绉诲叆搴撲綅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "绉诲叆搴撲綅缂栧彿涓嶈兘涓虹┖")
+    @Schema(description = "绉诲叆搴撲綅缂栧彿锛堜笉浼犳椂浣跨敤绉诲叆浠撳簱鐨勯粯璁ゅ簱浣嶏級", example = "1")
     private Long toAreaId;
 
     @Schema(description = "澶囨敞", example = "澶囨敞淇℃伅")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java
index f3c863f..f2cce0f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java
@@ -33,11 +33,19 @@
                 .orderByAsc(MesWmStockTakingTaskLineDO::getId));
     }
 
+    /**
+     * 鎸� 浠诲姟 + 鐗╂枡 + 搴撲綅 鏌ヨ鐩樼偣娓呭崟琛�
+     *
+     * 鍚屼竴鐗╂枡鍦ㄥ悓涓�搴撲綅鍙兘鍥犳壒娆�/渚涘簲鍟嗕笉鍚屽瓨鍦ㄥ琛岋紝姝ゆ椂鍙栨渶鏃╃敓鎴愮殑涓�琛岋紝
+     * 閬垮厤 selectOne 鍥犲琛岀洿鎺ユ姏寮傚父锛堢敤鎴锋湭閫夋嫨鐩樼偣娓呭崟鏃惰蛋璇ュ厹搴曢�昏緫锛夈��
+     */
     default MesWmStockTakingTaskLineDO selectByTaskIdAndItemIdAndAreaId(Long taskId, Long itemId, Long areaId) {
-        return selectOne(new LambdaQueryWrapperX<MesWmStockTakingTaskLineDO>()
+        List<MesWmStockTakingTaskLineDO> list = selectList(new LambdaQueryWrapperX<MesWmStockTakingTaskLineDO>()
                 .eq(MesWmStockTakingTaskLineDO::getTaskId, taskId)
                 .eq(MesWmStockTakingTaskLineDO::getItemId, itemId)
-                .eqIfPresent(MesWmStockTakingTaskLineDO::getAreaId, areaId));
+                .eqIfPresent(MesWmStockTakingTaskLineDO::getAreaId, areaId)
+                .orderByAsc(MesWmStockTakingTaskLineDO::getId));
+        return list.isEmpty() ? null : list.get(0);
     }
 
 }
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 d4a42da..1f93da2 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
@@ -39,6 +39,7 @@
 import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
 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.MesWmWarehouseDefaultService;
 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
 import com.mzt.logapi.starter.annotation.LogRecord;
@@ -85,6 +86,9 @@
     @Resource
     @Lazy
     private MesWmWarehouseService warehouseService;
+    @Resource
+    @Lazy
+    private MesWmWarehouseDefaultService warehouseDefaultService;
     @Resource
     @Lazy
     private MesWmTransactionService wmTransactionService;
@@ -245,6 +249,10 @@
 
     @Override
     public void checkAreaMixingRule(Long areaId, Long itemId, Long batchId) {
+        // 鏈寚瀹氬簱浣嶏紙瀹㈡埛鏈惎鐢ㄥ簱鍖�/搴撲綅绠$悊锛夋椂涓嶆牎楠屾贩鏀撅紝鍚庣画鍏ュ簱浜嬪姟浼氳惤鍒颁粨搴撻粯璁ゅ簱浣�
+        if (areaId == null) {
+            return;
+        }
         // 1.1 鏍¢獙搴撲綅蹇呴』瀛樺湪
         MesWmWarehouseAreaDO area = areaService.validateWarehouseAreaExists(areaId);
 
@@ -403,7 +411,14 @@
             }
         }
 
-        // 3. 鏍¢獙搴撲綅娣锋斁瑙勫垯
+        // 3. 鏈寚瀹氬簱鍖�/搴撲綅鏃讹紝钀藉埌浠撳簱榛樿搴撳尯/搴撲綅锛堝鎴锋湭鍚敤搴撳尯/搴撲綅绠$悊锛�
+        if (reqVO.getWarehouseId() != null
+                && (reqVO.getLocationId() == null || reqVO.getAreaId() == null)) {
+            MesWmWarehouseAreaDO defaultArea = warehouseDefaultService.getOrCreateDefaultArea(reqVO.getWarehouseId());
+            reqVO.setLocationId(defaultArea.getLocationId());
+            reqVO.setAreaId(defaultArea.getId());
+        }
+        // 3.1 鏍¢獙搴撲綅娣锋斁瑙勫垯
         checkAreaMixingRule(reqVO.getAreaId(), reqVO.getItemId(), batchId);
 
         // 4. 鑾峰彇鎴栧垱寤哄簱瀛樿褰�
@@ -540,7 +555,16 @@
             throw exception(WM_MATERIAL_STOCK_FROZEN);
         }
 
-        // 4. 鏍¢獙鐩爣搴撲綅娣锋斁瑙勫垯
+        // 4. 鐩爣搴撳尯/搴撲綅鏈寚瀹氭椂锛岃惤鍒扮洰鏍囦粨搴撶殑榛樿搴撳尯/搴撲綅锛堝鎴锋湭鍚敤搴撳尯/搴撲綅绠$悊锛�
+        if (reqVO.getToWarehouseId() == null) {
+            reqVO.setToWarehouseId(sourceStock.getWarehouseId());
+        }
+        if ((reqVO.getToLocationId() == null || reqVO.getToAreaId() == null)) {
+            MesWmWarehouseAreaDO defaultArea = warehouseDefaultService.getOrCreateDefaultArea(reqVO.getToWarehouseId());
+            reqVO.setToLocationId(defaultArea.getLocationId());
+            reqVO.setToAreaId(defaultArea.getId());
+        }
+        // 4.1 鏍¢獙鐩爣搴撲綅娣锋斁瑙勫垯
         checkAreaMixingRule(reqVO.getToAreaId(), sourceStock.getItemId(), sourceStock.getBatchId());
 
         // 5. 鐢熸垚绉诲簱鍗曞彿
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptLineServiceImpl.java
index dee628f..c810d44 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptLineServiceImpl.java
@@ -5,9 +5,11 @@
 import cn.iocoder.yudao.module.mes.controller.admin.wm.miscreceipt.vo.line.MesWmMiscReceiptLinePageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.miscreceipt.vo.line.MesWmMiscReceiptLineSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.miscreceipt.MesWmMiscReceiptLineDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.miscreceipt.MesWmMiscReceiptLineMapper;
 import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseDefaultService;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -39,6 +41,8 @@
     private MesMdmItemService mdmItemService;
     @Resource
     private MesWmWarehouseAreaService warehouseAreaService;
+    @Resource
+    private MesWmWarehouseDefaultService warehouseDefaultService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -62,6 +66,8 @@
         // 1. 鏍¢獙
         MesWmMiscReceiptLineDO line = validateMiscReceiptLineExists(updateReqVO.getId());
         updateReqVO.setReceiptId(line.getReceiptId());
+        // 鏈寚瀹氬簱鍖�/搴撲綅鏃讹紝钀藉埌浠撳簱榛樿搴撳尯/搴撲綅锛堝鎴锋湭鍚敤搴撳尯/搴撲綅绠$悊锛�
+        fillDefaultLocationAndArea(updateReqVO);
 
         // 2. 鏇存柊琛�
         MesWmMiscReceiptLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmMiscReceiptLineDO.class);
@@ -126,9 +132,24 @@
         miscReceiptService.validateMiscReceiptEditable(reqVO.getReceiptId());
         // 鏍¢獙鐗╂枡瀛樺湪
         mdmItemService.validateItemExistsAndEnable(reqVO.getItemId());
+        // 鏈寚瀹氬簱鍖�/搴撲綅鏃讹紝钀藉埌浠撳簱榛樿搴撳尯/搴撲綅锛堝鎴锋湭鍚敤搴撳尯/搴撲綅绠$悊锛�
+        fillDefaultLocationAndArea(reqVO);
         // 鏍¢獙浠撳簱灞傜骇鍏崇郴锛堜粨搴� - 搴撲綅 - 搴撳尯锛�
         warehouseAreaService.validateWarehouseAreaExists(reqVO.getWarehouseId(),
                 reqVO.getLocationId(), reqVO.getAreaId());
     }
 
+    /**
+     * 鏈寚瀹氬簱鍖�/搴撲綅鏃讹紝钀藉埌浠撳簱榛樿搴撳尯/搴撲綅
+     */
+    private void fillDefaultLocationAndArea(MesWmMiscReceiptLineSaveReqVO reqVO) {
+        if (reqVO.getWarehouseId() == null
+                || (reqVO.getLocationId() != null && reqVO.getAreaId() != null)) {
+            return;
+        }
+        MesWmWarehouseAreaDO defaultArea = warehouseDefaultService.getOrCreateDefaultArea(reqVO.getWarehouseId());
+        reqVO.setLocationId(defaultArea.getLocationId());
+        reqVO.setAreaId(defaultArea.getId());
+    }
+
 }
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueDetailServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueDetailServiceImpl.java
index be3e1bd..8aa183f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueDetailServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueDetailServiceImpl.java
@@ -7,9 +7,11 @@
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueDetailDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueLineDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnissue.MesWmReturnIssueDetailMapper;
 import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService;
 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseDefaultService;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -38,6 +40,8 @@
     private MesWmReturnIssueLineService issueLineService;
     @Resource
     private MesWmWarehouseAreaService warehouseAreaService;
+    @Resource
+    private MesWmWarehouseDefaultService warehouseDefaultService;
     @Resource
     @Lazy
     private MesWmMaterialStockService materialStockService;
@@ -114,6 +118,14 @@
         if (ObjUtil.notEqual(line.getItemId(), reqVO.getItemId())) {
             throw exception(WM_RETURN_ISSUE_DETAIL_ITEM_MISMATCH);
         }
+        // 鏈寚瀹氫笂鏋剁洰鏍囧簱鍖�/搴撲綅鏃讹紝钀藉埌浠撳簱榛樿搴撳尯/搴撲綅锛堝鎴锋湭鍚敤搴撳尯/搴撲綅绠$悊锛�
+        if (reqVO.getWarehouseId() != null
+                && (reqVO.getLocationId() == null || reqVO.getAreaId() == null)) {
+            MesWmWarehouseAreaDO defaultArea =
+                    warehouseDefaultService.getOrCreateDefaultArea(reqVO.getWarehouseId());
+            reqVO.setLocationId(defaultArea.getLocationId());
+            reqVO.setAreaId(defaultArea.getId());
+        }
         // 鏍¢獙涓婃灦鐩爣浠撳簱銆佸簱鍖恒�佸簱浣嶇殑鍏宠仈鍏崇郴
         warehouseAreaService.validateWarehouseAreaExists(
                 reqVO.getWarehouseId(), reqVO.getLocationId(), reqVO.getAreaId());
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesDetailServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesDetailServiceImpl.java
index 32f0981..a9290b6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesDetailServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesDetailServiceImpl.java
@@ -9,11 +9,13 @@
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDetailDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesLineDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnsales.MesWmReturnSalesDetailMapper;
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnSalesStatusEnum;
 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.warehouse.MesWmWarehouseAreaService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseDefaultService;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -45,6 +47,8 @@
     private MesWmReturnSalesService returnSalesService;
     @Resource
     private MesWmWarehouseAreaService warehouseAreaService;
+    @Resource
+    private MesWmWarehouseDefaultService warehouseDefaultService;
     @Resource
     private MesWmBatchService batchService;
     @Resource
@@ -136,6 +140,14 @@
         MesWmReturnSalesLineDO line = returnSalesLineService.validateReturnSalesLineExists(reqVO.getLineId());
         // 鏍¢獙閫�璐у崟涓哄緟涓婃灦鐘舵��
         validateReturnSalesStatusApproved(line.getReturnId());
+        // 鏈寚瀹氬簱鍖�/搴撲綅鏃讹紝钀藉埌浠撳簱榛樿搴撳尯/搴撲綅锛堝鎴锋湭鍚敤搴撳尯/搴撲綅绠$悊锛�
+        if (reqVO.getWarehouseId() != null
+                && (reqVO.getLocationId() == null || reqVO.getAreaId() == null)) {
+            MesWmWarehouseAreaDO defaultArea =
+                    warehouseDefaultService.getOrCreateDefaultArea(reqVO.getWarehouseId());
+            reqVO.setLocationId(defaultArea.getLocationId());
+            reqVO.setAreaId(defaultArea.getId());
+        }
         // 鏍¢獙浠撳簱銆佸簱鍖恒�佸簱浣嶇殑鍏宠仈鍏崇郴
         warehouseAreaService.validateWarehouseAreaExists(
                 reqVO.getWarehouseId(), reqVO.getLocationId(), reqVO.getAreaId());
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskResultServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskResultServiceImpl.java
index f7c8664..368852e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskResultServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskResultServiceImpl.java
@@ -1,13 +1,16 @@
 package cn.iocoder.yudao.module.mes.service.wm.stocktaking.task;
 
 import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.result.MesWmStockTakingTaskResultPageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.result.MesWmStockTakingTaskResultSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskLineDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskResultDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.stocktaking.task.MesWmStockTakingTaskResultMapper;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseDefaultService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +39,8 @@
     private MesWmStockTakingTaskLineService stockTakingTaskLineService;
     @Resource
     private MesWmStockTakingTaskService stockTakingTaskService;
+    @Resource
+    private MesWmWarehouseDefaultService warehouseDefaultService;
 
     @Override
     public PageResult<MesWmStockTakingTaskResultDO> getStockTakingTaskResultPage(
@@ -57,19 +62,43 @@
         // 2. 纭畾 lineId 鍜岃处闈㈡暟閲�
         Long lineId = createReqVO.getLineId();
         MesWmStockTakingTaskLineDO existingLine = null;
+        if (lineId != null) {
+            // 2.1 濡傛灉浼犻�掍簡 lineId锛屼粠 line 涓幏鍙� quantity锛屽苟琛ラ綈浠撳簱/搴撳尯/搴撲綅/鎵规
+            existingLine = stockTakingTaskLineService.validateStockTakingTaskLineExists(lineId);
+            if (createReqVO.getWarehouseId() == null) {
+                createReqVO.setWarehouseId(existingLine.getWarehouseId());
+            }
+            if (createReqVO.getLocationId() == null) {
+                createReqVO.setLocationId(existingLine.getLocationId());
+            }
+            if (createReqVO.getAreaId() == null) {
+                createReqVO.setAreaId(existingLine.getAreaId());
+            }
+            if (createReqVO.getBatchId() == null) {
+                createReqVO.setBatchId(existingLine.getBatchId());
+            }
+            if (StrUtil.isEmpty(createReqVO.getBatchCode())) {
+                createReqVO.setBatchCode(existingLine.getBatchCode());
+            }
+        }
+        // 2.2 鏈寚瀹氬簱鍖�/搴撲綅鏃讹紝钀藉埌浠撳簱榛樿搴撳尯/搴撲綅锛堝鎴锋湭鍚敤搴撳尯/搴撲綅绠$悊锛�
+        if (createReqVO.getWarehouseId() != null
+                && (createReqVO.getLocationId() == null || createReqVO.getAreaId() == null)) {
+            MesWmWarehouseAreaDO defaultArea =
+                    warehouseDefaultService.getOrCreateDefaultArea(createReqVO.getWarehouseId());
+            createReqVO.setLocationId(defaultArea.getLocationId());
+            createReqVO.setAreaId(defaultArea.getId());
+        }
         if (lineId == null) {
-            // 2.1 鍩轰簬 taskId + itemId + areaId 鏌ヨ宸插瓨鍦ㄧ殑 line
+            // 2.3 鍩轰簬 taskId + itemId + areaId 鏌ヨ宸插瓨鍦ㄧ殑 line
             existingLine = stockTakingTaskLineService.getStockTakingTaskLine(
                     createReqVO.getTaskId(), createReqVO.getItemId(), createReqVO.getAreaId());
             if (existingLine != null) {
                 lineId = existingLine.getId();
             } else {
-                // 2.2 鍒涘缓鏂扮殑 line锛堟敞鎰忥細褰撶洏鐐圭粨鏋滄病鏈夊搴旂殑鐩樼偣娓呭崟琛屾椂锛屼細鑷姩鍒涘缓涓�涓柊鐨勭洏鐐逛换鍔¤锛�
+                // 2.4 鍒涘缓鏂扮殑 line锛堟敞鎰忥細褰撶洏鐐圭粨鏋滄病鏈夊搴旂殑鐩樼偣娓呭崟琛屾椂锛屼細鑷姩鍒涘缓涓�涓柊鐨勭洏鐐逛换鍔¤锛�
                 lineId = stockTakingTaskLineService.createStockTakingTaskLine(createReqVO);
             }
-        } else {
-            // 2.3 濡傛灉浼犻�掍簡 lineId锛屼粠 line 涓幏鍙� quantity
-            existingLine = stockTakingTaskLineService.validateStockTakingTaskLineExists(lineId);
         }
         if (existingLine != null
                 && existingLine.getTakingQuantity() != null
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 43f4f0b..7cb1721 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
@@ -21,6 +21,7 @@
 import cn.iocoder.yudao.module.mes.service.wm.stockwarning.MesWmStockWarningService;
 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.MesWmWarehouseDefaultService;
 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
 import jakarta.annotation.Resource;
@@ -60,6 +61,8 @@
     @Resource
     private MesWmWarehouseAreaService areaService;
     @Resource
+    private MesWmWarehouseDefaultService warehouseDefaultService;
+    @Resource
     private MesWmStockWarningService stockWarningService;
 
     @Override
@@ -75,6 +78,10 @@
         checkQuantity(reqDTO, inbound);
         // 1.3 鍏ュ簱浜嬪姟锛氭壒娆″彿鏍¢獙 + batchId/batchCode 浜掕ˉ
         checkBatch(reqDTO, inbound);
+        // 1.3.1 鍏ュ簱浜嬪姟鏈寚瀹氬簱鍖�/搴撲綅鏃讹紝鑷姩钀藉埌浠撳簱榛樿搴撳尯/搴撲綅锛堝鎴锋湭鍚敤搴撳尯/搴撲綅绠$悊锛�
+        if (inbound) {
+            fillDefaultLocationAndArea(reqDTO);
+        }
         // 1.4 鍏ュ簱浜嬪姟锛氬簱浣嶆贩鏀捐鍒欐牎楠�
         if (inbound) {
             materialStockService.checkAreaMixingRule(reqDTO.getAreaId(), reqDTO.getItemId(), reqDTO.getBatchId());
@@ -171,6 +178,21 @@
     // ==================== 绉佹湁鏍¢獙鏂规硶 ====================
 
     /**
+     * 鍏ュ簱浜嬪姟鏈寚瀹氬簱鍖�/搴撲綅鏃讹紝鑷姩浣跨敤浠撳簱鐨勯粯璁ゅ簱鍖�/榛樿搴撲綅
+     *
+     * 瀹㈡埛鏈惎鐢ㄥ簱鍖�/搴撲綅绠$悊锛屽墠绔笉鍐嶈鐢ㄦ埛閫夋嫨锛屽簱瀛樹粛闇�瑕佸畬鏁寸殑浠撳簱-搴撳尯-搴撲綅缁村害銆�
+     */
+    private void fillDefaultLocationAndArea(MesWmTransactionSaveReqDTO reqDTO) {
+        if (reqDTO.getWarehouseId() == null
+                || (reqDTO.getLocationId() != null && reqDTO.getAreaId() != null)) {
+            return;
+        }
+        MesWmWarehouseAreaDO defaultArea = warehouseDefaultService.getOrCreateDefaultArea(reqDTO.getWarehouseId());
+        reqDTO.setLocationId(defaultArea.getLocationId());
+        reqDTO.setAreaId(defaultArea.getId());
+    }
+
+    /**
      * 鏍¢獙鏁伴噺姝h礋鍙蜂笌浜嬪姟鏂瑰悜涓�鑷�
      */
     private void checkQuantity(MesWmTransactionSaveReqDTO reqDTO, boolean inbound) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferDetailServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferDetailServiceImpl.java
index d341fda..22a4824 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferDetailServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferDetailServiceImpl.java
@@ -6,8 +6,10 @@
 import cn.iocoder.yudao.module.mes.controller.admin.wm.transfer.vo.detail.MesWmTransferDetailSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.transfer.MesWmTransferDetailDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.transfer.MesWmTransferLineDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.transfer.MesWmTransferDetailMapper;
 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseDefaultService;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -39,6 +41,8 @@
     private MesWmTransferLineService transferLineService;
     @Resource
     private MesWmWarehouseAreaService warehouseAreaService;
+    @Resource
+    private MesWmWarehouseDefaultService warehouseDefaultService;
 
     @Override
     public Long createTransferDetail(MesWmTransferDetailSaveReqVO createReqVO) {
@@ -117,6 +121,14 @@
     private void validateDetailSaveData(MesWmTransferDetailSaveReqVO reqVO, Long excludeDetailId) {
         // 鏍¢獙鐖舵暟鎹瓨鍦�
         MesWmTransferLineDO line = transferLineService.validateTransferLineExists(reqVO.getLineId());
+        // 鏈寚瀹氱Щ鍏ュ簱鍖�/搴撲綅鏃讹紝钀藉埌绉诲叆浠撳簱榛樿搴撳尯/搴撲綅锛堝鎴锋湭鍚敤搴撳尯/搴撲綅绠$悊锛�
+        if (reqVO.getToWarehouseId() != null
+                && (reqVO.getToLocationId() == null || reqVO.getToAreaId() == null)) {
+            MesWmWarehouseAreaDO defaultArea =
+                    warehouseDefaultService.getOrCreateDefaultArea(reqVO.getToWarehouseId());
+            reqVO.setToLocationId(defaultArea.getLocationId());
+            reqVO.setToAreaId(defaultArea.getId());
+        }
         // 鏍¢獙浠撳簱銆佸簱鍖恒�佸簱浣嶇殑鍏宠仈鍏崇郴
         warehouseAreaService.validateWarehouseAreaExists(
                 reqVO.getToWarehouseId(), reqVO.getToLocationId(), reqVO.getToAreaId());
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseDefaultService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseDefaultService.java
new file mode 100644
index 0000000..88fb71e
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseDefaultService.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.mes.service.wm.warehouse;
+
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
+
+/**
+ * 浠撳簱榛樿搴撳尯/搴撲綅 Service
+ *
+ * 瀹㈡埛鏈惎鐢ㄥ簱鍖�/搴撲綅绠$悊鏃讹紝涓氬姟鍗曟嵁涓嶅啀瑕佹眰鐢ㄦ埛閫夋嫨搴撳尯/搴撲綅锛�
+ * 鐢辩郴缁熸寜浠撳簱鑷姩钀藉埌銆岄粯璁ゅ簱鍖� / 榛樿搴撲綅銆嶏紙涓嶅瓨鍦ㄦ椂鑷姩鍒涘缓锛夛紝
+ * 淇濊瘉搴撳瓨璁板綍浠嶅叿澶囧畬鏁寸殑浠撳簱-搴撳尯-搴撲綅缁村害銆�
+ */
+public interface MesWmWarehouseDefaultService {
+
+    /**
+     * 鑾峰彇浠撳簱鐨勯粯璁ゅ簱鍖猴紝涓嶅瓨鍦ㄦ椂鑷姩鍒涘缓
+     *
+     * @param warehouseId 浠撳簱缂栧彿
+     * @return 榛樿搴撳尯
+     */
+    MesWmWarehouseLocationDO getOrCreateDefaultLocation(Long warehouseId);
+
+    /**
+     * 鑾峰彇浠撳簱鐨勯粯璁ゅ簱浣嶏紝涓嶅瓨鍦ㄦ椂鑷姩鍒涘缓锛堝悓鏃剁‘淇濋粯璁ゅ簱鍖哄瓨鍦級
+     *
+     * @param warehouseId 浠撳簱缂栧彿
+     * @return 榛樿搴撲綅
+     */
+    MesWmWarehouseAreaDO getOrCreateDefaultArea(Long warehouseId);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseDefaultServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseDefaultServiceImpl.java
new file mode 100644
index 0000000..175c6de
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseDefaultServiceImpl.java
@@ -0,0 +1,92 @@
+package cn.iocoder.yudao.module.mes.service.wm.warehouse;
+
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.area.MesWmWarehouseAreaSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.location.MesWmWarehouseLocationSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+/**
+ * 浠撳簱榛樿搴撳尯/搴撲綅 Service 瀹炵幇绫�
+ */
+@Service
+@Validated
+public class MesWmWarehouseDefaultServiceImpl implements MesWmWarehouseDefaultService {
+
+    /** 榛樿搴撳尯缂栫爜鍓嶇紑锛堟寜浠撳簱闅旂锛屼繚璇佺紪鐮佸叏灞�鍞竴锛� */
+    private static final String DEFAULT_LOCATION_CODE_PREFIX = "DEFAULT_KQ_";
+    private static final String DEFAULT_LOCATION_NAME = "榛樿搴撳尯";
+    /** 榛樿搴撲綅缂栫爜鍓嶇紑 */
+    private static final String DEFAULT_AREA_CODE_PREFIX = "DEFAULT_KW_";
+    private static final String DEFAULT_AREA_NAME = "榛樿搴撲綅";
+
+    @Resource
+    private MesWmWarehouseLocationService locationService;
+    @Resource
+    private MesWmWarehouseAreaService areaService;
+    @Resource
+    private MesWmWarehouseService warehouseService;
+
+    @Override
+    public MesWmWarehouseLocationDO getOrCreateDefaultLocation(Long warehouseId) {
+        String code = DEFAULT_LOCATION_CODE_PREFIX + warehouseId;
+        MesWmWarehouseLocationDO location = locationService.getWarehouseLocationByCode(code);
+        if (location != null) {
+            return location;
+        }
+        // 浠撳簱涓嶅瓨鍦ㄦ椂缁欏嚭鏄庣‘鎻愮ず锛岄伩鍏嶅缓鍑烘病鏈夊綊灞炵殑搴撳尯
+        warehouseService.validateWarehouseExists(warehouseId);
+
+        MesWmWarehouseLocationSaveReqVO createReqVO = new MesWmWarehouseLocationSaveReqVO();
+        createReqVO.setWarehouseId(warehouseId);
+        createReqVO.setCode(code);
+        createReqVO.setName(DEFAULT_LOCATION_NAME);
+        createReqVO.setFrozen(false);
+        try {
+            Long id = locationService.createWarehouseLocation(createReqVO);
+            return locationService.getWarehouseLocation(id);
+        } catch (ServiceException ex) {
+            // 骞跺彂棣栨浣跨敤鏃跺彲鑳藉凡琚叾浠栬姹傚垱寤猴紝鍥炴煡涓�娆�
+            MesWmWarehouseLocationDO created = locationService.getWarehouseLocationByCode(code);
+            if (created != null) {
+                return created;
+            }
+            throw ex;
+        }
+    }
+
+    @Override
+    public MesWmWarehouseAreaDO getOrCreateDefaultArea(Long warehouseId) {
+        String code = DEFAULT_AREA_CODE_PREFIX + warehouseId;
+        MesWmWarehouseAreaDO area = areaService.getWarehouseAreaByCode(code);
+        if (area != null) {
+            return area;
+        }
+        MesWmWarehouseLocationDO location = getOrCreateDefaultLocation(warehouseId);
+
+        MesWmWarehouseAreaSaveReqVO createReqVO = new MesWmWarehouseAreaSaveReqVO();
+        createReqVO.setCode(code);
+        createReqVO.setName(DEFAULT_AREA_NAME);
+        createReqVO.setLocationId(location.getId());
+        createReqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
+        createReqVO.setFrozen(false);
+        // 榛樿搴撲綅闇�鍏煎鎵�鏈夌墿鏂�/鎵规锛岄伩鍏嶅湪鏃犲簱浣嶇鐞嗙殑鍦烘櫙涓嬭Е鍙戞贩鏀炬牎楠�
+        createReqVO.setAllowItemMixing(true);
+        createReqVO.setAllowBatchMixing(true);
+        try {
+            Long id = areaService.createWarehouseArea(createReqVO);
+            return areaService.getWarehouseArea(id);
+        } catch (ServiceException ex) {
+            MesWmWarehouseAreaDO created = areaService.getWarehouseAreaByCode(code);
+            if (created != null) {
+                return created;
+            }
+            throw ex;
+        }
+    }
+
+}

--
Gitblit v1.9.3