oms修改

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

@@ -4,6 +4,7 @@ import com.mhd.common.core.annotation.Excel;
 import com.mhd.oms.domain.businessDocumentAddressMulti.entity.BusinessDocumentAddressMulti;
 import com.mhd.oms.domain.businessDocumentAddressMulti.repository.todo.BusinessDocumentAddressMultiDO;
 import com.mhd.oms.domain.businessDocumentCargoMulti.entity.BusinessDocumentCargoMulti;
+import com.mhd.oms.domain.businessOrderAccount.BusinessOrderAccount;
 import com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessDocumentAddressMultiDTO;
 import com.mhd.oms.interfaces.dto.businessDocumentCargoMulti.BusinessDocumentCargoMultiDTO;
 import lombok.Data;
@@ -758,6 +759,12 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
     @ApiModelProperty(value = "审核意见")
     private String reviewOpinion;
 
+    @ApiModelProperty("订单来源")
+    private String orderSource;
+
+    @ApiModelProperty(value = "出入库单号")
+    private String entryNumber;
+
     @ApiModelProperty("业务单地址集合")
     private List<BusinessDocumentAddressMultiDTO>  businessDocumentAddressMultiDTOList;
 
@@ -774,4 +781,7 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
     @ApiModelProperty(value = "卸货地址集合")
     private List<BusinessDocumentAddressMultiDTO> unloadAddressList;
 
+    @ApiModelProperty("费用科目明细")
+    private List<BusinessOrderAccount> businessOrderAccountList;
+
 }

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

@@ -119,4 +119,13 @@ public class ExecuteOrderDTO extends BaseVOEntity{
 
     @ApiModelProperty(name = "权限菜单ID")
     private Long permissionMenuId;
+
+    @ApiModelProperty("作业情况")
+    private String  jobStatus;
+
+    @ApiModelProperty("预计运输时间")
+    private Date  documentDate;
+
+    @ApiModelProperty("备注")
+    private String  shippingNote;
 }

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentOrder/BusinessDocumentOrderApi.java

@@ -64,6 +64,13 @@ public class BusinessDocumentOrderApi extends BaseController{
         }
     }
 
+    @ApiOperation("根据业务单id查询费用明细")
+    @GetMapping("/getFeeDetail/{id}")
+    public AjaxResult getFeeDetail(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(businessDocumentOrderApplicationService.getFeeDetail(id));
+    }
+
     /**
      * 批量删除【业务单】
      */