From ce43df438a4bbef5b9ffaed0a33a97db6e88fbf1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:57:07 +0800
Subject: [PATCH] 优化异常处理及订单同步逻辑

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   67 ++++++++++++++++++++-------------
 1 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index acd2d53..035c797 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -1,9 +1,9 @@
 package com.zy.asrs.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.core.common.Cools;
-import com.zy.asrs.entity.LocDetl;
 import com.zy.asrs.entity.LocMast;
 import com.zy.asrs.mapper.LocMastMapper;
 import com.zy.asrs.service.LocMastService;
@@ -17,7 +17,6 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
 @Slf4j
@@ -30,18 +29,18 @@
     private WorkService workService;
 
     @Override
-    public List<LocMast> queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1) {
-        return this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
-    }
-
-    @Override
     public List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd) {
         return this.baseMapper.queryFreeLocMast2(locType1, rowBeg, rowEnd, bayBeg, bayEnd, levBeg, levEnd);
     }
 
     @Override
-    public LocMast queryFreeLocMast0(Integer row, Short locType1) {
-        return this.baseMapper.queryFreeLocMast0(row, locType1);
+    public List<LocMast> selectAreaEmpty(Short locType1, Integer locType3) {
+        return this.baseMapper.selectAreaEmpty(locType1, locType3);
+    }
+
+    @Override
+    public List<LocMast> selectAreaEmptyByLev(Short locType1, Integer locType3, Integer lev) {
+        return this.baseMapper.selectAreaEmptyByLev(locType1, locType3, lev);
     }
 
     @Override
@@ -61,12 +60,7 @@
         if (locMast == null) {
             return false;
         }
-        return this.baseMapper.selectEmptyLocCount(locMast.getCrnNo()) > quaOfBlank;
-    }
-
-    @Override
-    public Boolean checkWhole(List<LocDetl> locDetls) {
-        return null;
+        return this.baseMapper.selectEmptyLocCount(locMast.getLocType3(), locMast.getLev1()) > quaOfBlank;
     }
 
     @Override
@@ -149,19 +143,26 @@
     public LocMast findNearloc(String locNo) {
         int row = getRow(locNo);
         LocMast locMast = null;
-        if (row>19) {
-            List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo);
-            if (!Cools.isEmpty(groupOuterLoc)) {
-                locMast = this.baseMapper.selectAvailableNearLocDesc(groupOuterLoc);
-            }
-
-        }else {
-            List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo);
-            if (!Cools.isEmpty(groupOuterLoc)) {
-                locMast = this.baseMapper.selectAvailableNearLocAsc(groupOuterLoc);
-            }
+        List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo);
+        if (!Cools.isEmpty(groupOuterLoc)) {
+            locMast = this.baseMapper.selectAvailableNearLocAsc(groupOuterLoc);
         }
         return locMast;
+    }
+
+    @Override
+    public LocMast findInnerLoc(String locNo) {
+        List<String> groupLoc = Utils.getGroupLoc(locNo);
+        for (String loc : groupLoc) {
+            LocMast tmp = this.baseMapper.selectByLoc(loc);
+            if (tmp == null) {
+                continue;
+            }
+            if (tmp.getLocSts().equals("O")) {
+                return tmp;
+            }
+        }
+        return null;
     }
 
     /**
@@ -196,7 +197,21 @@
     }
 
     @Override
+    public LocMast selectByLoc(String locNo) {
+        return this.baseMapper.selectByLoc(locNo);
+    }
+
+    @Override
     public Integer updateLocType2ByRBL(Integer locType2, Integer startRow, Integer endRow, Integer startBay, Integer endBay, Integer startLev, Integer endLev) {
         return this.baseMapper.updateLocType2ByRBL(locType2, startRow, endRow, startBay, endBay, startLev, endLev);
     }
+
+    public void updateByLocNo(LocMast locMast){
+        this.update(locMast,new EntityWrapper<LocMast>().eq("loc_no",locMast.getLocNo()));
+    }
+
+    @Override
+    public List<LocMast> selectLocDetlNotExist() {
+        return this.baseMapper.selectLocDetlNotExist();
+    }
 }

--
Gitblit v1.9.1