From 934680421a34ea9e00b8deca49db6bbeab1ba729 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Thu, 29 Aug 2024 18:28:56 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=A2=A6?= =?UTF-8?q?=E5=A4=A9=E5=9B=9E=E6=8E=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factorydata/mengtian/mq/NodeDataPushListener.java | 10 +++++----- .../factorydata/mengtian/pros/MengTianProperties.java | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java index d0dc26255..036b4d83e 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java +++ b/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()) .type("收货") .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) .type("确认收货") .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("签收") .sendTaskId(signForVO.getSendTaskId()) .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("确认签收") .sendTaskId(confirmVO.getSendTaskId()) .build(); - sendFactory(s, "mt.poc.ht_yc_noms.SignForConfirm", mengTianProperties.getSignForConfirmUrl(), entity); + sendFactory(s, mengTianProperties.getSignForConfirmCode(), mengTianProperties.getSignForConfirmUrl(), entity); } } @@ -339,7 +339,7 @@ public class NodeDataPushListener { String resBody = ""; String resultCode = ""; try { - if(mengTianProperties.getEnable()){ + if (mengTianProperties.getEnable()) { HttpResponse execute = post.execute(); resBody = execute.body(); JSONObject entries = JSONUtil.parseObj(resBody); diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/pros/MengTianProperties.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/pros/MengTianProperties.java index 6a43b9aa4..3222ddbd2 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/pros/MengTianProperties.java +++ b/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 */ private String centralStkInUrl; + private String centralStkInCode; /** 确认收货 url */ private String centralStkInConfirmUrl; + private String centralStkInConfirmCode; /** 签收扫描 url */ private String signForUrl; + private String signForCode; /** 确认签收 url */ private String signForConfirmUrl; + private String signForConfirmCode; /** * 是否推送工厂 */