Browse Source

采购索赔记录增删改查接口修改

master
刘忱 2 years ago
parent
commit
6e5969fe9d
  1. 4
      win-module-system/win-module-system-api/src/main/java/com/win/module/system/api/package-info.java
  2. 18
      win-module-system/win-module-system-api/src/main/java/com/win/module/system/enums/serialNumber/RuleCodeEnum.java
  3. 2
      win-module-system/win-module-system-biz/src/main/java/com/win/module/system/api/serialnumber/SerialNumberApiImpl.java
  4. 109
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestDetailController.java
  5. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestMainController.java
  6. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainCreateReqVO.java
  7. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainUpdateReqVO.java
  8. 11
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchaseclaimRequest/PurchaseclaimRequestDetailConvert.java
  9. 59
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRequest/PurchaseclaimRequestDetailMapper.java
  10. 9
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRequest/PurchaseclaimRequestMainMapper.java
  11. 62
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestDetailService.java
  12. 70
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestDetailServiceImpl.java
  13. 13
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestMainService.java
  14. 50
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestMainServiceImpl.java

4
win-module-system/win-module-system-api/src/main/java/com/win/module/system/api/package-info.java

@ -1,4 +0,0 @@
/**
* System API 定义暴露给其它模块的 API
*/
package com.win.module.system.api;

18
win-module-system/win-module-system-api/src/main/java/com/win/module/system/enums/serialNumber/RuleCodeEnum.java

@ -0,0 +1,18 @@
package com.win.module.system.enums.serialNumber;
public enum RuleCodeEnum {
PURCHASE_CLAIM_RECORD("PurchaseClaimRecord"),
;
private final String code;
RuleCodeEnum(String code) {
this.code = code;
}
public String getCode() {
return code;
}
}

2
win-module-system/win-module-system-biz/src/main/java/com/win/module/system/api/serialnumber/SerialNumberApiImpl.java

@ -1,9 +1,11 @@
package com.win.module.system.api.serialnumber;
import com.win.module.system.service.serialnumber.SerialNumberService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@Service
public class SerialNumberApiImpl implements SerialNumberApi {
@Resource

109
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestDetailController.java

@ -1,35 +1,25 @@
package com.win.module.wms.controller.purchaseclaimRequest;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.purchaseclaimRequest.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.framework.common.pojo.CommonResult;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailRespVO;
import com.win.module.wms.convert.purchaseclaimRequest.PurchaseclaimRequestDetailConvert;
import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestDetailDO;
import com.win.module.wms.service.purchaseclaimRequest.PurchaseclaimRequestDetailService;
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.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import java.io.IOException;
import javax.annotation.Resource;
import java.util.List;
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.purchaseclaimRequest.PurchaseclaimRequestDetailDO;
import com.win.module.wms.convert.purchaseclaimRequest.PurchaseclaimRequestDetailConvert;
import com.win.module.wms.service.purchaseclaimRequest.PurchaseclaimRequestDetailService;
@Tag(name = "管理后台 - 采购索赔申请子")
@RestController
@RequestMapping("/wms/purchaseclaim-request-detail")
@ -39,74 +29,13 @@ public class PurchaseclaimRequestDetailController {
@Resource
private PurchaseclaimRequestDetailService purchaseclaimRequestDetailService;
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建采购索赔申请子")
@PreAuthorize("@ss.hasPermission('wms:purchaseclaim-request-detail:create')")
public CommonResult<Long> createPurchaseclaimRequestDetail(@Valid @RequestBody PurchaseclaimRequestDetailCreateReqVO createReqVO) {
return success(purchaseclaimRequestDetailService.createPurchaseclaimRequestDetail(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新采购索赔申请子")
@PreAuthorize("@ss.hasPermission('wms:purchaseclaim-request-detail:update')")
public CommonResult<Boolean> updatePurchaseclaimRequestDetail(@Valid @RequestBody PurchaseclaimRequestDetailUpdateReqVO updateReqVO) {
purchaseclaimRequestDetailService.updatePurchaseclaimRequestDetail(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除采购索赔申请子")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:purchaseclaim-request-detail:delete')")
public CommonResult<Boolean> deletePurchaseclaimRequestDetail(@RequestParam("id") Long id) {
purchaseclaimRequestDetailService.deletePurchaseclaimRequestDetail(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得采购索赔申请子")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:purchaseclaim-request-detail:query')")
public CommonResult<PurchaseclaimRequestDetailRespVO> getPurchaseclaimRequestDetail(@RequestParam("id") Long id) {
PurchaseclaimRequestDetailDO purchaseclaimRequestDetail = purchaseclaimRequestDetailService.getPurchaseclaimRequestDetail(id);
return success(PurchaseclaimRequestDetailConvert.INSTANCE.convert(purchaseclaimRequestDetail));
}
@GetMapping("/list")
@Operation(summary = "获得采购索赔申请子列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:purchaseclaim-request-detail:query')")
public CommonResult<List<PurchaseclaimRequestDetailRespVO>> getPurchaseclaimRequestDetailList(@RequestParam("ids") Collection<Long> ids) {
List<PurchaseclaimRequestDetailDO> list = purchaseclaimRequestDetailService.getPurchaseclaimRequestDetailList(ids);
@Parameter(name = "masterId", description = "主表id", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:purchaseclaim-request-main:query')")
public CommonResult<List<PurchaseclaimRequestDetailRespVO>> getPurchaseclaimRequestDetailList(@RequestParam("masterId") Long masterId) {
List<PurchaseclaimRequestDetailDO> list = purchaseclaimRequestDetailService.getPurchaseclaimRequestDetailList(masterId);
return success(PurchaseclaimRequestDetailConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得采购索赔申请子分页")
@PreAuthorize("@ss.hasPermission('wms:purchaseclaim-request-detail:query')")
public CommonResult<PageResult<PurchaseclaimRequestDetailRespVO>> getPurchaseclaimRequestDetailPage(@Valid PurchaseclaimRequestDetailPageReqVO pageVO) {
PageResult<PurchaseclaimRequestDetailDO> pageResult = purchaseclaimRequestDetailService.getPurchaseclaimRequestDetailPage(pageVO);
return success(PurchaseclaimRequestDetailConvert.INSTANCE.convertPage(pageResult));
}
@GetMapping("/export-excel")
@Operation(summary = "导出采购索赔申请子 Excel")
@PreAuthorize("@ss.hasPermission('wms:purchaseclaim-request-detail:export')")
@OperateLog(type = EXPORT)
public void exportPurchaseclaimRequestDetailExcel(@Valid PurchaseclaimRequestDetailExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<PurchaseclaimRequestDetailDO> list = purchaseclaimRequestDetailService.getPurchaseclaimRequestDetailList(exportReqVO);
// 导出 Excel
List<PurchaseclaimRequestDetailExcelVO> datas = PurchaseclaimRequestDetailConvert.INSTANCE.convertList02(list);
for(PurchaseclaimRequestDetailExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "采购索赔申请子.xls", "数据", PurchaseclaimRequestDetailExcelVO.class, datas);
}
}

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestMainController.java

@ -1,6 +1,7 @@
package com.win.module.wms.controller.purchaseclaimRequest;
import com.win.framework.common.pojo.CommonResult;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
@ -89,6 +90,20 @@ public class PurchaseclaimRequestMainController {
return success(PurchaseclaimRequestMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得采购索赔申请主分页")
@PreAuthorize("@ss.hasPermission('wms:purchaseclaim-request-main:query')")
public CommonResult<PageResult<PurchaseclaimRequestMainRespVO>> getPurchaseclaimRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<PurchaseclaimRequestMainDO> pageResult = purchaseclaimRequestMainService.getPurchaseclaimRequestMainSenior(conditions);
PageResult<PurchaseclaimRequestMainRespVO> result = PurchaseclaimRequestMainConvert.INSTANCE.convertPage(pageResult);
for(PurchaseclaimRequestMainRespVO vo : result.getList()) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return success(result);
}
@GetMapping("/export-excel")
@Operation(summary = "导出采购索赔申请主 Excel")
@PreAuthorize("@ss.hasPermission('wms:purchaseclaim-request-main:export')")

5
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainCreateReqVO.java

@ -5,10 +5,15 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.util.List;
@Schema(description = "管理后台 - 采购索赔申请主创建 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class PurchaseclaimRequestMainCreateReqVO extends PurchaseclaimRequestMainBaseVO {
@Schema(description = "子表数据")
private List<PurchaseclaimRequestDetailCreateReqVO> subList;
}

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainUpdateReqVO.java

@ -1,15 +1,19 @@
package com.win.module.wms.controller.purchaseclaimRequest.vo;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestMainBaseVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.util.List;
@Schema(description = "管理后台 - 采购索赔申请主更新 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class PurchaseclaimRequestMainUpdateReqVO extends PurchaseclaimRequestMainBaseVO {
@Schema(description = "子表数据")
private List<PurchaseclaimRequestDetailUpdateReqVO> subList;
}

11
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchaseclaimRequest/PurchaseclaimRequestDetailConvert.java

@ -1,16 +1,15 @@
package com.win.module.wms.convert.purchaseclaimRequest;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailCreateReqVO;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailExcelVO;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailRespVO;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailUpdateReqVO;
import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestDetailDO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestDetailDO;
import java.util.List;
/**
* 采购索赔申请子 Convert
@ -34,4 +33,8 @@ public interface PurchaseclaimRequestDetailConvert {
List<PurchaseclaimRequestDetailExcelVO> convertList02(List<PurchaseclaimRequestDetailDO> list);
List<PurchaseclaimRequestDetailDO> convertList03(List<PurchaseclaimRequestDetailCreateReqVO> list);
List<PurchaseclaimRequestDetailDO> convertList04(List<PurchaseclaimRequestDetailUpdateReqVO> list);
}

59
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRequest/PurchaseclaimRequestDetailMapper.java

@ -1,15 +1,12 @@
package com.win.module.wms.dal.mysql.purchaseclaimRequest;
import java.util.*;
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.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailExportReqVO;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailPageReqVO;
import com.win.framework.mybatis.core.query.QueryWrapperX;
import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestDetailDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 采购索赔申请子 Mapper
*
@ -18,54 +15,8 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface PurchaseclaimRequestDetailMapper extends BaseMapperX<PurchaseclaimRequestDetailDO> {
default PageResult<PurchaseclaimRequestDetailDO> selectPage(PurchaseclaimRequestDetailPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<PurchaseclaimRequestDetailDO>()
.eqIfPresent(PurchaseclaimRequestDetailDO::getBatch, reqVO.getBatch())
.eqIfPresent(PurchaseclaimRequestDetailDO::getAltBatch, reqVO.getAltBatch())
.eqIfPresent(PurchaseclaimRequestDetailDO::getPoNumber, reqVO.getPoNumber())
.eqIfPresent(PurchaseclaimRequestDetailDO::getPoLine, reqVO.getPoLine())
.eqIfPresent(PurchaseclaimRequestDetailDO::getReason, reqVO.getReason())
.eqIfPresent(PurchaseclaimRequestDetailDO::getSinglePrice, reqVO.getSinglePrice())
.eqIfPresent(PurchaseclaimRequestDetailDO::getAmount, reqVO.getAmount())
.eqIfPresent(PurchaseclaimRequestDetailDO::getNumber, reqVO.getNumber())
.eqIfPresent(PurchaseclaimRequestDetailDO::getItemCode, reqVO.getItemCode())
.eqIfPresent(PurchaseclaimRequestDetailDO::getRemark, reqVO.getRemark())
.betweenIfPresent(PurchaseclaimRequestDetailDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PurchaseclaimRequestDetailDO::getCreator, reqVO.getCreator())
.likeIfPresent(PurchaseclaimRequestDetailDO::getItemName, reqVO.getItemName())
.eqIfPresent(PurchaseclaimRequestDetailDO::getItemDesc1, reqVO.getItemDesc1())
.eqIfPresent(PurchaseclaimRequestDetailDO::getItemDesc2, reqVO.getItemDesc2())
.eqIfPresent(PurchaseclaimRequestDetailDO::getProjectCode, reqVO.getProjectCode())
.eqIfPresent(PurchaseclaimRequestDetailDO::getQty, reqVO.getQty())
.eqIfPresent(PurchaseclaimRequestDetailDO::getUom, reqVO.getUom())
.betweenIfPresent(PurchaseclaimRequestDetailDO::getUpdateTime, reqVO.getUpdateTime())
.eqIfPresent(PurchaseclaimRequestDetailDO::getUpdater, reqVO.getUpdater())
.orderByDesc(PurchaseclaimRequestDetailDO::getId));
}
default List<PurchaseclaimRequestDetailDO> selectList(PurchaseclaimRequestDetailExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<PurchaseclaimRequestDetailDO>()
.eqIfPresent(PurchaseclaimRequestDetailDO::getBatch, reqVO.getBatch())
.eqIfPresent(PurchaseclaimRequestDetailDO::getAltBatch, reqVO.getAltBatch())
.eqIfPresent(PurchaseclaimRequestDetailDO::getPoNumber, reqVO.getPoNumber())
.eqIfPresent(PurchaseclaimRequestDetailDO::getPoLine, reqVO.getPoLine())
.eqIfPresent(PurchaseclaimRequestDetailDO::getReason, reqVO.getReason())
.eqIfPresent(PurchaseclaimRequestDetailDO::getSinglePrice, reqVO.getSinglePrice())
.eqIfPresent(PurchaseclaimRequestDetailDO::getAmount, reqVO.getAmount())
.eqIfPresent(PurchaseclaimRequestDetailDO::getNumber, reqVO.getNumber())
.eqIfPresent(PurchaseclaimRequestDetailDO::getItemCode, reqVO.getItemCode())
.eqIfPresent(PurchaseclaimRequestDetailDO::getRemark, reqVO.getRemark())
.betweenIfPresent(PurchaseclaimRequestDetailDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PurchaseclaimRequestDetailDO::getCreator, reqVO.getCreator())
.likeIfPresent(PurchaseclaimRequestDetailDO::getItemName, reqVO.getItemName())
.eqIfPresent(PurchaseclaimRequestDetailDO::getItemDesc1, reqVO.getItemDesc1())
.eqIfPresent(PurchaseclaimRequestDetailDO::getItemDesc2, reqVO.getItemDesc2())
.eqIfPresent(PurchaseclaimRequestDetailDO::getProjectCode, reqVO.getProjectCode())
.eqIfPresent(PurchaseclaimRequestDetailDO::getQty, reqVO.getQty())
.eqIfPresent(PurchaseclaimRequestDetailDO::getUom, reqVO.getUom())
.betweenIfPresent(PurchaseclaimRequestDetailDO::getUpdateTime, reqVO.getUpdateTime())
.eqIfPresent(PurchaseclaimRequestDetailDO::getUpdater, reqVO.getUpdater())
.orderByDesc(PurchaseclaimRequestDetailDO::getId));
default List<PurchaseclaimRequestDetailDO> selectList(Long masterId) {
return selectList(new QueryWrapperX<PurchaseclaimRequestDetailDO>().eq("master_id", masterId));
}
}

9
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRequest/PurchaseclaimRequestMainMapper.java

@ -1,9 +1,12 @@
package com.win.module.wms.dal.mysql.purchaseclaimRequest;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.mybatis.core.mapper.BaseMapperX;
import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.win.module.wms.controller.purchaseclaimRequest.vo.*;
import com.win.framework.mybatis.core.util.QueryWrapperUtils;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestMainExportReqVO;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestMainPageReqVO;
import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestMainDO;
import org.apache.ibatis.annotations.Mapper;
@ -40,6 +43,10 @@ public interface PurchaseclaimRequestMainMapper extends BaseMapperX<Purchaseclai
.orderByDesc(PurchaseclaimRequestMainDO::getId));
}
default PageResult<PurchaseclaimRequestMainDO> selectSenior(CustomConditions conditions) {
return selectPage(conditions, QueryWrapperUtils.structure(conditions));
}
default List<PurchaseclaimRequestMainDO> selectList(PurchaseclaimRequestMainExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<PurchaseclaimRequestMainDO>()
.eqIfPresent(PurchaseclaimRequestMainDO::getAsnNumber, reqVO.getAsnNumber())

62
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestDetailService.java

@ -1,14 +1,8 @@
package com.win.module.wms.service.purchaseclaimRequest;
import java.util.*;
import javax.validation.*;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailCreateReqVO;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailExportReqVO;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailPageReqVO;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailUpdateReqVO;
import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestDetailDO;
import com.win.framework.common.pojo.PageResult;
import java.util.List;
/**
* 采购索赔申请子 Service 接口
@ -18,57 +12,11 @@ import com.win.framework.common.pojo.PageResult;
public interface PurchaseclaimRequestDetailService {
/**
* 创建采购索赔申请子
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createPurchaseclaimRequestDetail(@Valid PurchaseclaimRequestDetailCreateReqVO createReqVO);
/**
* 更新采购索赔申请子
*
* @param updateReqVO 更新信息
*/
void updatePurchaseclaimRequestDetail(@Valid PurchaseclaimRequestDetailUpdateReqVO updateReqVO);
/**
* 删除采购索赔申请子
*
* @param id 编号
*/
void deletePurchaseclaimRequestDetail(Long id);
/**
* 获得采购索赔申请子
*
* @param id 编号
* @return 采购索赔申请子
*/
PurchaseclaimRequestDetailDO getPurchaseclaimRequestDetail(Long id);
/**
* 获得采购索赔申请子列表
*
* @param ids 编号
* @return 采购索赔申请子列表
*/
List<PurchaseclaimRequestDetailDO> getPurchaseclaimRequestDetailList(Collection<Long> ids);
/**
* 获得采购索赔申请子分页
*
* @param pageReqVO 分页查询
* @return 采购索赔申请子分页
*/
PageResult<PurchaseclaimRequestDetailDO> getPurchaseclaimRequestDetailPage(PurchaseclaimRequestDetailPageReqVO pageReqVO);
/**
* 获得采购索赔申请子列表, 用于 Excel 导出
* 获得采购索赔申请子列表,
*
* @param exportReqVO 查询条件
* @param masterId 主表id
* @return 采购索赔申请子列表
*/
List<PurchaseclaimRequestDetailDO> getPurchaseclaimRequestDetailList(PurchaseclaimRequestDetailExportReqVO exportReqVO);
List<PurchaseclaimRequestDetailDO> getPurchaseclaimRequestDetailList(Long masterId);
}

70
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestDetailServiceImpl.java

@ -1,23 +1,12 @@
package com.win.module.wms.service.purchaseclaimRequest;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailCreateReqVO;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailExportReqVO;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailPageReqVO;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailUpdateReqVO;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import java.util.*;
import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestDetailDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.purchaseclaimRequest.PurchaseclaimRequestDetailConvert;
import com.win.module.wms.dal.mysql.purchaseclaimRequest.PurchaseclaimRequestDetailMapper;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.module.wms.enums.ErrorCodeConstants.*;
import javax.annotation.Resource;
import java.util.List;
/**
* 采购索赔申请子 Service 实现类
@ -32,55 +21,8 @@ public class PurchaseclaimRequestDetailServiceImpl implements PurchaseclaimReque
private PurchaseclaimRequestDetailMapper purchaseclaimRequestDetailMapper;
@Override
public Long createPurchaseclaimRequestDetail(PurchaseclaimRequestDetailCreateReqVO createReqVO) {
// 插入
PurchaseclaimRequestDetailDO purchaseclaimRequestDetail = PurchaseclaimRequestDetailConvert.INSTANCE.convert(createReqVO);
purchaseclaimRequestDetailMapper.insert(purchaseclaimRequestDetail);
// 返回
return purchaseclaimRequestDetail.getId();
}
@Override
public void updatePurchaseclaimRequestDetail(PurchaseclaimRequestDetailUpdateReqVO updateReqVO) {
// 校验存在
validatePurchaseclaimRequestDetailExists(updateReqVO.getId());
// 更新
PurchaseclaimRequestDetailDO updateObj = PurchaseclaimRequestDetailConvert.INSTANCE.convert(updateReqVO);
purchaseclaimRequestDetailMapper.updateById(updateObj);
}
@Override
public void deletePurchaseclaimRequestDetail(Long id) {
// 校验存在
validatePurchaseclaimRequestDetailExists(id);
// 删除
purchaseclaimRequestDetailMapper.deleteById(id);
}
private void validatePurchaseclaimRequestDetailExists(Long id) {
if (purchaseclaimRequestDetailMapper.selectById(id) == null) {
throw exception(PURCHASECLAIM_REQUEST_DETAIL_NOT_EXISTS);
}
}
@Override
public PurchaseclaimRequestDetailDO getPurchaseclaimRequestDetail(Long id) {
return purchaseclaimRequestDetailMapper.selectById(id);
}
@Override
public List<PurchaseclaimRequestDetailDO> getPurchaseclaimRequestDetailList(Collection<Long> ids) {
return purchaseclaimRequestDetailMapper.selectBatchIds(ids);
}
@Override
public PageResult<PurchaseclaimRequestDetailDO> getPurchaseclaimRequestDetailPage(PurchaseclaimRequestDetailPageReqVO pageReqVO) {
return purchaseclaimRequestDetailMapper.selectPage(pageReqVO);
}
@Override
public List<PurchaseclaimRequestDetailDO> getPurchaseclaimRequestDetailList(PurchaseclaimRequestDetailExportReqVO exportReqVO) {
return purchaseclaimRequestDetailMapper.selectList(exportReqVO);
public List<PurchaseclaimRequestDetailDO> getPurchaseclaimRequestDetailList(Long masterId) {
return purchaseclaimRequestDetailMapper.selectList(masterId);
}
}

13
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestMainService.java

@ -1,8 +1,11 @@
package com.win.module.wms.service.purchaseclaimRequest;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestMainCreateReqVO;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestMainExportReqVO;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestMainPageReqVO;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestMainUpdateReqVO;
import com.win.module.wms.controller.purchaseclaimRequest.vo.*;
import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestMainDO;
import javax.validation.Valid;
@ -62,6 +65,14 @@ public interface PurchaseclaimRequestMainService {
*/
PageResult<PurchaseclaimRequestMainDO> getPurchaseclaimRequestMainPage(PurchaseclaimRequestMainPageReqVO pageReqVO);
/**
* 获得用高级搜索户分页列表
*
* @param conditions 分页排序和自定义条件
* @return 分页列表
*/
PageResult<PurchaseclaimRequestMainDO> getPurchaseclaimRequestMainSenior(CustomConditions conditions);
/**
* 获得采购索赔申请主列表, 用于 Excel 导出
*

50
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestMainServiceImpl.java

@ -1,17 +1,25 @@
package com.win.module.wms.service.purchaseclaimRequest;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestMainUpdateReqVO;
import com.win.module.system.api.serialnumber.SerialNumberApi;
import com.win.module.system.enums.serialNumber.RuleCodeEnum;
import com.win.module.wms.controller.purchaseclaimRequest.vo.*;
import com.win.module.wms.convert.purchaseclaimRequest.PurchaseclaimRequestDetailConvert;
import com.win.module.wms.convert.purchaseclaimRequest.PurchaseclaimRequestMainConvert;
import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestDetailDO;
import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestMainDO;
import com.win.module.wms.dal.mysql.purchaseclaimRequest.PurchaseclaimRequestDetailMapper;
import com.win.module.wms.dal.mysql.purchaseclaimRequest.PurchaseclaimRequestMainMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.module.wms.enums.ErrorCodeConstants.PURCHASECLAIM_REQUEST_MAIN_NOT_EXISTS;
@ -28,30 +36,57 @@ public class PurchaseclaimRequestMainServiceImpl implements PurchaseclaimRequest
@Resource
private PurchaseclaimRequestMainMapper purchaseclaimRequestMainMapper;
@Resource
private PurchaseclaimRequestDetailMapper purchaseclaimRequestDetailMapper;
@Resource
private SerialNumberApi serialNumberApi;
@Override
@Transactional
public Long createPurchaseclaimRequestMain(PurchaseclaimRequestMainCreateReqVO createReqVO) {
// 插入
// 插入主表
PurchaseclaimRequestMainDO purchaseclaimRequestMain = PurchaseclaimRequestMainConvert.INSTANCE.convert(createReqVO);
String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_CLAIM_RECORD.getCode());
purchaseclaimRequestMain.setNumber(number);
purchaseclaimRequestMainMapper.insert(purchaseclaimRequestMain);
// 插入子表
List<PurchaseclaimRequestDetailCreateReqVO> subList = createReqVO.getSubList();
List<PurchaseclaimRequestDetailDO> subDOList = PurchaseclaimRequestDetailConvert.INSTANCE.convertList03(subList);
purchaseclaimRequestDetailMapper.insertBatch(subDOList);
// 返回
return purchaseclaimRequestMain.getId();
}
@Override
@Transactional
public void updatePurchaseclaimRequestMain(PurchaseclaimRequestMainUpdateReqVO updateReqVO) {
// 校验存在
// 校验存在,如子表需要也再此校验
validatePurchaseclaimRequestMainExists(updateReqVO.getId());
// 更新
// 更新主表
PurchaseclaimRequestMainDO updateObj = PurchaseclaimRequestMainConvert.INSTANCE.convert(updateReqVO);
purchaseclaimRequestMainMapper.updateById(updateObj);
List<PurchaseclaimRequestDetailUpdateReqVO> subList = updateReqVO.getSubList();
List<PurchaseclaimRequestDetailDO> subDOList = PurchaseclaimRequestDetailConvert.INSTANCE.convertList04(subList);
// 先删除子表数据
Map<String, Object> map = new HashMap<>();
map.put("master_id", updateObj.getId());
purchaseclaimRequestDetailMapper.deleteByMap(map);
// 新增子表数据
purchaseclaimRequestDetailMapper.insertBatch(subDOList);
}
@Override
@Transactional
public void deletePurchaseclaimRequestMain(Long id) {
// 校验存在
validatePurchaseclaimRequestMainExists(id);
// 删除
// 删除主表
purchaseclaimRequestMainMapper.deleteById(id);
// 删除子表数据
Map<String, Object> map = new HashMap<>();
map.put("master_id", id);
purchaseclaimRequestDetailMapper.deleteByMap(map);
}
private void validatePurchaseclaimRequestMainExists(Long id) {
@ -75,6 +110,11 @@ public class PurchaseclaimRequestMainServiceImpl implements PurchaseclaimRequest
return purchaseclaimRequestMainMapper.selectPage(pageReqVO);
}
@Override
public PageResult<PurchaseclaimRequestMainDO> getPurchaseclaimRequestMainSenior(CustomConditions conditions) {
return purchaseclaimRequestMainMapper.selectSenior(conditions);
}
@Override
public List<PurchaseclaimRequestMainDO> getPurchaseclaimRequestMainList(PurchaseclaimRequestMainExportReqVO exportReqVO) {
return purchaseclaimRequestMainMapper.selectList(exportReqVO);

Loading…
Cancel
Save