Browse Source

Merge branch 'dev' into pre-production

master
zhaoqiaobo 5 months ago
parent
commit
643b79ba04
  1. 8
      blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java
  2. 4
      blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/pros/MengTianProperties.java

8
blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java

@ -141,7 +141,7 @@ public class NodeDataPushListener {
.packageCode(centralStkInVO.getPackageCode()) .packageCode(centralStkInVO.getPackageCode())
.type("收货") .type("收货")
.build(); .build();
sendFactory(s, "mt.poc.ht_yc_noms.CentralStkIn", mengTianProperties.getCentralStkInUrl(), entity); sendFactory(s, mengTianProperties.getCentralStkInCode(), mengTianProperties.getCentralStkInUrl(), entity);
} }
} }
} }
@ -207,7 +207,7 @@ public class NodeDataPushListener {
.packageCode(packageCodes) .packageCode(packageCodes)
.type("确认收货") .type("确认收货")
.build(); .build();
sendFactory(s, "mt.poc.ht_yc_noms.CentralStkInConfirm", mengTianProperties.getCentralStkInConfirmUrl(), entity); sendFactory(s, mengTianProperties.getCentralStkInConfirmCode(), mengTianProperties.getCentralStkInConfirmUrl(), entity);
} }
} }
} }
@ -260,7 +260,7 @@ public class NodeDataPushListener {
.type("签收") .type("签收")
.sendTaskId(signForVO.getSendTaskId()) .sendTaskId(signForVO.getSendTaskId())
.build(); .build();
sendFactory(s, "mt.poc.ht_yc_noms.SignFor", mengTianProperties.getSignForUrl(), entity); sendFactory(s, mengTianProperties.getSignForCode(), mengTianProperties.getSignForUrl(), entity);
} }
} }
} }
@ -320,7 +320,7 @@ public class NodeDataPushListener {
.type("确认签收") .type("确认签收")
.sendTaskId(confirmVO.getSendTaskId()) .sendTaskId(confirmVO.getSendTaskId())
.build(); .build();
sendFactory(s, "mt.poc.ht_yc_noms.SignForConfirm", mengTianProperties.getSignForConfirmUrl(), entity); sendFactory(s, mengTianProperties.getSignForConfirmCode(), mengTianProperties.getSignForConfirmUrl(), entity);
} }
} }

4
blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/pros/MengTianProperties.java

@ -18,12 +18,16 @@ public class MengTianProperties {
* 收货 url * 收货 url
*/ */
private String centralStkInUrl; private String centralStkInUrl;
private String centralStkInCode;
/** 确认收货 url */ /** 确认收货 url */
private String centralStkInConfirmUrl; private String centralStkInConfirmUrl;
private String centralStkInConfirmCode;
/** 签收扫描 url */ /** 签收扫描 url */
private String signForUrl; private String signForUrl;
private String signForCode;
/** 确认签收 url */ /** 确认签收 url */
private String signForConfirmUrl; private String signForConfirmUrl;
private String signForConfirmCode;
/** /**
* 是否推送工厂 * 是否推送工厂
*/ */

Loading…
Cancel
Save