From d47be2838061c73407829303a4400a88fff11b95 Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Tue, 5 Dec 2023 11:54:58 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SupplierdeliverRequestMainController.java | 45 ++++++++++ .../SupplierdeliverRequestMainService.java | 42 ++++++++++ ...SupplierdeliverRequestMainServiceImpl.java | 82 ++++++++++++++++++- 3 files changed, 168 insertions(+), 1 deletion(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java index dca0558d..cd2afac8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java @@ -164,4 +164,49 @@ public class SupplierdeliverRequestMainController { return success(returnMap); } + @PostMapping("/close") + @Operation(summary = "关闭供应商发货申请主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:purchase-main:close')") + public CommonResult closeSupplierdeliverRequestMain(@RequestParam("id") Long id) { + Integer count = supplierdeliverRequestMainService.closeSupplierdeliverRequestMain(id); + return success(count > 0); + } + + @PostMapping("/open") + @Operation(summary = "打开供应商发货申请主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:purchase-main:open')") + public CommonResult openSupplierdeliverRequestMain(@RequestParam("id") Long id) { + Integer count = supplierdeliverRequestMainService.openSupplierdeliverRequestMain(id); + return success(count > 0); + } + + @PostMapping("/sub") + @Operation(summary = "提交供应商发货申请主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:purchase-main:sub')") + public CommonResult subSupplierdeliverRequestMain(@RequestParam("id") Long id) { + Integer count = supplierdeliverRequestMainService.subSupplierdeliverRequestMain(id); + return success(count > 0); + } + + @PostMapping("/app") + @Operation(summary = "审批通过供应商发货申请主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:purchase-main:app')") + public CommonResult witSupplierdeliverRequestMain(@RequestParam("id") Long id) { + Integer count = supplierdeliverRequestMainService.witSupplierdeliverRequestMain(id); + return success(count > 0); + } + + @PostMapping("/rej") + @Operation(summary = "驳回供应商发货申请主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:purchase-main:rej')") + public CommonResult rejSupplierdeliverRequestMain(@RequestParam("id") Long id) { + Integer count = supplierdeliverRequestMainService.rejSupplierdeliverRequestMain(id); + return success(count > 0); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainService.java index 0f676cd8..d3d2cf1b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainService.java @@ -86,4 +86,46 @@ public interface SupplierdeliverRequestMainService { */ public List importSupplierdeliverRequestMainList(List datas, Integer mode, boolean updatePart); + + /** + * 关闭供应商发货申请主 + * + * @param id 采购订单申请主ID + * @return 更新数量 + */ + Integer closeSupplierdeliverRequestMain(Long id); + + /** + * 打开供应商发货申请主 + * + * @param id 采购订单申请主ID + * @return 更新数量 + */ + Integer openSupplierdeliverRequestMain(Long id); + + /** + * 提交供应商发货申请主 + * + * @param id 采购订单申请主ID + * @return 更新数量 + */ + Integer subSupplierdeliverRequestMain(Long id); + + /** + * 审批通过供应商发货申请主 + * + * @param id 采采购订单申请主ID + * @return 更新数量 + */ + Integer witSupplierdeliverRequestMain(Long id); + + /** + * 驳回供应商发货申请主 + * + * @param id 采采购订单申请主ID + * @return 更新数量 + */ + Integer rejSupplierdeliverRequestMain(Long id); + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java index 7d243b35..1fb578ad 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java @@ -27,6 +27,7 @@ import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; import com.win.module.wms.dal.dataobject.purchase.PurchaseMainDO; import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanDetailDO; +import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanMainDO; import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; import com.win.module.wms.dal.dataobject.shift.ShiftDO; import com.win.module.wms.dal.dataobject.stdcostprice.StdcostpriceDO; @@ -38,6 +39,7 @@ import com.win.module.wms.dal.mysql.supplierdeliverRequest.SupplierdeliverReques import com.win.module.wms.dal.mysql.supplierdeliverRequest.SupplierdeliverRequestMainMapper; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.enums.order.OrderStatusEnum; +import com.win.module.wms.enums.plan.PlanStatusEnum; import com.win.module.wms.enums.request.RequestStatusEnum; import com.win.module.wms.service.itembasic.ItembasicService; import com.win.module.wms.service.itempackaging.ItempackagingService; @@ -51,6 +53,7 @@ import com.win.module.wms.util.JobUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.validation.annotation.Validated; @@ -146,10 +149,12 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq supplierdeliverRequestMainMapper.deleteById(id); } - private void validateSupplierdeliverRequestMainExists(Long id) { + private SupplierdeliverRequestMainDO validateSupplierdeliverRequestMainExists(Long id) { + SupplierdeliverRequestMainDO supplierdeliverRequestMainDO = supplierdeliverRequestMainMapper.selectById(id); if (supplierdeliverRequestMainMapper.selectById(id) == null) { throw exception(SUPPLIERDELIVER_REQUEST_MAIN_NOT_EXISTS); } + return supplierdeliverRequestMainDO; } @Override @@ -386,4 +391,79 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq return messageDetail; } + /** + * 关闭供应商发货申请主 + * + * @param id 采购订单申请主ID + * @return 更新数量 + */ + @Override + @Transactional + public Integer closeSupplierdeliverRequestMain(Long id) { + SupplierdeliverRequestMainDO mainDO = validateSupplierdeliverRequestMainExists(id); + mainDO.setStatus(RequestStatusEnum.CLOSED.getCode());//增加操作记录 + trendsApi.createTrends(id, "request_supplierdeliver_main", "关闭了供应商发货申请", TrendsTypeEnum.UPDATE); + return supplierdeliverRequestMainMapper.updateById(mainDO); + } + + /** + * 打开供应商发货申请主 + * + * @param id 采购订单申请主ID + * @return 更新数量 + */ + @Override + @Transactional + public Integer openSupplierdeliverRequestMain(Long id) { + SupplierdeliverRequestMainDO mainDO = validateSupplierdeliverRequestMainExists(id); + mainDO.setStatus(RequestStatusEnum.NEW.getCode());//增加操作记录 + trendsApi.createTrends(id, "request_supplierdeliver_main", "打开了供应商发货申请", TrendsTypeEnum.UPDATE); + return supplierdeliverRequestMainMapper.updateById(mainDO); + } + + /** + * 提交供应商发货申请主 + * + * @param id 采购订单申请主ID + * @return 更新数量 + */ + @Override + @Transactional + public Integer subSupplierdeliverRequestMain(Long id) { + SupplierdeliverRequestMainDO mainDO = validateSupplierdeliverRequestMainExists(id); + mainDO.setStatus(RequestStatusEnum.REVIEWING.getCode());//增加操作记录 + trendsApi.createTrends(id, "request_supplierdeliver_main", "提交审批了供应商发货申请", TrendsTypeEnum.UPDATE); + return supplierdeliverRequestMainMapper.updateById(mainDO); + } + + /** + * 审批通过供应商发货申请主 + * + * @param id 采采购订单申请主ID + * @return 更新数量 + */ + @Override + @Transactional + public Integer witSupplierdeliverRequestMain(Long id) { + SupplierdeliverRequestMainDO mainDO = validateSupplierdeliverRequestMainExists(id); + mainDO.setStatus(PlanStatusEnum.AGREED.getCode());//增加操作记录 + trendsApi.createTrends(id, "request_supplierdeliver_main", "审批通过了供应商发货申请", TrendsTypeEnum.UPDATE); + return supplierdeliverRequestMainMapper.updateById(mainDO); + } + + /** + * 驳回供应商发货申请主 + * + * @param id 采采购订单申请主ID + * @return 更新数量 + */ + @Override + @Transactional + public Integer rejSupplierdeliverRequestMain(Long id) { + SupplierdeliverRequestMainDO mainDO = validateSupplierdeliverRequestMainExists(id); + mainDO.setStatus(PlanStatusEnum.REFUSED.getCode());//增加操作记录 + trendsApi.createTrends(id, "request_supplierdeliver_main", "驳回了供应商发货申请", TrendsTypeEnum.UPDATE); + return supplierdeliverRequestMainMapper.updateById(mainDO); + } + }