From 0b1b9f8958eac573bb88039bc67ac2393ff712dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= <soldierliuli@hotmail.com>
Date: Fri, 5 Aug 2022 10:39:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B1=82=E6=9E=B6=E4=BD=8D?=
 =?UTF-8?q?=20=E5=B7=A6=E5=8F=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/service/impl/DeviceImpl.java       | 49 ++++++++++++-------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java
index 2e60f2d..fa17bf2 100644
--- a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java
+++ b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java
@@ -113,20 +113,17 @@ public class DeviceImpl implements DeviceService {
         //创建密集架id
         deviceInfoDto.setId(NanoIdUtils.randomNanoId());
 
-        for (int i = deviceInfoDto.getFirstColumnNo(); i <= deviceInfoDto.getSumColumnNo() + deviceInfoDto.getFirstColumnNo(); i++) {
+
+        for (int i = deviceInfoDto.getFirstColumnNo(); i < deviceInfoDto.getSumColumnNo() + deviceInfoDto.getFirstColumnNo(); i++) {
             for (int k = 1; k <= deviceInfoDto.getPartNo(); k++) {
                 for (int n = 1; n <= deviceInfoDto.getRowNo(); n++) {
-                    Boolean boolLeftOrRight = GenerateNum();
 
                     String leftOrRight;
                     Integer numLeftOrRight;
-                    if (boolLeftOrRight) {
-                        leftOrRight = "左";
-                        numLeftOrRight = 1;
-                    } else {
-                        leftOrRight = "右";
-                        numLeftOrRight = 2;
-                    }
+                    leftOrRight = "左";
+                    numLeftOrRight = 1;
+
+
                     //架位
                     String position = deviceInfoDto.getAreaNo() + "-" +
                             i + "-" + k + "-" + n + "-" + numLeftOrRight;
@@ -147,6 +144,29 @@ public class DeviceImpl implements DeviceService {
                     deviceArchivesTag.setStoreroomCode(deviceInfoDto.getStoreroomCode());
 
                     deviceArchivesTagRepository.save(deviceArchivesTag);
+
+
+                    String leftOrRight1 = "右";
+                    Integer numLeftOrRight2 = 2;
+                    //架位
+                    String position1 = deviceInfoDto.getAreaNo() + "-" +
+                            i + "-" + k + "-" + n + "-" + numLeftOrRight2;
+
+                    String positionName1 = deviceInfoDto.getAreaNo() + "区" +
+                            i + "列" + k + "节" + n + "层" + leftOrRight1;
+                    //生成架位标签表id
+                    deviceArchivesTag.setId(NanoIdUtils.randomNanoId());
+                    deviceArchivesTag.setPosition(position1);
+                    deviceArchivesTag.setDeviceInfoId(deviceInfoDto.getId());
+                    deviceArchivesTag.setPosition_name(positionName1);
+                    deviceArchivesTag.setDirection(leftOrRight1);
+                    deviceArchivesTag.setColumnRowNo(i);
+                    deviceArchivesTag.setPartNo(k);
+                    deviceArchivesTag.setRowNo(n);
+                    deviceArchivesTag.setAreaNo(deviceInfoDto.getAreaNo());
+                    deviceArchivesTag.setSumColumnNo(deviceInfoDto.getSumColumnNo());
+                    deviceArchivesTag.setStoreroomCode(deviceInfoDto.getStoreroomCode());
+                    deviceArchivesTagRepository.save(deviceArchivesTag);
                 }
             }
         }
@@ -180,6 +200,7 @@ public class DeviceImpl implements DeviceService {
         deviceInfo1.setDeviceName(deviceInfoDto.getDeviceName());
         deviceInfo1.setDeviceIp(deviceInfoDto.getDeviceIp());
         deviceInfo1.setDevicePort(deviceInfoDto.getDevicePort());
+        deviceInfo1.setStoreroomCode(deviceInfoDto.getStoreroomCode());
         IsLinkageState(deviceInfoDto);
         IsCallbackState(deviceInfoDto);
         deviceInfoRepository.save(deviceInfo1);
@@ -465,16 +486,6 @@ public class DeviceImpl implements DeviceService {
     }
 
 
-    /**
-     * 生成架位左右位置
-     *
-     * @return
-     */
-    private Boolean GenerateNum() {
-        Random random = new Random();
-        return random.nextBoolean();
-    }
-
     /**
      * 判断第三方接口状态
      *