From f3ce4485cd37eb7c3bcf16fde86a7f149974c4b6 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 20 三月 2026 09:51:50 +0800
Subject: [PATCH] #检查导出功能:  1.商品档案无异常  2.库存明细管理(异常)已修复  3.库存明细统计无异常  4.工作档查询维护无异常  5.工作档明细查询无异常  6.工作历史档查询无异常  7.工作明细历史档查询无异常  8.入库通知历史档无异常  9.库存移动流水记录(异常)已修复  10.机台工位绑定无异常  11.库存调整记录无异常  12.工作档维护日志(异常)已修复  13.操作日志无异常

---
 src/main/java/com/zy/asrs/controller/LocAroundBindController.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LocAroundBindController.java b/src/main/java/com/zy/asrs/controller/LocAroundBindController.java
index e5a2b27..d07f384 100644
--- a/src/main/java/com/zy/asrs/controller/LocAroundBindController.java
+++ b/src/main/java/com/zy/asrs/controller/LocAroundBindController.java
@@ -6,6 +6,7 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.core.common.DateUtils;
 import com.zy.asrs.entity.LocAroundBind;
+import com.zy.asrs.entity.LocDetl;
 import com.zy.asrs.entity.LocMast;
 import com.zy.asrs.entity.param.InitDeviceLocParams;
 import com.zy.asrs.enums.LocStsType;
@@ -14,6 +15,8 @@
 import com.core.common.BaseRes;
 import com.core.common.Cools;
 import com.core.common.R;
+import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.impl.LocDetlServiceImpl;
 import com.zy.asrs.service.impl.LocMastServiceImpl;
 import com.zy.common.web.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +31,8 @@
     private LocAroundBindService locAroundBindService;
     @Autowired
     private LocMastServiceImpl locMastService;
+    @Autowired
+    private LocDetlService locDetlService;
 
     @RequestMapping(value = "/locAroundBind/{id}/auth")
     @ManagerAuth
@@ -72,12 +77,12 @@
         if (Objects.isNull(locAroundBind)) {
             return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
-        LocAroundBind aroundBind = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", locAroundBind.getBLocNo()));
+        LocAroundBind aroundBind = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", locAroundBind.getBlocNo()));
         if (!Objects.isNull(aroundBind)) {
             return R.error("宸ヤ綅宸茬粦瀹氾紝涓嶈兘閲嶅缁戝畾锛�");
         }
 
-        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locAroundBind.getBLocNo()));
+        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locAroundBind.getBlocNo()));
         locMast.setLocSts(LocStsType.LOC_STS_TYPE_X.type);
         locMast.setDeleted(1);
         locMast.setFrozen(1);
@@ -95,6 +100,11 @@
         if (Cools.isEmpty(locAroundBind) || null == locAroundBind.getId()) {
             return R.error();
         }
+
+        if (locAroundBind.getLocType().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+            locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locAroundBind.getBlocNo()));
+        }
+
         locAroundBindService.updateById(locAroundBind);
         return R.ok();
     }

--
Gitblit v1.9.1