入库单加字段;

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java

@@ -352,4 +352,32 @@ public class InMaterialDetailDTO extends BaseVOEntity {
     @Excel(name = "总价")
     private BigDecimal totalPrice;
 
-}
+    @ApiModelProperty("合同收费")
+    @Excel(name = "合同收费")
+    private BigDecimal contractFee;
+
+    @ApiModelProperty("每月仓租")
+    @Excel(name = "每月仓租")
+    private BigDecimal monthlyWarehouseFee;
+
+    @ApiModelProperty("半月仓租")
+    @Excel(name = "半月仓租")
+    private BigDecimal halfMonthWhFee;
+
+    @ApiModelProperty("折扣(%)")
+    @Excel(name = "折扣(%)")
+    private BigDecimal discountRate;
+
+    @ApiModelProperty("单体积(CBM)")
+    @Excel(name = "单体积(CBM)")
+    private BigDecimal singleVolume;
+
+    @ApiModelProperty("单毛重(KG)")
+    @Excel(name = "单毛重(KG)")
+    private BigDecimal singleGrossWeight;
+
+    @ApiModelProperty("lot编号")
+    @Excel(name = "lot编号")
+    private String lotNo;
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java

@@ -338,6 +338,33 @@ public class StockInOrderDTO extends StockInOrderBaseDTO {
     @Excel(name = "下单日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date orderDate;
 
+
+    @ApiModelProperty("业务单号")
+    @Excel(name = "业务单号")
+    private String businessOrderNo;
+
+    @ApiModelProperty("业务类型")
+    @Excel(name = "业务类型")
+    private String businessType;
+
+    @ApiModelProperty("制单人")
+    @Excel(name = "制单人")
+    private String documentCreator;
+
+    @ApiModelProperty("制单人名称")
+    @Excel(name = "制单人名称")
+    private String documentCreatorName;
+
+    @ApiModelProperty("制单日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "制单日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date documentDate;
+
+    @ApiModelProperty("订单状态")
+    @Excel(name = "订单状态")
+    private String orderStatus;
+
     @ApiModelProperty(name = "创建时间查询条件开始日期")
     private String createTimeStart;
 
@@ -349,4 +376,4 @@ public class StockInOrderDTO extends StockInOrderBaseDTO {
 
     @ApiModelProperty("入库明细-物料编码，模糊匹配，与前端参数 materialCode 一致")
     private String materialCode;
-}
+}