From 2e965db541f2d364489ef191c7e9f6d680604b6b Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Sat, 26 Oct 2024 16:49:25 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E9=87=91?= =?UTF-8?q?=E7=89=8C=E5=B7=A5=E5=8E=82=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改金牌入库回传问题 --- .../jinpai/mq/NodeDataPushListener.java | 33 +++---------------- .../service/impl/DeliveryNoteServiceImpl.java | 2 +- 2 files changed, 5 insertions(+), 30 deletions(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java index dd9cd7d16..bc5559fbb 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java @@ -166,10 +166,10 @@ public class NodeDataPushListener { if (pushEntityMap.containsKey(orderCode)) { continue; } - String arriveFor = "stock"; + String arriveFor = "carrier"; // PushOrderEntity pushOrderEntity = pushOrderEntityMap.get(orderCode); if (ObjectUtil.isNotEmpty(pushOrderEntity) && StrUtil.isNotEmpty(pushOrderEntity.getWarehouse())) { - arriveFor = "carrier"; + arriveFor = "stock"; } PushOrderDetailEntity pushOrderDetailEntity = detailEntityMap.get(orderCode); String boxCodeList = pushOrderDetailEntity.getBoxCodeList(); @@ -219,18 +219,6 @@ public class NodeDataPushListener { .content(JSONUtil.toJsonStr(js)) .resultContent(result) .build()); - if (StrUtil.isNotEmpty(pushOrderEntity.getWarehouse())) { - js.set("arriveFor", "stock"); - result = HttpUtil.post(url, JSONUtil.toJsonStr(js)); - log.info("推送工厂结果：{}", result); - // 保存推送记录 - factoryNodePushService.save(FactoryNodePushEntity.builder() - .orderCode(orderCode) - .node(FactoryNodeEnums.FINAL_NET_ARRIVE_CAR.getCode().toString()) - .content(JSONUtil.toJsonStr(js)) - .resultContent(result) - .build()); - } } } catch (Exception e) { log.error("推送工厂失败：{}", e); @@ -249,7 +237,7 @@ public class NodeDataPushListener { if (!CollUtil.contains(pushEntityMap.keySet(), pushData.getPackageCode())) { String arriveFor = "stock"; // PushOrderEntity pushOrderEntity = pushOrderEntityMap.get(pushData.getOrderCode()); - if (StrUtil.isNotEmpty(pushOrderEntity.getWarehouse())) { + if (StrUtil.isEmpty(pushOrderEntity.getWarehouse())) { arriveFor = "carrier"; } JSONObject js = new JSONObject(); @@ -264,7 +252,7 @@ public class NodeDataPushListener { js.set("arriveFor", arriveFor); JSONObject detailJson = new JSONObject(); detailJson.set(pushData.getPackageCode(), 1); - js.set("detail", detailJson.toString()); + js.set("detail", detailJson); js.set("shipNo", detailEntityMap.get(pushData.getOrderCode()).getShipNo()); log.info("推送工厂：{}", js); String url = jinPaiProperties.getOldSystemHost() + jinPaiProperties.getOldSystemAlreadyStockedUrl(); @@ -280,19 +268,6 @@ public class NodeDataPushListener { .packageCode(pushData.getPackageCode()) .resultContent(result) .build()); - if (StrUtil.isNotEmpty(pushOrderEntity.getWarehouse())) { - js.set("arriveFor", "stock"); - result = HttpUtil.post(url, JSONUtil.toJsonStr(js)); - log.info("推送工厂结果：{}", result); - // 保存推送记录 - factoryNodePushService.save(FactoryNodePushEntity.builder() - .orderCode(pushData.getOrderCode()) - .node(FactoryNodeEnums.END_WAREHOUSE_UNLOADING.getCode().toString()) - .content(JSONUtil.toJsonStr(js)) - .packageCode(pushData.getPackageCode()) - .resultContent(result) - .build()); - } } } catch (Exception e) { log.error("推送工厂失败：{}", e); diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java index d239ed115..f263e0c9c 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java @@ -260,7 +260,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl