进出口原始单证 查询/批量推送 删改单申请（部分）

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

@@ -7,6 +7,7 @@ import com.mhd.oms.domain.businessDocumentCargoMulti.entity.BusinessDocumentCarg
 import com.mhd.oms.domain.businessOrderAccount.BusinessOrderAccount;
 import com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessDocumentAddressMultiDTO;
 import com.mhd.oms.interfaces.dto.businessDocumentCargoMulti.BusinessDocumentCargoMultiDTO;
+import com.mhd.oms.interfaces.dto.originalImportExportDocument.OrderWithMaterialDTO;
 import lombok.Data;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -671,6 +672,8 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
 
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date documentDate;
 
 
@@ -780,6 +783,20 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
     @ApiModelProperty("进出口方式：I-进口，E-出口")
     private String ieType;
 
+    @ApiModelProperty("推送状态：1-未推送 2-推送中 3-推送成功 4-推送失败")
+    private Integer pushStatus;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("推送时间")
+    private Date pushTime;
+
+    @ApiModelProperty("推送人")
+    private String pushBy;
+
+    @ApiModelProperty("推送人姓名")
+    private String pushByName;
+
     @ApiModelProperty("业务单地址集合")
     private List<BusinessDocumentAddressMultiDTO>  businessDocumentAddressMultiDTOList;
 
@@ -799,4 +816,28 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
     @ApiModelProperty("费用科目明细")
     private List<BusinessOrderAccount> businessOrderAccountList;
 
+
+    @ApiModelProperty(value = "物料编码")
+    private String materialCode;
+
+    @ApiModelProperty(value = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty(value = "净重")
+    private BigDecimal weightLimit;
+
+    @ApiModelProperty(value = "毛重")
+    private BigDecimal grossWeight;
+
+    @ApiModelProperty(value = "单价")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty(value = "申报单位")
+    private String declarationUnit;
+
+    @ApiModelProperty(value = "原产国")
+    private String originCountry;
+
+    @ApiModelProperty(value = "物料明细列表")
+    private List<OrderWithMaterialDTO> orderWithMaterialDTOList;
 }

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/originalImportExportDocument/OrderWithMaterialDTO.java

@@ -781,4 +781,27 @@ public class OrderWithMaterialDTO {
     @ApiModelProperty("仓库负责人电话")
     private String directorPhone;
 
+    @ApiModelProperty("仓库负责人电话")
+    private BigDecimal  CargoNum;
+
+    @ApiModelProperty("币制")
+    private BigDecimal  currency;
+
+    @ApiModelProperty("包装规格")
+    private BigDecimal  packName;
+
+    @ApiModelProperty("推送状态：1-未推送 2-推送中 3-推送成功 4-推送失败")
+    private Integer pushStatus;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("推送时间")
+    private Date pushTime;
+
+    @ApiModelProperty("推送人")
+    private String pushBy;
+
+    @ApiModelProperty("推送人姓名")
+    private String pushByName;
+
 }

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/originalImportExportDocument/OriginalImportExportDocumentApi.java

@@ -17,11 +17,8 @@ import com.mhd.system.api.domain.MaterialInfoDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -63,6 +60,34 @@ public class OriginalImportExportDocumentApi extends BaseController {
         return tableDataInfo;
     }
 
+    @ApiOperation("删改单申请")
+    @PostMapping("/reviseApply")
+    public AjaxResult reviseApply(@RequestParam BusinessDocumentOrderDTO businessDocumentOrderDTO){
+
+        businessDocumentOrderApplicationService.reviseApply(businessDocumentOrderDTO);
+
+        return null;
+    }
+
+    @ApiOperation("批量推送")
+    @PostMapping("/batchPush")
+    public AjaxResult batchPush(@RequestBody List<BusinessDocumentOrderDTO> businessDocumentOrderDTOList){
+        if(businessDocumentOrderDTOList.isEmpty() || businessDocumentOrderDTOList == null){
+            return AjaxResult.error("没有数据需要推送");
+        }
+        return businessDocumentOrderApplicationService.batchPushForOriginalImportExportDocument(businessDocumentOrderDTOList);
+
+
+    }
+
+
+
+
+
+
+
+
+
     private List<OrderWithMaterialDTO> convertToOrderWithMaterialList(List<BusinessDocumentOrderPO> orderList){
         List<OrderWithMaterialDTO> resultList = new ArrayList<>();
         for(BusinessDocumentOrderPO order:orderList){