oms与bms修改

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java

@@ -741,6 +741,9 @@ public class BusinessDocumentOrder extends BaseVOEntity{
     @ApiModelProperty(value = "订单来源")
     private String orderSource;
 
+    @ApiModelProperty("预计出发日期")
+    private Date layDate;
+
 
     @ApiModelProperty(value = "出入库单号")
     private String entryNumber;

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java

@@ -182,6 +182,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
                     ExecuteOrderDO executeOrderDO=new ExecuteOrderDO();
                     BeanUtils.copyProperties(businessDocumentOrder,executeOrderDO);
                     executeOrderDO.setDocumentDate(businessDocumentOrder.getDocumentDate());
+                    executeOrderDO.setLayDate(businessDocumentOrder.getLayDate());
                     executeOrderDO.setBusinessDocumentId(id);
                     executeOrderDO.setBusinessDocumentNumber(businessDocumentOrder.getGoodsNumber());
                     executeOrderDO.setGoodsNumber(businessDocumentOrder.getGoodsNumber());

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java

@@ -759,6 +759,9 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
     @ApiModelProperty(value = "出入库单号")
     private String entryNumber;
 
+    @ApiModelProperty("预计出发日期")
+    private Date layDate;
+
     @ApiModelProperty("执行单")
     private List<ExecuteOrder> executeOrderList;
 

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java

@@ -739,6 +739,9 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{
     @ApiModelProperty("收款账户id")
     private String paymentAccountId;
 
+    @ApiModelProperty("预计出发日期")
+    private Date layDate;
+
     @ApiModelProperty("收款账户信息")
     private String accountInformation;
 

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/entity/ExecuteOrder.java

@@ -103,6 +103,9 @@ public class ExecuteOrder extends BaseVOEntity{
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String dischargerName;
 
+    @ApiModelProperty("预计出发日期")
+    private Date layDate;
+
 
 
     @ApiModelProperty( "下发状态 0-无状态 1-未下发 2-已下发 ")

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java

@@ -185,6 +185,10 @@ public class ExecuteOrderPO extends BaseVOEntity{
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String loadingLatitude;
 
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date layDate;
+
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String loadingUnit;

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java

@@ -112,6 +112,9 @@ public class ExecuteOrderDO extends BaseVOEntity{
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String loadingName;
 
+    @ApiModelProperty("预计出发日期")
+    private Date layDate;
+
     @ApiModelProperty(name = "组织ID集合")
     private List<Long> organizationIdList;
 

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

@@ -765,6 +765,9 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
     @ApiModelProperty(value = "出入库单号")
     private String entryNumber;
 
+    @ApiModelProperty("预计出发日期")
+    private Date layDate;
+
     @ApiModelProperty("业务单地址集合")
     private List<BusinessDocumentAddressMultiDTO>  businessDocumentAddressMultiDTOList;
 

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

@@ -128,4 +128,7 @@ public class ExecuteOrderDTO extends BaseVOEntity{
 
     @ApiModelProperty("备注")
     private String  shippingNote;
+
+    @ApiModelProperty("预计出发日期")
+    private Date layDate;
 }