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(); - } - /** * 判断第三方接口状态 *