From 19674bf7bc725aabc28f9cf14cad0bf8a789ff23 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 07 一月 2026 15:47:47 +0800
Subject: [PATCH] 台机与库位绑定关系

---
 src/main/java/com/zy/asrs/controller/LocMastController.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 723e3f6..b4098cd 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -46,6 +46,8 @@
     private WrkMastLogService wrkMastLogService;
     @Resource
     private WrkDetlLogService wrkDetlLogService;
+    @Autowired
+    private BasAreasService basAreasService;
 
     @RequestMapping(value = "/locMast/init/pwd")
     public R locMastInitPwd(@RequestParam(required = false) String pwd) {
@@ -282,6 +284,15 @@
             if (Cools.isEmpty(basWhsType)) {
                 return R.error("搴撳瀷涓嶅瓨鍦紒锛侊紒");
             }
+
+            if (Objects.isNull(param.getAreaId())) {
+                throw new CoolException("搴撳尯ID涓嶈兘涓虹┖锛侊紒锛�");
+            }
+            BasAreas basAreas = basAreasService.selectById(param.getAreaId());
+            if (Cools.isEmpty(basAreas)) {
+                return R.error("搴撳尯涓嶅瓨鍦紒锛侊紒");
+            }
+
             for (int r = param.getStartRow(); r <= param.getEndRow(); r++) {
                 for (int b = param.getStartBay(); b <= param.getEndBay(); b++) {
                     for (int l = param.getStartLev(); l <= param.getEndLev(); l++) {
@@ -320,6 +331,8 @@
                         locMast.setAppeUser(getUserId());
                         locMast.setAppeTime(now);
                         locMast.setModiUser(getUserId());
+                        locMast.setAreaId(basAreas.getId());
+                        locMast.setAreaName(basAreas.getName());
                         locMast.setModiTime(now);
                         locMast.setWhsType(basWhsType.getId());
                         list.add(locMast);

--
Gitblit v1.9.1