删改单申请/ 货物数量查询

mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java

@@ -146,7 +146,9 @@ public class BusinessDocumentOrderApplicationService {
 
     public void reviseApply(BusinessDocumentOrderDTO businessDocumentOrderDTO) {
         BusinessDocumentOrder businessDocumentOrder = new BusinessDocumentOrder();
-        BeanUtils.copyProperties(businessDocumentOrder,businessDocumentOrderDTO);
+        BeanUtils.copyProperties(businessDocumentOrderDTO,businessDocumentOrder);
+        businessDocumentOrder.setReviseApplyTime(new Date());
+        businessDocumentOrder.setReviseApplyStatus(1);
         businessDocumentOrderMapper.updateById(businessDocumentOrder);
 
     }

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

@@ -800,6 +800,9 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
     @ApiModelProperty("商品类型")
     private Integer productType;
 
+    @ApiModelProperty(value = "货物数量")
+    private BigDecimal cargoNum;
+
     @ApiModelProperty("删改单申请类型：0-改单 1-删除 2-作废")
     private Integer reviseApplyType;
 

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

@@ -782,7 +782,7 @@ public class OrderWithMaterialDTO {
     @ApiModelProperty("仓库负责人电话")
     private String directorPhone;
 
-    @ApiModelProperty("仓库负责人电话")
+    @ApiModelProperty("件数")
     private BigDecimal  CargoNum;
 
     @ApiModelProperty("币制")
@@ -816,4 +816,26 @@ public class OrderWithMaterialDTO {
 
     @ApiModelProperty("商品类型列表")
     private List<Integer> productTypeList;
+
+
+
+    @ApiModelProperty("删改单申请类型：0-改单 1-删除 2-作废")
+    private Integer reviseApplyType;
+
+    @ApiModelProperty("删改单申请状态：0-未申请 1-申请成功 2-申请失败")
+    private Integer reviseApplyStatus;
+
+    @ApiModelProperty("删改单申请人")
+    private String reviseApplyBy;
+
+    @ApiModelProperty("删改单申请人姓名")
+    private String reviseApplyByName;
+
+    @ApiModelProperty("删改单申请原因")
+    private String reviseApplyReason;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("删改单申请时间")
+    private Date reviseApplyTime;
 }

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

@@ -67,11 +67,11 @@ public class OriginalImportExportDocumentApi extends BaseController {
 
     @ApiOperation("删改单申请")
     @PostMapping("/reviseApply")
-    public AjaxResult reviseApply(@RequestParam BusinessDocumentOrderDTO businessDocumentOrderDTO) {
+    public AjaxResult reviseApply(@RequestBody BusinessDocumentOrderDTO businessDocumentOrderDTO) {
 
         businessDocumentOrderApplicationService.reviseApply(businessDocumentOrderDTO);
 
-        return null;
+        return AjaxResult.success();
     }
 
     @ApiOperation("批量推送")
@@ -103,7 +103,7 @@ public class OriginalImportExportDocumentApi extends BaseController {
         Page<BusinessDocumentOrderPO> page = (Page<BusinessDocumentOrderPO>) orderList;
 
         List<OrderWithMaterialDTO> resultList = convertToOrderWithMaterialList(orderList);
-
+        //return getDataTable(resultList);
         TableDataInfo tableDataInfo = new TableDataInfo();
         tableDataInfo.setData(resultList);
         tableDataInfo.setTotal(page.getTotal());

mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml

@@ -181,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reviseApplyByName"    column="REVISE_APPLY_BY_NAME"    />
         <result property="reviseApplyReason"    column="REVISE_APPLY_REASON"    />
         <result property="reviseApplyTime"    column="REVISE_APPLY_TIME"    />
+        <result property="cargoNum"    column="CARGO_NUM"    />
     </resultMap>
 
 
@@ -711,7 +712,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select  SALESPERSON_NC_CODE from NGWL_TEST_USER."USER" where USER_ID = #{salesmanCodeNc}</select>
 
     <select id="queryListAndMaterial" parameterType="com.mhd.oms.domain.businessDocumentOrder.repository.todo.BusinessDocumentOrderDO" resultMap="BusinessDocumentOrderResult">
-        select o.*,a.material_code , a.material_base_info_id ,a.product_type
+        select o.*,a.material_code , a.material_base_info_id ,a.product_type,a.cargo_num
         from business_document_order as o
         left join business_document_cargo_multi as a ON o.id = a.order_id
 <include refid="selectBusinessDocumentOrderPo3"/>