3 Коммиты cacc9ea1e1 ... 31ee6cd86d

Автор SHA1 Сообщение Дата
  txf 31ee6cd86d as 3 лет назад
  txf d2b80eca31 Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAL-DAZHOU-WMSH-API 3 лет назад
  txf b5004cbdd7 a 3 лет назад

+ 3 - 0
src/main/java/com/steerinfo/dil/service/impl/WmshInboundResultServiceImpl.java

@@ -46,6 +46,9 @@ public class WmshInboundResultServiceImpl implements IWmshInboundResultService {
         //生成入库编号
         String rkNum = DataChange.generateEightDigitsNumber("GRKD", id);
         wmshInboundResult.setResultNumber(rkNum);
+        wmshInboundResult.setBatchId(DataChange.dataToBigDecimal(map.get("batchId")));
+        wmshInboundResult.setPortId(DataChange.dataToBigDecimal(map.get("portId")));
+        wmshInboundResult.setResultMaterialNumber(DataChange.dataToBigDecimal(map.get("resultMaterialNumber")));
         //生成入库日期 与 操作人员
         wmshInboundResult.setInsertTime(new Date());
         wmshInboundResult.setInsertUsername("admin");

+ 3 - 0
src/main/resources/bootstrap.yml

@@ -18,6 +18,9 @@ eureka:
   client:
     service-url:
       defaultZone: http://root:root@${EUREKA_HOST:172.16.33.166}:${EUREKA_PORT:8081}/eureka/
+    register-with-eureka: false #表示向EurekaServer注册自己 默认为true
+    fetch-registry: false #是否从EurekaServer抓取已有的注册信息,默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
+
     instance:
       prefer-ip-address: true
       status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/