feat(all): 修改梦天新老接口回传数据逻辑

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtPushDataDTO.java

@@ -9,6 +9,8 @@ public class MtPushDataDTO implements Serializable {
 
 	/** 发货单编号 */
 	private String senderCode;
+	/** OMS */
+	private String oms;
 	/** 订单编号 */
 	private String orderCode;
 	/** 包件码 */

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtFactoryOrderMain.java

@@ -20,6 +20,9 @@ public class MtFactoryOrderMain extends BaseEntity {
 	@ApiModelProperty(value = "供应基地")
 	private String siteName;
 
+	@ApiModelProperty(value = "OMS")
+	private String oms;
+
 	//@JsonProperty("发货单编号")
 	@ApiModelProperty(value = "发货单编号")
 	private String invoiceOrderCode;

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

@@ -111,6 +111,7 @@ public class NodeDataPushListener {
 							.dealerName(mtPushDataDTO.getDealerName())
 							.inWarehouseType(finalInWarehouseType)
 							.operatingTime(operatorTime)
+							.oms(mtPushDataDTO.getOms())
 							.operatingWarehouseName(warehouse)
 							.orderCode(pushData.getOrderCode())
 							.outWarehouseType(mtPushDataDTO.getOutWarehouseType())
@@ -161,6 +162,7 @@ public class NodeDataPushListener {
 					// 按包件分组
 					CentralStkInConfirmVO confirmVO = CentralStkInConfirmVO.builder()
 						.senderCode(senderCode)
+						.oms(mtPushDataDTOS1.get(0).getOms())
 						.operatingTime(operatorTime)
 						.operatingWarehouseName(warehouse)
 						.inWarehouseType(inWarehouseType)
@@ -217,6 +219,7 @@ public class NodeDataPushListener {
 				MtPushDataDTO mtPushDataDTO = mtPushDataDTOMap.get(pushData.getPackageCode());
 				if (ObjectUtil.isNotEmpty(mtPushDataDTO)) {
 					return SignForVO.builder()
+						.oms(mtPushDataDTO.getOms())
 						.sendTaskId(entries1.getStr("boId"))
 						.senderCode(mtPushDataDTO.getSenderCode())
 						.orderCode(pushData.getOrderCode())
@@ -278,6 +281,7 @@ public class NodeDataPushListener {
 				.packageVOS(content.stream().map(
 					pushData -> {
 						return SignForConfirmPackageVO.builder()
+							.oms(mtPushDataDTOMap.get(pushData.getPackageCode()).getOms())
 							.orderCode(pushData.getOrderCode())
 							.outWarehouseType(mtPushDataDTOMap.get(pushData.getPackageCode()).getOutWarehouseType())
 							.packageCode(pushData.getPackageCode())

blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/vo/CentralStkInConfirmVO.java

@@ -23,6 +23,9 @@ public class CentralStkInConfirmVO implements Serializable {
 	@ApiModelProperty("发货单编号")
 	@JsonProperty("发货单编号")
 	private String senderCode;
+	@ApiModelProperty("OMS")
+	@JsonProperty("OMS")
+	private String oms;
 
 	@ApiModelProperty("确认收货时间")
 	@JsonProperty("确认收货时间")

blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/vo/CentralStkInVO.java

@@ -23,6 +23,10 @@ public class CentralStkInVO implements Serializable {
 	@JsonProperty("发货单编号")
 	private String senderCode;
 
+	@ApiModelProperty("OMS")
+	@JsonProperty("OMS")
+	private String oms;
+
 	@ApiModelProperty("订单编号")
 	@JsonProperty("订单编号")
 	private String orderCode;

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("OMS")
+	@JsonProperty("OMS")
+	private String oms;
+
 	@ApiModelProperty("工厂出库方式")
 	@JsonProperty("工厂出库方式")
 	private String outWarehouseType;

blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/vo/SignForVO.java

@@ -27,6 +27,10 @@ public class SignForVO implements Serializable {
 	@JsonProperty("发货单编号")
 	private String senderCode;
 
+	@ApiModelProperty("OMS")
+	@JsonProperty("OMS")
+	private String oms;
+
 	@ApiModelProperty("订单编号")
 	@JsonProperty("订单编号")
 	private String orderCode;

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/dto/MtFactoryOrderMainDTO.java

@@ -24,6 +24,10 @@ public class MtFactoryOrderMainDTO implements Serializable {
 	@ApiModelProperty(value = "发货单编号")
 	private String invoiceOrderCode;
 
+	@JsonProperty("OMS")
+	@ApiModelProperty(value = "OMS")
+	private String oms;
+
 	@JsonProperty("中心仓编号")
 	@ApiModelProperty(value = "中心仓编号")
 	private String centerWarehouseCode;

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml

@@ -104,6 +104,7 @@
     <select id="orderPushData" resultType="com.logpm.factory.mt.dto.MtPushDataDTO">
         select t.order_code orderCode,pi.package_code,
                m.invoice_order_code senderCode,
+               m.oms oms,
                t.outbound_type outWarehouseType,
                t.dealer_name dealerName,
                m.center_warehouse_code warehouseCode