From 70c205115d41bf4479f029afbccafa5679d4e737 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Wed, 29 Nov 2023 12:52:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9createTime=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/InspectRecordDetailBaseVO.java | 2 +- .../vo/InspectRecordDetailExcelVO.java | 2 +- .../vo/InspectRecordDetailExportReqVO.java | 2 +- .../vo/InspectRecordDetailPageReqVO.java | 2 +- .../PurchasereturnRequestMainController.java | 8 --- .../strategy/vo/StrategyExcelVO.java | 15 ++-- .../strategy/vo/StrategyExportReqVO.java | 9 ++- .../strategy/vo/StrategyPageReqVO.java | 10 +-- .../strategy/vo/StrategyRespVO.java | 2 +- .../UnplannedreceiptRequestDetailBaseVO.java | 2 +- .../inspectRecord/InspectRecordDetailDO.java | 14 ++-- .../dal/dataobject/strategy/StrategyDO.java | 12 ++-- .../InspectRecordDetailMapper.java | 4 +- .../dal/mysql/strategy/StrategyMapper.java | 10 +-- .../inspectJob/InspectJobMainServiceImpl.java | 2 +- .../PurchasereturnRequestMainService.java | 7 -- .../PurchasereturnRequestMainServiceImpl.java | 68 ++++++------------- 17 files changed, 59 insertions(+), 112 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailBaseVO.java index 8c90f619..e4425022 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailBaseVO.java @@ -92,7 +92,7 @@ public class InspectRecordDetailBaseVO { @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "创建时间不能为空") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime creationTime; + private LocalDateTime createTime; @Schema(description = "创建者Id", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "创建者Id不能为空") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExcelVO.java index a73adb9c..0e16b68f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExcelVO.java @@ -89,7 +89,7 @@ public class InspectRecordDetailExcelVO { private String remark; @ExcelProperty("创建时间") - private LocalDateTime creationTime; + private LocalDateTime createTime; @ExcelProperty("创建者Id") private String creator; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExportReqVO.java index a26591d4..7db931d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExportReqVO.java @@ -78,7 +78,7 @@ public class InspectRecordDetailExportReqVO { @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] creationTime; + private LocalDateTime[] createTime; @Schema(description = "创建者Id") private String creator; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailPageReqVO.java index e331e518..7469a0be 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailPageReqVO.java @@ -83,7 +83,7 @@ public class InspectRecordDetailPageReqVO extends PageParam { @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] creationTime; + private LocalDateTime[] createTime; @Schema(description = "创建者Id") private String creator; 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 4b01f24a..3df8b77e 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,14 +62,6 @@ 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) { - purchasereturnRequestMainService.updatePurchasereturnRequestMain(updateReqVO); - return success(true); - } - @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/controller/strategy/vo/StrategyExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyExcelVO.java index a5282ab6..af5a45a2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyExcelVO.java @@ -1,16 +1,12 @@ package com.win.module.wms.controller.strategy.vo; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; - import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; +import lombok.Data; + +import java.time.LocalDateTime; /** @@ -24,9 +20,6 @@ public class StrategyExcelVO { @ExcelProperty("备注") private String remark; - @ExcelProperty("创建时间") - private LocalDateTime creationTime; - @ExcelProperty("创建者ID") private String creatorId; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyExportReqVO.java index 66184c23..33181e28 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyExportReqVO.java @@ -1,12 +1,11 @@ package com.win.module.wms.controller.strategy.vo; -import lombok.*; -import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; -import com.win.framework.common.pojo.PageParam; -import java.time.LocalDateTime; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 策略 Excel 导出 Request VO，参数和 StrategyPageReqVO 是一致的") @@ -18,7 +17,7 @@ public class StrategyExportReqVO { @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] creationTime; + private LocalDateTime[] createTime; @Schema(description = "创建者ID") private String creatorId; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyPageReqVO.java index 46180072..a6b383a5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyPageReqVO.java @@ -1,10 +1,12 @@ package com.win.module.wms.controller.strategy.vo; -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import com.win.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -20,7 +22,7 @@ public class StrategyPageReqVO extends PageParam { @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] creationTime; + private LocalDateTime[] createTime; @Schema(description = "创建者ID") private String creatorId; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyRespVO.java index bdd152d8..aa22d99e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyRespVO.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; public class StrategyRespVO extends StrategyBaseVO { @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - private LocalDateTime creationTime; + private LocalDateTime createTime; @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) private String creatorId; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailBaseVO.java index 988588ed..01923964 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailBaseVO.java @@ -71,7 +71,7 @@ public class UnplannedreceiptRequestDetailBaseVO { @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime creationTime; + private LocalDateTime createTime; @Schema(description = "创建者用户名") private String creator; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRecord/InspectRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRecord/InspectRecordDetailDO.java index ddc1e60e..8670bc56 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRecord/InspectRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRecord/InspectRecordDetailDO.java @@ -1,15 +1,13 @@ package com.win.module.wms.dal.dataobject.inspectRecord; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.sun.xml.bind.v2.TODO; +import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; -import java.util.*; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.math.BigDecimal; + import java.math.BigDecimal; import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import com.win.framework.mybatis.core.dataobject.BaseDO; /** * 检验记录子 DO @@ -125,7 +123,7 @@ public class InspectRecordDetailDO extends BaseDO { /** * 创建时间 */ - private LocalDateTime creationTime; + private LocalDateTime createTime; /** * 地点ID */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/strategy/StrategyDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/strategy/StrategyDO.java index c1f13c52..e5ef51ee 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/strategy/StrategyDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/strategy/StrategyDO.java @@ -1,12 +1,12 @@ package com.win.module.wms.dal.dataobject.strategy; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.sun.xml.bind.v2.TODO; +import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; + import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import com.win.framework.mybatis.core.dataobject.BaseDO; /** * 策略 DO @@ -34,7 +34,7 @@ public class StrategyDO extends BaseDO { /** * 创建时间 */ - private LocalDateTime creationTime; + private LocalDateTime createTime; /** * 创建者ID */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java index 15939f5b..dc26010d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java @@ -44,7 +44,7 @@ public interface InspectRecordDetailMapper extends BaseMapperX { default PageResult selectPage(StrategyPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(StrategyDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(StrategyDO::getCreationTime, reqVO.getCreationTime()) + .betweenIfPresent(StrategyDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(StrategyDO::getCreatorId, reqVO.getCreatorId()) .eqIfPresent(StrategyDO::getCode, reqVO.getCode()) .likeIfPresent(StrategyDO::getName, reqVO.getName()) @@ -39,7 +39,7 @@ public interface StrategyMapper extends BaseMapperX { default List selectList(StrategyExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(StrategyDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(StrategyDO::getCreationTime, reqVO.getCreationTime()) + .betweenIfPresent(StrategyDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(StrategyDO::getCreatorId, reqVO.getCreatorId()) .eqIfPresent(StrategyDO::getCode, reqVO.getCode()) .likeIfPresent(StrategyDO::getName, reqVO.getName()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java index 894c0669..3ea499ba 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java @@ -274,7 +274,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { transactionCreateReqVOOut.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); transactionCreateReqVOOut.setRecordNumber(number); //出库数量为子表数量，不管合格不合格都要出掉 - transactionCreateReqVOIn.setQty(inspectJobDetailUpdateReqVO.getQty()); + transactionCreateReqVOOut.setQty(inspectJobDetailUpdateReqVO.getQty()); transactionCreateReqVOOut.setInventoryStatus(inspectJobDetailUpdateReqVO.getInventoryStatus()); transactionCreateReqVOOut.setSinglePrice(balanceDO.getSinglePrice()); transactionCreateReqVOOut.setAmount(balanceDO.getAmount()); 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 a44a5581..8e03f034 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 @@ -30,13 +30,6 @@ public interface PurchasereturnRequestMainService { * @return 分页列表 */ PageResult getPurchasereturnRequestMainSenior(CustomConditions conditions); - - /** - * 更新采购退货申请主 - * - * @param updateReqVO 更新信息 - */ - void 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 57b86eda..7e26a3a9 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 @@ -110,32 +110,25 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque @Override public Long createPurchasereturnRequestMain(PurchasereturnRequestMainCreateReqVO createReqVO) { - PurchasereturnRequestMainDO purchasereturnRequestMain = PurchasereturnRequestMainConvert.INSTANCE.convert(createReqVO); - String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_REQUEST.getCode()); - purchasereturnRequestMain.setNumber(number); - PurchasereturnRequestMainDO purchasereturnRequestMainDO = validatorToCreate(createReqVO); + PurchasereturnRequestMainDO mainDO = PurchasereturnRequestMainConvert.INSTANCE.convert(createReqVO); List subDOList = PurchasereturnRequestDetailConvert.INSTANCE.convertList03(createReqVO.getSubList()); + validatorToCreate(mainDO, subDOList); + String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_REQUEST.getCode()); + mainDO.setNumber(number); for (PurchasereturnRequestDetailDO detailDO : subDOList) { - detailDO.setMasterId(purchasereturnRequestMain.getId()); + detailDO.setId(null); + detailDO.setMasterId(mainDO.getId()); detailDO.setNumber(number); } + purchasereturnRequestMainMapper.insert(mainDO); purchasereturnRequestDetailMapper.insertBatch(subDOList); //调用自动执行方法 - if (RequestStatusEnum.HANDLING.getCode().equals(purchasereturnRequestMainDO.getStatus())) { - this.generateJob(purchasereturnRequestMain, subDOList); + if (RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { + this.generateJob(mainDO, subDOList); } - trendsApi.createTrends(purchasereturnRequestMain.getId(), "purchasereturnRequest", "增加了采购退货申请", TrendsTypeEnum.CREATE); + trendsApi.createTrends(mainDO.getId(), "purchasereturnRequest", "增加了采购退货申请", TrendsTypeEnum.CREATE); // 返回 - return purchasereturnRequestMain.getId(); - } - - @Override - public void updatePurchasereturnRequestMain(PurchasereturnRequestMainUpdateReqVO updateReqVO) { - // 校验存在 - validatePurchasereturnRequestMainExists(updateReqVO.getId()); - // 更新主表 - PurchasereturnRequestMainDO purchasereturnRequestMainDO = validatorToUpdate(updateReqVO); - trendsApi.createTrends(purchasereturnRequestMainDO.getId(), "purchasereturnRequest", "增加了采购退货申请", TrendsTypeEnum.CREATE); + return mainDO.getId(); } @Override @@ -433,38 +426,13 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque } // 新增校验 - private PurchasereturnRequestMainDO validatorToCreate(PurchasereturnRequestMainCreateReqVO createReqVO) { - PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = new PurchasereceiptRecordMainDO(); - PurchasereturnRequestMainDO purchasereturnRequestMainDO = validatorMainMethod(createReqVO); + private void validatorToCreate(PurchasereturnRequestMainDO mainDO, List subDOList) { + requestsettingAndBusinesstypeSet(mainDO); //子表校验 - List subList = createReqVO.getSubList(); - List subDOList = PurchasereturnRequestDetailConvert.INSTANCE.convertList03(subList); for (PurchasereturnRequestDetailDO purchasereturnRequestDetailDO : subDOList) { - validatorDetailMethod(purchasereturnRequestDetailDO,purchasereturnRequestMainDO,purchasereceiptRecordMainDO); - } - String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_CLAIM_RECORD.getCode()); - purchasereturnRequestMainDO.setNumber(number); - purchasereturnRequestMainDO.setPpNumber(purchasereceiptRecordMainDO.getPpNumber()); - purchasereturnRequestMainDO.setAsnNumber(purchasereceiptRecordMainDO.getAsnNumber()); - purchasereturnRequestMainDO.setRequestTime(LocalDateTime.now()); - purchasereturnRequestMainMapper.insert(purchasereturnRequestMainDO); - purchasereturnRequestDetailMapper.insertBatch(subDOList); - return purchasereturnRequestMainDO; - } - - //修改校验 - private PurchasereturnRequestMainDO validatorToUpdate(PurchasereturnRequestMainUpdateReqVO updateReqVO) { - PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = new PurchasereceiptRecordMainDO(); - PurchasereturnRequestMainDO purchaseclaimRequestMainDO = validatorMainMethod(updateReqVO); - //子表校验 - List subList = updateReqVO.getSubList(); - List subDOList = PurchasereturnRequestDetailConvert.INSTANCE.convertList05(subList); - for (PurchasereturnRequestDetailDO purchaseclaimRequestDetailDO : subDOList) { - validatorDetailMethod(purchaseclaimRequestDetailDO,purchaseclaimRequestMainDO,purchasereceiptRecordMainDO); + purchasereturnRequestDetailDO.setId(null); + validatorDetailMethod(purchasereturnRequestDetailDO,mainDO); } - purchasereturnRequestMainMapper.updateById(purchaseclaimRequestMainDO); - purchasereturnRequestDetailMapper.updateBatch(subDOList); - return purchaseclaimRequestMainDO; } private PurchasereturnRequestMainDO validatePurchasereturnRequestMainExists(Long id) { @@ -483,7 +451,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque } //校验子表公共方法(适用于新增/修改) - private void validatorDetailMethod(PurchasereturnRequestDetailDO detailDo, PurchasereturnRequestMainDO mainDo, PurchasereceiptRecordMainDO purchasereceiptRecordMainDO) { + private void validatorDetailMethod(PurchasereturnRequestDetailDO detailDo, PurchasereturnRequestMainDO mainDo) { ItembasicDO itembasicDO = validatorItembasic(detailDo.getItemCode()); detailDo.setItemDesc1(itembasicDO.getDesc1()); detailDo.setItemDesc2(itembasicDO.getDesc2()); @@ -492,7 +460,9 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque this.ifUomSuccess(itembasicDO.getUom(), detailDo.getUom()); validatorLocation(detailDo.getFromLocationCode()); PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordMainService.selectPurchasereceiptExist(detailDo.getPoNumber(), mainDo.getSupplierCode(), mainDo.getPurchaseReceiptRecordNumber(), detailDo.getPoLine(), detailDo.getItemCode()); - purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId()); + PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId()); + mainDo.setPpNumber(purchasereceiptRecordMainDO.getPpNumber()); + mainDo.setAsnNumber(purchasereceiptRecordMainDO.getAsnNumber()); ifdetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty()); BigDecimal bigDecimal = validatorBalance(detailDo,mainDo); ifdetailQtyBigThanQty(detailDo.getQty(),bigDecimal);