From 76ed2e55640f999bd21a33ef408ee9467ea7d385 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 09 一月 2026 15:00:22 +0800
Subject: [PATCH] 1

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/utils/UtilsController.java |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/utils/UtilsController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/utils/UtilsController.java
index 22df854..e36611d 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/utils/UtilsController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/utils/UtilsController.java
@@ -67,7 +67,7 @@
 
     private int d2 = 5;
 
-    private List<Integer> starts2 = Lists.newArrayList(389, 478, 567, 656,835, 923, 1012, 1101, 1190, 1366, 1458, 1547);
+    private List<Integer> starts2 = Lists.newArrayList(389, 478, 567, 656, 835, 923, 1012, 1101, 1190, 1366, 1458, 1547);
 
 
     @RequestMapping("/loc")
@@ -76,18 +76,24 @@
     public String loc() {
         List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>().orderByAsc(Loc::getRow).orderByAsc(Loc::getBay).orderByAsc(Loc::getLev));
         for (Loc loc : list) {
-            if (loc.getBay() == 24||loc.getBay() == 8||loc.getBay() == 16) {
-                Integer i = starts.get((loc.getRow() - 1) / 2);
-                Code cacheByData = codeService.getCacheByData(Utils.zeroFill(((loc.getBay()-1)%8 + i + (loc.getBay()-1) / 8 * 10) + "", 8));
-                loc.setCode(cacheByData.getId());
-                locService.updateById(loc);
-            }
+//            if (loc.getBay() == 24||loc.getBay() == 8||loc.getBay() == 16) {
+//                Integer i = starts.get((loc.getRow() - 1) / 2);
+//                Code cacheByData = codeService.getCacheByData(Utils.zeroFill(((loc.getBay()-1)%8 + i + (loc.getBay()-1) / 8 * 10) + "", 8));
+//                loc.setCode(cacheByData.getId());
+//                locService.updateById(loc);
+//            }
 //            if (loc.getBay() > 24 && loc.getBay() <= 32) {
 //                Integer i = starts.get((loc.getRow() - 1)  / 2) + 30;
 //                Code cacheByData = codeService.getCacheByData(Utils.zeroFill(((loc.getBay() - 24)%4-1 + i + (loc.getBay() - 24) / 4 * 6) + "", 8));
 //                loc.setCode(cacheByData.getId());
 //                locService.updateById(loc);
 //            }
+            if (loc.getBay() == 28 || loc.getBay() == 32) {
+                Integer i = starts.get((loc.getRow() - 1) / 2) + 30;
+                Code cacheByData = codeService.getCacheByData(Utils.zeroFill(((loc.getBay() - 24 - 1) % 4 + i + (loc.getBay() - 24 - 1) / 4 * 6) + "", 8));
+                loc.setCode(cacheByData.getId());
+                locService.updateById(loc);
+            }
 //            if (loc.getBay() > 32) {
 //                Integer i = starts2.get((loc.getRow() - 13) / 2);
 //                if (i==656){

--
Gitblit v1.9.1