diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemBaseVO.java index e722cd06..50a4777d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemBaseVO.java @@ -31,6 +31,9 @@ public class ProductionlineitemBaseVO { @NotNull(message = "物品代码不能为空") private String itemCode; + @Schema(description = "原料库位", requiredMode = Schema.RequiredMode.REQUIRED) + private String rawLocationCode; + @Schema(description = "是否可用", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "是否可用不能为空") private String available; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExportReqVO.java index e426b65f..6931fc58 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExportReqVO.java @@ -21,6 +21,9 @@ public class ProductionlineitemExportReqVO { @Schema(description = "物品代码") private String itemCode; + @Schema(description = "原料库位") + private String rawLocationCode; + @Schema(description = "是否可用") private String available; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemPageReqVO.java index cdbf67d1..eda3c3cf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemPageReqVO.java @@ -26,6 +26,9 @@ public class ProductionlineitemPageReqVO extends PageParam { @Schema(description = "物品代码") private String itemCode; + @Schema(description = "原料库位") + private String rawLocationCode; + @Schema(description = "是否可用") private String available; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java index f188a910..52e27cb5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java @@ -1,37 +1,29 @@ package com.win.module.wms.controller.purchasereceiptRequest; +import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.purchasereceiptRequest.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestDetailCreateReqVO; +import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestDetailPageReqVO; +import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestDetailRespVO; +import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestDetailUpdateReqVO; +import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestDetailConvert; +import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO; +import com.win.module.wms.service.purchasereceiptRequest.PurchasereceiptRequestDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import javax.validation.Valid; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; -import com.win.framework.excel.core.util.ExcelUtils; - -import com.win.framework.operatelog.core.annotations.OperateLog; -import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - - -import com.win.module.wms.dal.dataobject.purchasereceiptRequest.*; -import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestDetailConvert; -import com.win.module.wms.service.purchasereceiptRequest.PurchasereceiptRequestDetailService; - @Tag(name = "管理后台 - 采购收货申请子") @RestController @RequestMapping("/wms/purchasereceipt-request-detail") @@ -50,6 +42,7 @@ public class PurchasereceiptRequestDetailController { public CommonResult createPurchasereceiptRequestDetail(@Valid @RequestBody PurchasereceiptRequestDetailCreateReqVO createReqVO) { return success(purchasereceiptRequestDetailService.createPurchasereceiptRequestDetail(createReqVO)); } + @PostMapping("/senior") @Operation(summary = "高级搜索获得物品基本信息分页") @PreAuthorize("@ss.hasPermission('wms:PurchasereceiptRequestDetail:query')") @@ -63,6 +56,7 @@ public class PurchasereceiptRequestDetailController { } return success(result); } + @PutMapping("/update") @Operation(summary = "更新采购收货申请子") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-detail:update')") @@ -89,15 +83,6 @@ public class PurchasereceiptRequestDetailController { return success(PurchasereceiptRequestDetailConvert.INSTANCE.convert(purchasereceiptRequestDetail)); } - @GetMapping("/list") - @Operation(summary = "获得采购收货申请子列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-detail:query')") - public CommonResult> getPurchasereceiptRequestDetailList(@RequestParam("ids") Collection ids) { - List list = purchasereceiptRequestDetailService.getPurchasereceiptRequestDetailList(ids); - return success(PurchasereceiptRequestDetailConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得采购收货申请子分页") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-detail:query')") @@ -106,21 +91,4 @@ public class PurchasereceiptRequestDetailController { return success(PurchasereceiptRequestDetailConvert.INSTANCE.convertPage(pageResult)); } - @GetMapping("/export-excel") - @Operation(summary = "导出采购收货申请子 Excel") - @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-detail:export')") - @OperateLog(type = EXPORT) - public void exportPurchasereceiptRequestDetailExcel(@Valid PurchasereceiptRequestDetailExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { - List list = purchasereceiptRequestDetailService.getPurchasereceiptRequestDetailList(exportReqVO); - // 导出 Excel - List datas = PurchasereceiptRequestDetailConvert.INSTANCE.convertList02(list); - for(PurchasereceiptRequestDetailExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "采购收货申请子.xls", "数据", PurchasereceiptRequestDetailExcelVO.class, datas); - } - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionlineitem/ProductionlineitemDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionlineitem/ProductionlineitemDO.java index 1cd3d21b..d4bf4d35 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionlineitem/ProductionlineitemDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionlineitem/ProductionlineitemDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.productionlineitem; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -42,6 +43,10 @@ public class ProductionlineitemDO extends BaseDO { * 物品代码 */ private String itemCode; + /** + * 原料库位 + */ + private String rawLocationCode; /** * 是否可用 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java index ffd0da42..a474a028 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java @@ -25,6 +25,7 @@ public interface ProductionlineitemMapper extends BaseMapperX getPurchasereceiptRequestDetailList(Collection ids); - /** * 获得采购收货申请子分页 * @@ -67,12 +60,4 @@ public interface PurchasereceiptRequestDetailService { */ PageResult getPurchasereceiptRequestDetailPage(PurchasereceiptRequestDetailPageReqVO pageReqVO); - /** - * 获得采购收货申请子列表, 用于 Excel 导出 - * - * @param exportReqVO 查询条件 - * @return 采购收货申请子列表 - */ - List getPurchasereceiptRequestDetailList(PurchasereceiptRequestDetailExportReqVO exportReqVO); - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailServiceImpl.java index 352307fe..f8d42512 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailServiceImpl.java @@ -1,20 +1,20 @@ package com.win.module.wms.service.purchasereceiptRequest; import com.win.framework.common.pojo.CustomConditions; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import java.util.*; -import com.win.module.wms.controller.purchasereceiptRequest.vo.*; -import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO; import com.win.framework.common.pojo.PageResult; - +import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestDetailCreateReqVO; +import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestDetailPageReqVO; +import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestDetailUpdateReqVO; import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestDetailConvert; +import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO; import com.win.module.wms.dal.mysql.purchasereceiptRequest.PurchasereceiptRequestDetailMapper; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import javax.annotation.Resource; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PURCHASERECEIPT_REQUEST_DETAIL_NOT_EXISTS; /** * 采购收货申请子 Service 实现类 @@ -36,25 +36,27 @@ public class PurchasereceiptRequestDetailServiceImpl implements PurchasereceiptR // 返回 return purchasereceiptRequestDetail.getId(); } + @Override public PageResult getPurchasereceiptRequestDetailSenior(CustomConditions conditions) { return purchasereceiptRequestDetailMapper.selectSenior(conditions); } + @Override - public void updatePurchasereceiptRequestDetail(PurchasereceiptRequestDetailUpdateReqVO updateReqVO) { + public Integer updatePurchasereceiptRequestDetail(PurchasereceiptRequestDetailUpdateReqVO updateReqVO) { // 校验存在 validatePurchasereceiptRequestDetailExists(updateReqVO.getId()); // 更新 PurchasereceiptRequestDetailDO updateObj = PurchasereceiptRequestDetailConvert.INSTANCE.convert(updateReqVO); - purchasereceiptRequestDetailMapper.updateById(updateObj); + return purchasereceiptRequestDetailMapper.updateById(updateObj); } @Override - public void deletePurchasereceiptRequestDetail(Long id) { + public Integer deletePurchasereceiptRequestDetail(Long id) { // 校验存在 validatePurchasereceiptRequestDetailExists(id); // 删除 - purchasereceiptRequestDetailMapper.deleteById(id); + return purchasereceiptRequestDetailMapper.deleteById(id); } private void validatePurchasereceiptRequestDetailExists(Long id) { @@ -68,19 +70,9 @@ public class PurchasereceiptRequestDetailServiceImpl implements PurchasereceiptR return purchasereceiptRequestDetailMapper.selectById(id); } - @Override - public List getPurchasereceiptRequestDetailList(Collection ids) { - return purchasereceiptRequestDetailMapper.selectBatchIds(ids); - } - @Override public PageResult getPurchasereceiptRequestDetailPage(PurchasereceiptRequestDetailPageReqVO pageReqVO) { return purchasereceiptRequestDetailMapper.selectPage(pageReqVO); } - @Override - public List getPurchasereceiptRequestDetailList(PurchasereceiptRequestDetailExportReqVO exportReqVO) { - return purchasereceiptRequestDetailMapper.selectList(exportReqVO); - } - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java index b3d632fe..c7f289c9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java @@ -85,13 +85,13 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq mainDO.setNumber(number); RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("PurchaseReceiptRequest"); RequestStatusState requestStatusState = new RequestStatusState(); - requestStatusState.newObject(requestsettingDO); + requestStatusState.newObject(requestsettingDO.getAutoCommit(), requestsettingDO.getAutoAgree(), requestsettingDO.getAutoExecute()); mainDO.setStatus(requestStatusState.getState().getCode()); mainDO.setAutoCommit(requestsettingDO.getAutoCommit()); mainDO.setAutoAgree(requestsettingDO.getAutoAgree()); mainDO.setAutoExecute(requestsettingDO.getAutoExecute()); //调用自动执行方法 - if(requestsettingDO.getAutoCommit().equals("TRUE") && requestsettingDO.getAutoAgree().equals("TRUE") && requestsettingDO.getAutoExecute().equals("TREU")) { + if(RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { } purchasereceiptRequestMainMapper.insert(mainDO); @@ -119,10 +119,12 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq PurchasereceiptRequestMainDO updateObj = PurchasereceiptRequestMainConvert.INSTANCE.convert(updateReqVO); return purchasereceiptRequestMainMapper.updateById(updateObj); } + @Override public PageResult getPurchasereceiptRequestMainSenior(CustomConditions conditions) { return purchasereceiptRequestMainMapper.selectSenior(conditions); } + @Override public Integer deletePurchasereceiptRequestMain(Long id) { // 校验存在 @@ -177,8 +179,8 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq } List errorList = new ArrayList<>(); datas.forEach(createReqVO -> { - PurchasereceiptRequestMainDO mainDo = PurchasereceiptRequestMainConvert.INSTANCE.convert(createReqVO); - String messageMain = this.validatePurchasereceiptRequestMainImport(mainDo); + PurchasereceiptRequestMainDO mainDO = PurchasereceiptRequestMainConvert.INSTANCE.convert(createReqVO); + String messageMain = this.validatePurchasereceiptRequestMainImport(mainDO); List subList = createReqVO.getSubList(); List subDOList = PurchasereceiptRequestDetailConvert.INSTANCE.convertList03(subList); // 是否有错误数据 @@ -199,40 +201,40 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq //申请单目前只做新增 //PurchasereceiptRequestMainDO existPurchasereceiptRequestMainDO = purchasereceiptRequestMainMapper.selectBySupplierCode(mainDo.getSupplierCode()); //if(existPurchasereceiptRequestMainDO == null && mode != 3) {//新增 - purchasereceiptRequestMainMapper.insert(mainDo); + purchasereceiptRequestMainMapper.insert(mainDO); //增加操作记录 - trendsApi.createTrends(mainDo.getId(), "purchasereceiptRequest", "导入了采购收货", TrendsTypeEnum.CREATE); + trendsApi.createTrends(mainDO.getId(), "purchasereceiptRequest", "导入了采购收货", TrendsTypeEnum.CREATE); String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_REQUEST.getCode()); - mainDo.setNumber(number); + mainDO.setNumber(number); RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("PurchaseReceiptRequest"); RequestStatusState requestStatusState = new RequestStatusState(); - requestStatusState.newObject(requestsettingDO); - mainDo.setStatus(requestStatusState.getState().getCode()); - mainDo.setAutoCommit(requestsettingDO.getAutoCommit()); - mainDo.setAutoAgree(requestsettingDO.getAutoAgree()); - mainDo.setAutoExecute(requestsettingDO.getAutoExecute()); + requestStatusState.newObject(requestsettingDO.getAutoCommit(), requestsettingDO.getAutoAgree(), requestsettingDO.getAutoExecute()); + mainDO.setStatus(requestStatusState.getState().getCode()); + mainDO.setAutoCommit(requestsettingDO.getAutoCommit()); + mainDO.setAutoAgree(requestsettingDO.getAutoAgree()); + mainDO.setAutoExecute(requestsettingDO.getAutoExecute()); for (PurchasereceiptRequestDetailDO detailDO : subDOList) { - detailDO.setMasterId(mainDo.getId()); + detailDO.setMasterId(mainDO.getId()); detailDO.setNumber(number); } //调用自动执行方法 - if(requestsettingDO.getAutoCommit().equals("TRUE") && requestsettingDO.getAutoAgree().equals("TRUE") && requestsettingDO.getAutoExecute().equals("TREU")) { + if(RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { } purchasereceiptRequestDetailMapper.insertBatch(subDOList); //} else if(existPurchasereceiptRequestMainDO != null && existPurchasereceiptRequestMainDO.getStatus().equals(RequestStatusEnum.NEW.getCode()) && mode != 2) {//修改 - //BeanUtils.copyProperties(existPurchasereceiptRequestMainDO, mainDo); + //BeanUtils.copyProperties(existPurchasereceiptRequestMainDO, mainDO); //purchasereceiptRequestMainMapper.updateById(mainDo); //增加操作记录 - //trendsApi.createTrends(mainDo.getId(), "purchasereceiptRequest", existPurchasereceiptRequestMainDO.toString(), TrendsTypeEnum.UPDATE); + //trendsApi.createTrends(mainDO.getId(), "purchasereceiptRequest", existPurchasereceiptRequestMainDO.toString(), TrendsTypeEnum.UPDATE); // 删除子表数据 //Map map = new HashMap<>(); - //map.put("master_id", mainDo.getId()); + //map.put("master_id", mainDO.getId()); //删除子表 //purchasereceiptRequestDetailMapper.deleteByMap(map); //for (PurchasereceiptRequestDetailDO detailDO : subDOList) { // detailDO.setMasterId(mainDo.getId()); - // detailDO.setNumber(mainDo.getNumber()); + // detailDO.setNumber(mainDO.getNumber()); // purchasereceiptRequestDetailMapper.insertBatch(subDOList); //} //} @@ -247,7 +249,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq @Override public Integer closePurchasereceiptRequestMain(Long id) { - // 校验存在 + // 校验存在存在下级单据 PurchasereceiptRequestMainDO mainDO = validatePurchasereceiptRequestMainExists(id); Long count = purchasereceiptJobMainMapper.selectByRequestNumber(mainDO.getNumber()); if(count > 0) { @@ -264,30 +266,48 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq @Override public Integer submitPurchasereceiptRequestMain(Long id) { - // 校验存在 PurchasereceiptRequestMainDO mainDO = validatePurchasereceiptRequestMainExists(id); - Long count = purchasereceiptJobMainMapper.selectByRequestNumber(mainDO.getNumber()); - if(count > 0) { - throw new ServiceException(PURCHASERECEIPT_REQUEST_JOB_EXISTS); - } - RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("PurchaseReceiptRequest"); RequestStatusState requestStatusState = new RequestStatusState(); - boolean flag = requestStatusState.submit(requestsettingDO); + boolean flag = requestStatusState.submit(mainDO.getAutoAgree(), mainDO.getAutoExecute()); if(!flag) { throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_CLOSE); } mainDO.setStatus(requestStatusState.getState().getCode()); + //调用自动执行方法 + if(RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { + + } return purchasereceiptRequestMainMapper.updateById(mainDO); } @Override public Integer agreePurchasereceiptRequestMain(Long id) { - return null; + // 校验存在 + PurchasereceiptRequestMainDO mainDO = validatePurchasereceiptRequestMainExists(id); + RequestStatusState requestStatusState = new RequestStatusState(); + boolean flag = requestStatusState.agree(mainDO.getAutoExecute()); + if(!flag) { + throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_CLOSE); + } + mainDO.setStatus(requestStatusState.getState().getCode()); + //调用自动执行方法 + if(RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { + + } + return purchasereceiptRequestMainMapper.updateById(mainDO); } @Override public Integer abortPurchasereceiptRequestMain(Long id) { - return null; + // 校验存在 + PurchasereceiptRequestMainDO mainDO = validatePurchasereceiptRequestMainExists(id); + RequestStatusState requestStatusState = new RequestStatusState(); + boolean flag = requestStatusState.reject(); + if(!flag) { + throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_CLOSE); + } + mainDO.setStatus(requestStatusState.getState().getCode()); + return purchasereceiptRequestMainMapper.updateById(mainDO); } /**