From e85d317a7ab0a4cc397f4b235b17f6223ec0840e Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期五, 28 三月 2025 08:41:49 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatController.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatController.java
index 817f37d..c1be3fc 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatController.java
@@ -57,10 +57,14 @@
     @OperationLog("Create loc areas mats")
     @PostMapping("/locAreaMat/save")
     public R save(@RequestBody LocAreaMat locAreaMat) {
+        if (Objects.isNull(locAreaMat.getWarehouseId())) {
+            return R.error("浠撳簱涓嶈兘涓虹┖锛侊紒");
+        }
+        if (Objects.isNull(locAreaMat.getAreaId())) {
+            return R.error("搴撳尯涓嶈兘涓虹┖锛侊紒");
+        }
         locAreaMat.setCreateBy(getLoginUserId());
-        locAreaMat.setCreateTime(new Date());
         locAreaMat.setUpdateBy(getLoginUserId());
-        locAreaMat.setUpdateTime(new Date());
         if (!locAreaMatService.save(locAreaMat)) {
             return R.error("Save Fail");
         }

--
Gitblit v1.9.1