From 3d1eec6afbf9053f2a9ab74a17f2e78a5ea05831 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Tue, 12 Dec 2023 13:24:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasereceiptRequestMainController.java | 5 +---- .../PurchasereturnRequestMainController.java | 8 ++++++++ .../PurchasereturnRequestMainService.java | 9 ++++++++- .../PurchasereturnRequestMainServiceImpl.java | 12 +++++++++++- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java index aa6606ec..245ce696 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java @@ -9,10 +9,7 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; -import com.win.module.wms.controller.itembasic.vo.ItembasicRespVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.*; -import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestMainConvert; import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO; import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO; @@ -65,7 +62,7 @@ public class PurchasereceiptRequestMainController { @Operation(summary = "更新采购收货申请主") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-main:update')") public CommonResult updatePurchasereceiptRequestMain(@Valid @RequestBody PurchasereceiptRequestMainUpdateReqVO updateReqVO) { - Integer result = purchasereceiptRequestMainService.updatePurchasereceiptRequestMain(updateReqVO); + int result = purchasereceiptRequestMainService.updatePurchasereceiptRequestMain(updateReqVO); return success(result > 0); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java index 3df8b77e..d455f2ed 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java @@ -62,6 +62,14 @@ public class PurchasereturnRequestMainController { return success(purchasereturnRequestMainService.createPurchasereturnRequestMain(createReqVO)); } + @PutMapping("/update") + @Operation(summary = "更新采购退货申请主") + @PreAuthorize("@ss.hasPermission('wms:purchasereturn-request-main:update')") + public CommonResult updatePurchasereturnRequestMain(@Valid @RequestBody PurchasereturnRequestMainUpdateReqVO updateReqVO) { + int result = purchasereturnRequestMainService.updatePurchasereturnRequestMain(updateReqVO); + return success(result > 0); + } + @GetMapping("/page") @Operation(summary = "获得采购退货申请主分页") @PreAuthorize("@ss.hasPermission('wms:purchasereturn-request-main:query')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainService.java index 8e03f034..64074331 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainService.java @@ -22,7 +22,14 @@ public interface PurchasereturnRequestMainService { * @return 编号 */ Long createPurchasereturnRequestMain(@Valid PurchasereturnRequestMainCreateReqVO createReqVO); - + + /** + * 更新采购退货申请主 + * + * @param updateReqVO 更新信息 + */ + int updatePurchasereturnRequestMain(@Valid PurchasereturnRequestMainUpdateReqVO updateReqVO); + /** * 获得用高级搜索采购退货申请主分页列表 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java index 4b712d76..e76a8445 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java @@ -133,6 +133,16 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque return mainDO.getId(); } + @Override + public int updatePurchasereturnRequestMain(PurchasereturnRequestMainUpdateReqVO updateReqVO) { + // 校验存在 + validatePurchasereturnRequestMainExists(updateReqVO.getId()); + // 更新主表 + PurchasereturnRequestMainDO purchasereturnRequestMainDO =PurchasereturnRequestMainConvert.INSTANCE.convert(updateReqVO); + trendsApi.createTrends(purchasereturnRequestMainDO.getId(), "purchasereturnRequest", "增加了采购退货申请", TrendsTypeEnum.CREATE); + return purchasereturnRequestMainMapper.updateById(purchasereturnRequestMainDO); + } + @Override public PageResult getPurchasereturnRequestMainSenior(CustomConditions conditions) { return purchasereturnRequestMainMapper.selectSenior(conditions); @@ -211,7 +221,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque } private void ifDetailQtyBigThanQty(BigDecimal detailQty, BigDecimal qty) { - if (detailQty.compareTo(qty) > 0) { + if (detailQty.compareTo(qty) < 0) { throw exception(QTY_EXCEPTION, "退货数量" + qty + "不能大于收货数量" + detailQty); } }