hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -309,7 +309,7 @@ .eq(BigStorageCage::getEnableState, Const.SLOT_ON) .notInSql(BigStorageCage::getDeviceId, "select distinct device_id from big_storage_cage_details where state in (100,102,103)") .gt(BigStorageCage::getMaxThickness, glassInfo.getThickness()) .ge(BigStorageCage::getMaxThickness, glassInfo.getThickness()) .orderByAsc(BigStorageCage::getDeviceId) .last("limit 1")); if (null != bigStorageCage) { @@ -322,7 +322,7 @@ bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>() .eq(BigStorageCage::getRemainWidth, slotWidth) .eq(BigStorageCage::getEnableState, Const.SLOT_ON) .gt(BigStorageCage::getMaxThickness, glassInfo.getThickness()) .ge(BigStorageCage::getMaxThickness, glassInfo.getThickness()) .orderByAsc(BigStorageCage::getDeviceId) .last("limit 1")); Assert.isTrue(null != bigStorageCage, "没有空余的笼子存放玻璃"); hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@ spring: profiles: active: prod active: cz application: name: cacheVerticalGlass mybatis-plus: @@ -16,6 +16,6 @@ minCount: 5 carWidth: 5000 #大车宽度 slotWidth: 5000 #大车宽度 inCarMaxSize: 6 #进片大车最大存放玻璃数量 inCarMaxSize: 0 #进片大车最大存放玻璃数量 outCarMaxSize: 1 #出片大车最大存放玻璃数量 glassGap: 300 #玻璃间距 glassGap: 2000 #玻璃间距 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-cz.yml
@@ -10,7 +10,7 @@ password: beibo.123/ driver-class-name: com.mysql.cj.jdbc.Driver salve_hangzhoumes: url: jdbc:sqlserver://192.168.20.24:1433;databasename=hangzhoumes url: jdbc:sqlserver://192.168.10.2:1433;databasename=hangzhoumes username: sa password: beibo.123/ driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
