From 2e490ac9cbf79c5f5da8a6184d606f53c3f4c899 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Fri, 26 Jul 2024 11:34:16 +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=E4=BC=A0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/factorydata/mengtian/mq/NodeDataPushListener.java | 2 ++ .../factorydata/mengtian/vo/CentralStkInConfirmOrderVO.java | 4 ++++ .../factorydata/mengtian/vo/SignForConfirmPackageVO.java | 4 ++++ 3 files changed, 10 insertions(+) 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 e947686d6..cf5c132af 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 @@ -160,6 +160,7 @@ public class NodeDataPushListener { mtPushDataDTOS1.stream().map(mtPushDataDTO -> { return CentralStkInConfirmOrderVO.builder() .orderCode(mtPushDataDTO.getOrderCode()) + .outWarehouseType(mtPushDataDTO.getOutWarehouseType()) .packageVOS( content.stream() .filter(pushData -> StrUtil.equals(pushData.getOrderCode(), mtPushDataDTO.getOrderCode())) @@ -268,6 +269,7 @@ public class NodeDataPushListener { pushData -> { return SignForConfirmPackageVO.builder() .orderCode(pushData.getOrderCode()) + .outWarehouseType(mtPushDataDTOMap.get(pushData.getOrderCode()).getOutWarehouseType()) .packageCode(pushData.getPackageCode()) .operatingTime(operatorTime) .warehouseCode(mtPushDataDTOMap.get(pushData.getOrderCode()).getWarehouseCode()) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/vo/CentralStkInConfirmOrderVO.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/vo/CentralStkInConfirmOrderVO.java index 1ca739414..b8cb451fc 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/vo/CentralStkInConfirmOrderVO.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/vo/CentralStkInConfirmOrderVO.java @@ -24,6 +24,10 @@ public class CentralStkInConfirmOrderVO implements Serializable { @JsonProperty("订单号") private String orderCode; + @ApiModelProperty("工厂出库方式") + @JsonProperty("工厂出库方式") + private String outWarehouseType; + @ApiModelProperty("包件列表") @JsonProperty("包件列表") private List packageVOS; diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/vo/SignForConfirmPackageVO.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/vo/SignForConfirmPackageVO.java index 9cf13170e..1525311dd 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/vo/SignForConfirmPackageVO.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/vo/SignForConfirmPackageVO.java @@ -27,6 +27,10 @@ public class SignForConfirmPackageVO implements Serializable { @JsonProperty("订单编号") private String orderCode; + @ApiModelProperty("工厂出库方式") + @JsonProperty("工厂出库方式") + private String outWarehouseType; + @ApiModelProperty("包条码") @JsonProperty("包条码") private String packageCode;