oms修改

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java

@@ -771,6 +771,12 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
     @ApiModelProperty("入库单号")
     private String inOrderNumber;
 
+    @ApiModelProperty("仓库负责人")
+    private String directorName;
+
+    @ApiModelProperty("仓库负责人电话")
+    private String directorPhone;
+
     @ApiModelProperty("业务单地址集合")
     private List<BusinessDocumentAddressMultiDTO>  businessDocumentAddressMultiDTOList;
 

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java

@@ -31,6 +31,9 @@ public class ExecuteOrderDTO extends BaseVOEntity{
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date createEndTime;
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String orderStatus;
     /**更新日期*/
     @ApiModelProperty(value = "创建开始日期")
     @Excel(name = "创建开始日期", width = 20)