root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 手持暂存查询新增禁用提示、内包间气胀轴回暂存库校验终点

Browse Source
This commit is contained in:
liyongde
2024-07-22 09:56:00 +08:00
parent 0719a5b90f
commit 9977b2cee6
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml
View File

@@ -47,7 +47,7 @@
AND b.qzz_generation = #{startPoint.qzz_generation} AND b.qzz_generation = #{startPoint.qzz_generation}
</if> </if>
AND b.point_location = #{startPoint.point_location} AND b.point_location = #{startPoint.point_location}
AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status <![CDATA[ < ]]> '07' AND t.point_code1 = b.point_code) AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status <![CDATA[ < ]]> '07' AND t.point_code2 = b.point_code)
ORDER BY b.sort_seq ASC ORDER BY b.sort_seq ASC
</select> </select>
<select id="getOtherCBJData" resultType="org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.BstIvtShafttubeivt"> <select id="getOtherCBJData" resultType="org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.BstIvtShafttubeivt">

3
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
View File

@@ -1447,6 +1447,9 @@ public class SlitterServiceImpl implements SlitterService {
? "空位" : "2".equals(point.getPoint_status()) ? "空位" : "2".equals(point.getPoint_status())
? "有气胀轴" : "3".equals(point.getPoint_status()) ? "有气胀轴" : "3".equals(point.getPoint_status())
? "有子卷" : "-"); ? "有子卷" : "-");
if (SlitterConstant.SLITTER_NO.equals(point.getIs_used())) {
data.put("status", "已禁用");
}
return res; return res;
} }
} }

8
lms/nladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -6,11 +6,11 @@ spring:
druid: druid:
db-type: com.alibaba.druid.pool.DruidDataSource db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:88lmsdb}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true # url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:88lmsdb}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
# url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_two_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_two_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:root} username: ${DB_USER:root}
password: ${DB_PWD:NLABC&hl123} # password: ${DB_PWD:NLABC&hl123}
# password: ${DB_PWD:12356} password: ${DB_PWD:12356}
# 初始连接数 # 初始连接数
initial-size: 5 initial-size: 5
# 最小连接数 # 最小连接数