zhousq_java
/
sfms_mes3.0
forked from sfms3.0/sfms3.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
陈薪名 2 years ago
parent
3166c0db00 4169b00f8c
commit
adae943412
18 changed files with 79 additions and 120 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailBaseVO.java
  2. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExcelVO.java
  3. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExportReqVO.java
  4. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailPageReqVO.java
  5. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java
  6. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyExcelVO.java
  7. 9
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyExportReqVO.java
  8. 10
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyPageReqVO.java
  9. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyRespVO.java
  10. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailBaseVO.java
  11. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRecord/InspectRecordDetailDO.java
  12. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/strategy/StrategyDO.java
  13. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java
  14. 10
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/strategy/StrategyMapper.java
  15. 28
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomServiceImpl.java
  16. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java
  17. 7
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainService.java
  18. 68
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailBaseVO.java
View File

@ -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不能为空")

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExcelVO.java
View File

@ -89,7 +89,7 @@ public class InspectRecordDetailExcelVO {
private String remark;
@ExcelProperty("创建时间")
private LocalDateTime creationTime;
private LocalDateTime createTime;
@ExcelProperty("创建者Id")
private String creator;

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExportReqVO.java
View File

@ -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;

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailPageReqVO.java
View File

@ -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;

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java
View File

@ -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<Boolean> updatePurchasereturnRequestMain(@Valid @RequestBody PurchasereturnRequestMainUpdateReqVO updateReqVO) {
purchasereturnRequestMainService.updatePurchasereturnRequestMain(updateReqVO);
return success(true);
}
@GetMapping("/page")
@Operation(summary = "获得采购退货申请主分页")
@PreAuthorize("@ss.hasPermission('wms:purchasereturn-request-main:query')")

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyExcelVO.java
View File

@ -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;

9
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyExportReqVO.java
View File

@ -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;

10
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyPageReqVO.java
View File

@ -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;

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyRespVO.java
View File

@ -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;

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailBaseVO.java
View File

@ -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;

14
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRecord/InspectRecordDetailDO.java
View File

@ -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
*/

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/strategy/StrategyDO.java
View File

@ -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
*/

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java
View File

@ -44,7 +44,7 @@ public interface InspectRecordDetailMapper extends BaseMapperX<InspectRecordDeta
.eqIfPresent(InspectRecordDetailDO::getNumber, reqVO.getNumber())
.eqIfPresent(InspectRecordDetailDO::getItemCode, reqVO.getItemCode())
.eqIfPresent(InspectRecordDetailDO::getRemark, reqVO.getRemark())
.betweenIfPresent(InspectRecordDetailDO::getCreationTime, reqVO.getCreationTime())
.betweenIfPresent(InspectRecordDetailDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(InspectRecordDetailDO::getCreator, reqVO.getCreator())
.likeIfPresent(InspectRecordDetailDO::getItemName, reqVO.getItemName())
.eqIfPresent(InspectRecordDetailDO::getItemDesc1, reqVO.getItemDesc1())
@ -83,7 +83,7 @@ public interface InspectRecordDetailMapper extends BaseMapperX<InspectRecordDeta
.eqIfPresent(InspectRecordDetailDO::getNumber, reqVO.getNumber())
.eqIfPresent(InspectRecordDetailDO::getItemCode, reqVO.getItemCode())
.eqIfPresent(InspectRecordDetailDO::getRemark, reqVO.getRemark())
.betweenIfPresent(InspectRecordDetailDO::getCreationTime, reqVO.getCreationTime())
.betweenIfPresent(InspectRecordDetailDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(InspectRecordDetailDO::getCreator, reqVO.getCreator())
.likeIfPresent(InspectRecordDetailDO::getItemName, reqVO.getItemName())
.eqIfPresent(InspectRecordDetailDO::getItemDesc1, reqVO.getItemDesc1())

10
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/strategy/StrategyMapper.java
View File

@ -1,17 +1,17 @@
package com.win.module.wms.dal.mysql.strategy;
import java.util.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.win.framework.mybatis.core.mapper.BaseMapperX;
import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.win.framework.mybatis.core.util.QueryWrapperUtils;
import com.win.module.wms.controller.strategy.vo.StrategyExportReqVO;
import com.win.module.wms.controller.strategy.vo.StrategyPageReqVO;
import com.win.module.wms.dal.dataobject.strategy.StrategyDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 策略 Mapper
*
@ -23,7 +23,7 @@ public interface StrategyMapper extends BaseMapperX<StrategyDO> {
default PageResult<StrategyDO> selectPage(StrategyPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<StrategyDO>()
.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<StrategyDO> {
default List<StrategyDO> selectList(StrategyExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<StrategyDO>()
.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())

28
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomServiceImpl.java
View File

@ -44,7 +44,7 @@ public class BomServiceImpl implements BomService {
@Override
public Long createBom(BomCreateReqVO createReqVO) {
validateBomForCreateOrUpdate(createReqVO.getId(),createReqVO.getProductItemCode(),createReqVO.getComponentItemCode(),createReqVO.getComponentUom(),createReqVO.getComponentQty(),
validateBomForCreateOrUpdate(createReqVO.getId(),createReqVO.getProductItemCode(),createReqVO.getComponentItemCode(),createReqVO.getVersion(),createReqVO.getComponentUom(),createReqVO.getComponentQty(),
createReqVO.getProcessCode(),createReqVO.getAvailable());
// 插入
BomDO bom = BomConvert.INSTANCE.convert(createReqVO);
@ -53,12 +53,21 @@ public class BomServiceImpl implements BomService {
return bom.getId();
}
public BomDO existBom(String productItemCode,String componentItemCode,String version){
QueryWrapper<BomDO> queryWrapper = new QueryWrapper();
queryWrapper.eq("product_item_code",productItemCode);
queryWrapper.eq("component_item_code",componentItemCode);
queryWrapper.eq("version",version);
BomDO bomDO = bomMapper.selectOne(queryWrapper);
return bomDO;
}
@Override
public void updateBom(BomUpdateReqVO updateReqVO) {
// 校验存在
validateBomForCreateOrUpdate(updateReqVO.getId(),updateReqVO.getProductItemCode(),updateReqVO.getComponentItemCode(),updateReqVO.getComponentUom(),
validateBomForCreateOrUpdate(updateReqVO.getId(),updateReqVO.getProductItemCode(),updateReqVO.getComponentItemCode(),updateReqVO.getVersion(),updateReqVO.getComponentUom(),
updateReqVO.getComponentQty(),updateReqVO.getProcessCode(),updateReqVO.getAvailable());
// 更新
BomDO updateObj = BomConvert.INSTANCE.convert(updateReqVO);
bomMapper.updateById(updateObj);
@ -105,7 +114,7 @@ public class BomServiceImpl implements BomService {
message.append(ex.getMessage()).append(",");
}
try {
validateProductItemCodeExists(null,bomDo.getProductItemCode());
validateProductItemCodeExists(null,bomDo.getProductItemCode(),bomDo.getComponentItemCode(),bomDo.getVersion());
} catch (ServiceException ex) {
message.append(ex.getMessage()).append(",");
}
@ -185,16 +194,16 @@ public class BomServiceImpl implements BomService {
}
}
private void validateBomForCreateOrUpdate(Long id,String productItemCode,String componentItemCode,
private void validateBomForCreateOrUpdate(Long id,String productItemCode,String componentItemCode,String version,
String componentUom,BigDecimal componentQty,String processCode,String available) {
// 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确
DataPermissionUtils.executeIgnore(() -> {
validateBomExists(id);
// 校验code唯一
validateProductItemCodeExists(id,productItemCode);
validateComponentUomExists(componentUom);
validateAvailableExists(available);
validateComponentItemCodeExists(componentItemCode);
validateProductItemCodeExists(id,productItemCode,componentItemCode,version);
validateComponentQtyExists(componentQty);
validateProcessCodeExists(processCode);
});
@ -209,15 +218,18 @@ public class BomServiceImpl implements BomService {
throw exception(BOM_NOT_EXISTS);
}
}
@VisibleForTesting
private void validateProductItemCodeExists(Long id,String productItemCode) {
private void validateProductItemCodeExists(Long id,String productItemCode,String componentItemCode,String version) {
if (productItemCode.isEmpty()) {
throw exception(BOM_PRODUCT_ITEM_CODE_NOT_EXISTS);
}
if (StrUtil.isBlank(productItemCode)) {
return;
}
BomDO bom = bomMapper.selectByProductItemCode(productItemCode);
BomDO bom = existBom(productItemCode,componentItemCode,version);
if (bom == null) {
return;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java
View File

@ -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());

7
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainService.java
View File

@ -30,13 +30,6 @@ public interface PurchasereturnRequestMainService {
* @return 分页列表
*/
PageResult<PurchasereturnRequestMainDO> getPurchasereturnRequestMainSenior(CustomConditions conditions);
/**
* 更新采购退货申请主
*
* @param updateReqVO 更新信息
*/
void updatePurchasereturnRequestMain(@Valid PurchasereturnRequestMainUpdateReqVO updateReqVO);
/**
* 获得采购退货申请主

68
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java
View File

@ -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<PurchasereturnRequestDetailDO> 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<PurchasereturnRequestDetailDO> subDOList) {
requestsettingAndBusinesstypeSet(mainDO);
//子表校验
List<PurchasereturnRequestDetailCreateReqVO> subList = createReqVO.getSubList();
List<PurchasereturnRequestDetailDO> 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<PurchasereturnRequestDetailUpdateReqVO> subList = updateReqVO.getSubList();
List<PurchasereturnRequestDetailDO> 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);

Write Preview
Loading…
Cancel
Save