From 67785e397a93905920d8bfcef950ca3e00ac42e1 Mon Sep 17 00:00:00 2001
From: Huluwa22 <2667400744@qq.com>
Date: Sun, 2 Mar 2025 08:50:50 +0800
Subject: [PATCH] =?UTF-8?q?feat(location):=20=E6=B7=BB=E5=8A=A0=E6=89=98?=
 =?UTF-8?q?=E7=9B=98=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/controller/LocationController.java    | 42 +++++++++++++++++++
 .../com/wms/utils/storage/LocationUtils.java  |  1 +
 2 files changed, 43 insertions(+)

diff --git a/src/main/java/com/wms/controller/LocationController.java b/src/main/java/com/wms/controller/LocationController.java
index e05136e..4ee8f33 100644
--- a/src/main/java/com/wms/controller/LocationController.java
+++ b/src/main/java/com/wms/controller/LocationController.java
@@ -552,4 +552,46 @@ public class LocationController extends BaseController {
         return JSON.toJSONString(rsp);
     }
 
+
+    /**
+     * 添加托盘信息
+     *
+     * @param Vehicle
+     * @return 结果
+     */
+    @PostMapping("/addVehicleInfo")
+    @ResponseBody
+    @Transactional(isolation = Isolation.REPEATABLE_READ, propagation = Propagation.REQUIRED)
+    public String  addVehicleInfo(@RequestBody Vehicle vehicle) {
+        // 创建响应信息
+        ResponseEntity rsp = new ResponseEntity();
+        try {
+            if (StringUtils.isEmpty(vehicle.getVehicleId()) || StringUtils.isEmpty(vehicle.getCurrentLocation())) {// 载具号不为空
+                // 判断是不是需要往载具表里面添加数据
+                rsp.setCode(ResponseCode.ERROR.getCode());
+                rsp.setMessage("请填写托盘号或位置号");
+                return JSON.toJSONString(rsp);
+            }
+            int i = vehicleService.addVehicle(vehicle);
+            if(i <=0 ) {
+                rsp.setCode(ResponseCode.ERROR.getCode());
+                rsp.setMessage("插入失败");
+                return JSON.toJSONString(rsp);
+            }
+        } catch (Exception e) {
+            // 回滚事务
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            logger.info("更新库位状态发生错误：{}", e.getMessage());
+            // 返回其他异常
+            rsp.setCode(ResponseCode.ERROR.getCode());
+            rsp.setMessage(e.getMessage());
+            return JSON.toJSONString(rsp);
+        }
+
+        // 返回成功
+        rsp.setCode(ResponseCode.OK.getCode());
+        rsp.setMessage("更新库位状态成功");
+        return JSON.toJSONString(rsp);
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/wms/utils/storage/LocationUtils.java b/src/main/java/com/wms/utils/storage/LocationUtils.java
index 6d33803..efe4e32 100644
--- a/src/main/java/com/wms/utils/storage/LocationUtils.java
+++ b/src/main/java/com/wms/utils/storage/LocationUtils.java
@@ -150,6 +150,7 @@ public class LocationUtils {
                         break; // 数据库查询失败
                     }
                     if(!locationTasks.isEmpty()) {
+                        log.info("检查存在干涉库位失败,此位置有未完成的任务,任务位置{}",differentDepthLocation.getLocationId());
                         canUse = false;
                         break; // 有任务这个库位不行
                     }