inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -501,7 +501,7 @@ } // 生成编号 String no = numberGenerator.generateNumberWithPrefix(3, "JCZX/ZB-" + code + LimsDateUtil.resetDate(LocalDateTime.now()), "JCZX/NS-" + code + LimsDateUtil.resetDate(LocalDateTime.now()), InsOrder::getEntrustCode); // 判断是否是季度检验, 是季度检验取消原材料季度检验下单 if (InsOrderTypeConstants.QUARTERLY_TEST.equals(order.getOrderType())) { inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
@@ -287,7 +287,7 @@ String code = "Y"; // 生成编号 String no = numberGenerator.generateNumberWithPrefix(3, "JCZX/ZB-" + code + LimsDateUtil.resetDate(LocalDateTime.now()), "JCZX/NS-" + code + LimsDateUtil.resetDate(LocalDateTime.now()), InsOrder::getEntrustCode); insOrderMapper.insert(insOrder); // 主表 @@ -408,7 +408,7 @@ String code = "Y"; // 生成编号 String no = numberGenerator.generateNumberWithPrefix(3, "JCZX/ZB-" + code + LimsDateUtil.resetDate(LocalDateTime.now()), "JCZX/NS-" + code + LimsDateUtil.resetDate(LocalDateTime.now()), InsOrder::getEntrustCode); insOrder.setExamineTime(LocalDateTime.now()); insOrder.setEntrustCode(no); @@ -510,7 +510,7 @@ String code = "Y"; // 生成编号 String no = numberGenerator.generateNumberWithPrefix(3, "JCZX/ZB-" + code + LimsDateUtil.resetDate(LocalDateTime.now()), "JCZX/NS-" + code + LimsDateUtil.resetDate(LocalDateTime.now()), InsOrder::getEntrustCode); insOrderMapper.insert(insOrder); // 主表 ruoyi-admin/src/main/resources/application-druid.yml
@@ -8,7 +8,7 @@ druid: # 主库数据源 master: url: jdbc:mysql://localhost:3306/center-lims?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://localhost:3306/center-lims-ztns?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: 123456 # 从库数据源 @@ -69,7 +69,7 @@ # 端口,默认为6379 port: 6379 # 数据库索引 database: 0 database: 1 # # 密码 # password: root2022! # 连接超时时间 ruoyi-admin/src/main/resources/application-test.yml
@@ -70,7 +70,7 @@ # 端口,默认为6379 port: 6379 # 数据库索引 database: 0 database: 1 # # 密码 password: zttZTT123! # 连接超时时间 ruoyi-admin/src/main/resources/application-ztzb.yml
@@ -70,7 +70,7 @@ # 端口,默认为6379 port: 6379 # 数据库索引 database: 0 database: 1 # # 密码 password: zttZTT123! # 连接超时时间