配置文件更新；

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ContractSamplingServiceImpl.java

@@ -183,6 +183,7 @@ public class ContractSamplingServiceImpl extends BaseServiceImpl<ContractSamplin
                 break;
         }
 
+        sample.setCodeRuleType((int) codeType.getValue());
         String sampleCode;
         String replaceStr = "XX", inspectNo = "", secondCode = "", thirdCode = "";
         // ==

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustServiceImpl.java

@@ -355,8 +355,8 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         Long samplingId = sample.getSamplingId();
         if (null != samplingId) {
             ContractSampling sampling = contractSamplingService.getById(samplingId);
-            sample.setCode(sampling.getCode()).setFirstCode(sampling.getFirstCode())
-                    .setSecondCode(sampling.getSecondCode());
+            sample.setCode(sampling.getCode()).setFirstCode(sampling.getFirstCode()).setSecondCode(sampling.getSecondCode())
+                    .setCodeType(sampling.getCodeType()).setCodeRuleType(sampling.getCodeRuleType());
             // 进场物资，使用针对进场物资的生成规则
             if (1 == entrust.getType()) {
                 thirdCode = getSampleThirdCode(sample);

src/main/resources/application-dev.yml

@@ -13,15 +13,15 @@ spring:
     type: com.zaxxer.hikari.HikariDataSource
     username: postgres
     password: www.163.com
-    url: jdbc:postgresql://192.168.0.140:5432/dev_lims_hmhj
+    url: jdbc:postgresql://192.168.1.140:5432/dev_lims_hmhj
     driver-class-name: org.postgresql.Driver
     dynamic:
       enabled: false
   # 注册中心配置
   cloud:
-    consul: localhost
+    consul: 192.168.1.140
   rabbitmq:
-    host: 192.168.0.140
+    host: 192.168.1.140
     port: 5672
     username: mqbase
     password: mqb123#@$5
@@ -36,10 +36,10 @@ spring:
   # Mongodb GridFS
   data:
     mongodb:
-      uri: mongodb://limsAdmin:devpt12!mg@192.168.0.140:27017/lims
+      uri: mongodb://limsAdmin:devpt12!mg@192.168.1.140:27017/lims
       grid-fs-database: lims
   redis:
-    host: 192.168.0.140
+    host: 192.168.1.140
     port: 6379
     password: 123456
 

src/main/resources/application-local.yml

-# 霍煤鸿骏生产环境
+# 开发环境
 server:
   exception:
-    to: 1327531085@qq.com;18463106881@163.com
-    form: ptlims_test@163.com
-    subject: 霍煤鸿骏 hmhj服务异常
+    enable: false
 swagger:
   enable: true
 service:
@@ -13,60 +11,53 @@ service:
 spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
-    url: jdbc:postgresql://localhost:5432/dev_lims_hmhj
     username: postgres
-    password: post123
+    password: www.163.com
+    url: jdbc:postgresql://192.168.1.140:5432/dev_lims_hmhj
+    driver-class-name: org.postgresql.Driver
     dynamic:
       enabled: false
   # 注册中心配置
   cloud:
-    consul:
-      host: localhost
-  redis:
-    database: 0
-    host: meazty.fun
-    port: 6379
-    password: rest123
-  mail:
-    host: smtp.163.com
-    username: ptlims_test@163.com
-    password: QTXWOTEUSHARYDWT
-    port: 25
-    protocol: smtp
-    default-encoding: UTF-8
+    consul: localhost
   rabbitmq:
-    host: 8.142.29.214
+    host: 192.168.1.140
     port: 5672
     username: mqbase
     password: mqb123#@$5
     virtual-host: /
     topic:
-      push-msg: pro.topic.push.msg
-      sys-log: pro.topic.sys.log
-      chemical-classify-warning: pro.topic.chemical.classify.warning
-      equip-check-msg: pro.topic.equip.check.msg
-      report-make-msg: pro.topic.report.make.msg
-      soil-work-msg: pro.topic.soil.work.msg
-      hmhj-work-msg: pro.topic.hmhj.work.msg
-  servlet:
-    multipart:
-      #设置 http 上传的临时目录
-      location: C:\patzn\upload_tmp
+      push-msg: dev.topic.push.msg
+      sys-log: dev.topic.sys.log
+      chemical-classify-warning: dev.topic.chemical.classify.warning
+      equip-check-msg: dev.topic.equip.check.msg
+      report-make-msg: dev.topic.report.make.msg
+      hmhj-work-msg: dev.topic.hmhj.work.msg
   # Mongodb GridFS
   data:
     mongodb:
-      #uri: mongodb://limsAdmin:devpt12!mg@192.168.0.142:27017/lims
-      uri: mongodb://mongo:Mong$6358#@meazty.fun:27154/lims
+      uri: mongodb://limsAdmin:devpt12!mg@192.168.1.140:27017/lims
       grid-fs-database: lims
+  redis:
+    host: 192.168.1.140
+    port: 6379
+    password: 123456
 
-# Mongodb GridFS 存储
+# 对象存储配置
 oss:
   grid-fs: true
   bucket-name: base
 
-#libreOffice 安装信息
-libreOffice:
-  url: D:/Program Files/LibreOffice
 ### jobs
 jobs:
-  admin-address: http://api.dev.patzn.com:7000/print
+  admin-address: http://api.dev.patzn.com:7000/print
\ No newline at end of file
+
+#libreOffice 安装信息
+libreOffice:
+  url: C:/Program Files/LibreOffice
+# ribbon 路由配置
+food.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule
+print.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule
+res.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule
+convert.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule
+hmhj.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule