From 658481e69157e6ab39dc049ae599d455c6544b2d Mon Sep 17 00:00:00 2001 From: zhaoqing <1670883518@qq.com> Date: Sat, 16 May 2026 16:01:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E6=94=B9=E5=8D=95=E7=94=B3=E8=AF=B7/?= =?UTF-8?q?=20=20=E8=B4=A7=E7=89=A9=E6=95=B0=E9=87=8F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...sinessDocumentOrderApplicationService.java | 4 +++- .../po/BusinessDocumentOrderPO.java | 3 +++ .../OrderWithMaterialDTO.java | 24 ++++++++++++++++++- .../OriginalImportExportDocumentApi.java | 6 ++--- .../BusinessDocumentOrderMapper.xml | 3 ++- 5 files changed, 34 insertions(+), 6 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java index e720f506a..f80775341 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java +++ b/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); } diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java index 861817d6f..20581a015 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java +++ b/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; diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/originalImportExportDocument/OrderWithMaterialDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/originalImportExportDocument/OrderWithMaterialDTO.java index 4a094af1e..58614bc6d 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/originalImportExportDocument/OrderWithMaterialDTO.java +++ b/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 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; } diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/originalImportExportDocument/OriginalImportExportDocumentApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/originalImportExportDocument/OriginalImportExportDocumentApi.java index 08e0da384..b8f7f6add 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/originalImportExportDocument/OriginalImportExportDocumentApi.java +++ b/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 page = (Page) orderList; List resultList = convertToOrderWithMaterialList(orderList); - + //return getDataTable(resultList); TableDataInfo tableDataInfo = new TableDataInfo(); tableDataInfo.setData(resultList); tableDataInfo.setTotal(page.getTotal()); diff --git a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml index fcc87175f..c56207614 100644 --- a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml @@ -181,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -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}