Browse Source

feat(all): 修改梦天回传逻辑

dist.1.3.0
zhaoqiaobo 6 months ago
parent
commit
2e490ac9cb
  1. 2
      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/vo/CentralStkInConfirmOrderVO.java
  3. 4
      blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/vo/SignForConfirmPackageVO.java

2
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())

4
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<CentralStkInConfirmPackageVO> packageVOS;

4
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;

Loading…
Cancel
Save