1.修复梦天数据接受失败的情况

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

@@ -10,7 +10,7 @@ import java.util.List;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class MtFactoryDataDTO extends MtFactoryOrderMain {
+public class MtFactoryDataDTO extends MtFactoryOrderMainDTO {
 
 	@JsonProperty("发货单明细")
 	private List<MtFactoryOrderDTO> orderList = new ArrayList<>();

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

@@ -2,6 +2,7 @@ package com.logpm.factory.mt.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.logpm.factory.mt.entity.MtFactoryOrder;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -9,8 +10,74 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Data
-@EqualsAndHashCode(callSuper = true)
+public class MtFactoryOrderDTO {
-public class MtFactoryOrderDTO extends MtFactoryOrder {
+
+	@JsonProperty("总单编号")
+	@ApiModelProperty(value = "总单编号")
+	private String mainOrderCode;
+
+	@JsonProperty("订单编号")
+	@ApiModelProperty(value = "订单编号")
+	private String orderCode;
+
+	@JsonProperty("客户姓名")
+	@ApiModelProperty(value = "客户姓名")
+	private String customName;
+
+	@JsonProperty("客户电话")
+	@ApiModelProperty(value = "客户电话")
+	private String customPhone;
+
+	@JsonProperty("客户地址")
+	@ApiModelProperty(value = "客户地址")
+	private String customAddress;
+
+	@JsonProperty("经销商编号")
+	@ApiModelProperty(value = "经销商编码")
+	private String dealerCode;
+
+	@JsonProperty("经销商名称")
+	@ApiModelProperty(value = "经销商名称")
+	private String dealerName;
+
+	@JsonProperty("专卖店编号")
+	@ApiModelProperty(value = "专卖店编号")
+	private String exclusiveCode;
+
+	@JsonProperty("专卖店名称")
+	@ApiModelProperty(value = "专卖店名称")
+	private String exclusiveName;
+
+	@JsonProperty("收货人")
+	@ApiModelProperty(value = "收货人")
+	private String consignee;
+
+	@JsonProperty("收货人电话")
+	@ApiModelProperty(value = "收货人电话")
+	private String consigneePhone;
+
+	@JsonProperty("收货地址")
+	@ApiModelProperty(value = "收货人地址")
+	private String consigneeAddress;
+
+	@JsonProperty("出库方式")
+	@ApiModelProperty(value = "出库方式")
+	private String outboundType;
+
+	@JsonProperty("品牌")
+	@ApiModelProperty(value = "品牌")
+	private String brand;
+
+	@JsonProperty("生产单号")
+	@ApiModelProperty(value = "生产单号")
+	private String produceOrderCode;
+
+	@JsonProperty("包件数")
+	@ApiModelProperty(value = "包件数")
+	private String quantity;
+
+	@ApiModelProperty(value = "发货单id")
+	private Long mainId;
 
 	@JsonProperty("包装明细")
 	private List<MtPackageInfoDTO> packageInfos = new ArrayList<>();

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

@@ -10,7 +10,7 @@ import java.io.Serializable;
  * 数据传输对象
  */
 @Data
-public class MtFactoryOrderMainDTO  implements Serializable {
+public class MtFactoryOrderMainDTO implements Serializable {
 
 	@JsonProperty("发货单编号")
 	@ApiModelProperty(value = "发货单编号")

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

@@ -1,10 +1,60 @@
 package com.logpm.factory.mt.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.logpm.factory.mt.entity.MtPackageInfo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(callSuper = true)
+public class MtPackageInfoDTO  {
-public class MtPackageInfoDTO extends MtPackageInfo {
+
+	@JsonProperty("出库人")
+	@ApiModelProperty(value = "出库人")
+	private String outboundMan;
+
+	@JsonProperty("出库时间")
+	@ApiModelProperty(value = "出库时间")
+	private String outboundDate;
+
+	@JsonProperty("数量")
+	@ApiModelProperty(value = "数量")
+	private Integer number;
+
+	@JsonProperty("包装编号")
+	@ApiModelProperty(value = "包装编号")
+	private String packageCode;
+
+	@JsonProperty("包装类型")
+	@ApiModelProperty(value = "包装类型")
+	private String packageType;
+
+	@JsonProperty("大类")
+	@ApiModelProperty(value = "大类")
+	private String bigType;
+
+	@JsonProperty("小类")
+	@ApiModelProperty(value = "小类")
+	private String smallType;
+
+	@JsonProperty("油漆颜色")
+	@ApiModelProperty(value = "油漆颜色")
+	private String color;
+
+	@JsonProperty("型号")
+	@ApiModelProperty(value = "型号")
+	private String model;
+
+	@JsonProperty("门扇尺寸")
+	@ApiModelProperty(value = "尺寸")
+	private String size;
+
+	@ApiModelProperty(value = "订单id")
+	private Long orderId;
+
+	@ApiModelProperty(value = "订单自编码")
+	private String orderCode;
+
+
 }