oms修改

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentCargoMulti/BusinessDocumentCargoMultiDTO.java

@@ -99,4 +99,7 @@ public class BusinessDocumentCargoMultiDTO extends BaseVOEntity{
     @ApiModelProperty("")
     private String materialCode;
 
+    @ApiModelProperty("体积")
+    private BigDecimal materialVolume;
+
 }

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

@@ -753,6 +753,11 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
     @ApiModelProperty(value = "开户银行")
     private String accountBank;
 
+    @ApiModelProperty(value = "业务主管")
+    private String salesManager;
+    @ApiModelProperty(value = "审核意见")
+    private String reviewOpinion;
+
     @ApiModelProperty("业务单地址集合")
     private List<BusinessDocumentAddressMultiDTO>  businessDocumentAddressMultiDTOList;
 

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

@@ -91,6 +91,29 @@ public class ExecuteOrderDTO extends BaseVOEntity{
     private Long topOrganizationId;
 
 
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String vehicleTypeName;
+
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long orderShippingType;
+
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String appointShipper;
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String unloadName;
+
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String loadingName;
+
+    @ApiModelProperty("业务单号")
+    private String  businessOrderNumber;
+
+
     @ApiModelProperty(name = "组织ID集合")
     private List<Long> organizationIdList;
 

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

@@ -89,9 +89,9 @@ public class BusinessDocumentOrderApi extends BaseController{
      */
     @ApiOperation("业务单审核")
     @GetMapping(value = "/audit")
-    public AjaxResult audit(@RequestParam("ids") Long[] ids,@RequestParam("reviewStatus") Long reviewStatus)
+    public AjaxResult audit(@RequestParam("ids") Long[] ids,@RequestParam("reviewStatus") Long reviewStatus,@RequestParam("salesManager") String salesManager,@RequestParam("reviewOpinion") String reviewOpinion)
     {
-        return AjaxResult.success(businessDocumentOrderApplicationService.audit(ids,reviewStatus));
+        return AjaxResult.success(businessDocumentOrderApplicationService.audit(ids,reviewStatus,salesManager,reviewOpinion));
     }
 
     /**
@@ -103,6 +103,12 @@ public class BusinessDocumentOrderApi extends BaseController{
     {
         return toAjax(businessDocumentOrderApplicationService.execute(ids));
     }
+    @ApiOperation("获取业务单的货物内容")
+    @GetMapping("/getCargoContent/{id}")
+    public AjaxResult getCargoContent(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(businessDocumentOrderApplicationService.getCargoContent(id));
+    }
 
 
 

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executeOrder/ExecuteOrderApi.java

@@ -2,6 +2,8 @@ package com.mhd.oms.interfaces.facade.executeOrder;
 
 import java.util.List;
 
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -103,6 +105,15 @@ public class ExecuteOrderApi extends BaseController{
         return toAjax(executeOrderApplicationService.cancelIssueDocuments(ids));
     }
 
+    @ApiOperation("获取当前登录人信息")
+    @GetMapping("/getCurrentUser")
+    public LoginUser getCurrentUser()
+    {
+        LoginUser u = SecurityUtils.getLoginUser();
+//        u.getUserPo().getUserName();
+        return u;
+    }
+