Browse Source

完善采购收货任务接口

master
刘忱 2 years ago
parent
commit
df98715927
  1. 8
      win-module-infra/win-module-infra-biz/src/main/resources/codegen/java/controller/controller.vm
  2. 4
      win-module-infra/win-module-infra-biz/src/main/resources/codegen/java/service/service.vm
  3. 8
      win-module-infra/win-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm
  4. 87
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java
  5. 139
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java
  6. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailPageReqVO.java
  7. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainBaseVO.java
  8. 162
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainExcelVO.java
  9. 10
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainExportReqVO.java
  10. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainPageReqVO.java
  11. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereceiptJob/PurchasereceiptJobMainConvert.java
  12. 20
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptJob/PurchasereceiptJobMainDO.java
  13. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobDetailMapper.java
  14. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java
  15. 33
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/job/JobStatusConverter.java
  16. 43
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/job/JobStatusEnum.java
  17. 45
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java
  18. 54
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java
  19. 53
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java
  20. 59
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java

8
win-module-infra/win-module-infra-biz/src/main/resources/codegen/java/controller/controller.vm

@ -52,8 +52,8 @@ public class ${sceneEnum.prefixClass}${table.className}Controller {
#if ($sceneEnum.scene == 1) @PreAuthorize("@ss.hasPermission('${permissionPrefix}:update')")#end
public CommonResult<Boolean> update${simpleClassName}(@Valid @RequestBody ${sceneEnum.prefixClass}${table.className}UpdateReqVO updateReqVO) {
${classNameVar}Service.update${simpleClassName}(updateReqVO);
return success(true);
int result = ${classNameVar}Service.update${simpleClassName}(updateReqVO);
return success(result > 0);
}
@DeleteMapping("/delete")
@ -62,8 +62,8 @@ public class ${sceneEnum.prefixClass}${table.className}Controller {
#if ($sceneEnum.scene == 1) @PreAuthorize("@ss.hasPermission('${permissionPrefix}:delete')")#end
public CommonResult<Boolean> delete${simpleClassName}(@RequestParam("id") ${primaryColumn.javaType} id) {
${classNameVar}Service.delete${simpleClassName}(id);
return success(true);
int result = ${classNameVar}Service.delete${simpleClassName}(id);
return success(result > 0);
}
@GetMapping("/get")

4
win-module-infra/win-module-infra-biz/src/main/resources/codegen/java/service/service.vm

@ -26,14 +26,14 @@ public interface ${table.className}Service {
*
* @param updateReqVO 更新信息
*/
void update${simpleClassName}(@Valid ${sceneEnum.prefixClass}${table.className}UpdateReqVO updateReqVO);
Integer update${simpleClassName}(@Valid ${sceneEnum.prefixClass}${table.className}UpdateReqVO updateReqVO);
/**
* 删除${table.classComment}
*
* @param id 编号
*/
void delete${simpleClassName}(${primaryColumn.javaType} id);
Integer delete${simpleClassName}(${primaryColumn.javaType} id);
/**
* 获得${table.classComment}

8
win-module-infra/win-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm

@ -37,20 +37,20 @@ public class ${table.className}ServiceImpl implements ${table.className}Service
}
@Override
public void update${simpleClassName}(${sceneEnum.prefixClass}${table.className}UpdateReqVO updateReqVO) {
public Integer update${simpleClassName}(${sceneEnum.prefixClass}${table.className}UpdateReqVO updateReqVO) {
// 校验存在
validate${simpleClassName}Exists(updateReqVO.getId());
// 更新
${table.className}DO updateObj = ${table.className}Convert.INSTANCE.convert(updateReqVO);
${classNameVar}Mapper.updateById(updateObj);
return ${classNameVar}Mapper.updateById(updateObj);
}
@Override
public void delete${simpleClassName}(${primaryColumn.javaType} id) {
public Integer delete${simpleClassName}(${primaryColumn.javaType} id) {
// 校验存在
validate${simpleClassName}Exists(id);
// 删除
${classNameVar}Mapper.deleteById(id);
return ${classNameVar}Mapper.deleteById(id);
}
private void validate${simpleClassName}Exists(${primaryColumn.javaType} id) {

87
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java

@ -1,36 +1,27 @@
package com.win.module.wms.controller.purchasereceiptJob;
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 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.purchasereceiptJob.vo.PurchasereceiptJobDetailPageReqVO;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailRespVO;
import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobDetailConvert;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO;
import com.win.module.wms.service.purchasereceiptJob.PurchasereceiptJobDetailService;
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.validation.constraints.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import java.io.IOException;
import javax.annotation.Resource;
import javax.validation.Valid;
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.controller.purchasereceiptJob.vo.*;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO;
import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobDetailConvert;
import com.win.module.wms.service.purchasereceiptJob.PurchasereceiptJobDetailService;
@Tag(name = "管理后台 - 采购收货任务子")
@RestController
@RequestMapping("/wms/purchasereceipt-job-detail")
@ -43,30 +34,6 @@ public class PurchasereceiptJobDetailController {
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建采购收货任务子")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-detail:create')")
public CommonResult<Long> createPurchasereceiptJobDetail(@Valid @RequestBody PurchasereceiptJobDetailCreateReqVO createReqVO) {
return success(purchasereceiptJobDetailService.createPurchasereceiptJobDetail(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新采购收货任务子")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-detail:update')")
public CommonResult<Boolean> updatePurchasereceiptJobDetail(@Valid @RequestBody PurchasereceiptJobDetailUpdateReqVO updateReqVO) {
purchasereceiptJobDetailService.updatePurchasereceiptJobDetail(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除采购收货任务子")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-detail:delete')")
public CommonResult<Boolean> deletePurchasereceiptJobDetail(@RequestParam("id") Long id) {
purchasereceiptJobDetailService.deletePurchasereceiptJobDetail(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得采购收货任务子")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@ -75,6 +42,7 @@ public class PurchasereceiptJobDetailController {
PurchasereceiptJobDetailDO purchasereceiptJobDetail = purchasereceiptJobDetailService.getPurchasereceiptJobDetail(id);
return success(PurchasereceiptJobDetailConvert.INSTANCE.convert(purchasereceiptJobDetail));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得采购收货任务子信息分页")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-detail:query')")
@ -88,14 +56,6 @@ public class PurchasereceiptJobDetailController {
}
return success(result);
}
@GetMapping("/list")
@Operation(summary = "获得采购收货任务子列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-detail:query')")
public CommonResult<List<PurchasereceiptJobDetailRespVO>> getPurchasereceiptJobDetailList(@RequestParam("ids") Collection<Long> ids) {
List<PurchasereceiptJobDetailDO> list = purchasereceiptJobDetailService.getPurchasereceiptJobDetailList(ids);
return success(PurchasereceiptJobDetailConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得采购收货任务子分页")
@ -105,21 +65,4 @@ public class PurchasereceiptJobDetailController {
return success(PurchasereceiptJobDetailConvert.INSTANCE.convertPage(pageResult));
}
@GetMapping("/export-excel")
@Operation(summary = "导出采购收货任务子 Excel")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-detail:export')")
@OperateLog(type = EXPORT)
public void exportPurchasereceiptJobDetailExcel(@Valid PurchasereceiptJobDetailExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<PurchasereceiptJobDetailDO> list = purchasereceiptJobDetailService.getPurchasereceiptJobDetailList(exportReqVO);
// 导出 Excel
List<PurchasereceiptJobDetailExcelVO> datas = PurchasereceiptJobDetailConvert.INSTANCE.convertList02(list);
for(PurchasereceiptJobDetailExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "采购收货任务子.xls", "数据", PurchasereceiptJobDetailExcelVO.class, datas);
}
}

139
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java

@ -1,33 +1,41 @@
package com.win.module.wms.controller.purchasereceiptJob;
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.dict.core.util.DictFrameworkUtils;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.purchasereceiptJob.vo.*;
import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobDetailConvert;
import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobMainConvert;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.enums.job.JobStatusEnum;
import com.win.module.wms.service.purchasereceiptJob.PurchasereceiptJobDetailService;
import com.win.module.wms.service.purchasereceiptJob.PurchasereceiptJobMainService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jodd.util.StringUtil;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
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 io.swagger.v3.oas.annotations.Operation;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.common.pojo.CommonResult;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
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.controller.purchasereceiptJob.vo.*;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO;
import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobMainConvert;
import com.win.module.wms.service.purchasereceiptJob.PurchasereceiptJobMainService;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@Tag(name = "管理后台 - 采购收货任务主")
@RestController
@ -44,55 +52,20 @@ public class PurchasereceiptJobMainController {
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建采购收货任务主")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:create')")
public CommonResult<Long> createPurchasereceiptJobMain(@Valid @RequestBody PurchasereceiptJobMainCreateReqVO createReqVO) {
return success(purchasereceiptJobMainService.createPurchasereceiptJobMain(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新采购收货任务主")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:update')")
public CommonResult<Boolean> updatePurchasereceiptJobMain(@Valid @RequestBody PurchasereceiptJobMainUpdateReqVO updateReqVO) {
purchasereceiptJobMainService.updatePurchasereceiptJobMain(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除采购收货任务主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:delete')")
public CommonResult<Boolean> deletePurchasereceiptJobMain(@RequestParam("id") Long id) {
purchasereceiptJobMainService.deletePurchasereceiptJobMain(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得采购收货任务主")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:query')")
public CommonResult<PurchasereceiptJobMainRespVO> getPurchasereceiptJobMain(@RequestParam("id") Long id) {
PurchasereceiptJobMainDO purchasereceiptJobMain = purchasereceiptJobMainService.getPurchasereceiptJobMain(id);
return success(PurchasereceiptJobMainConvert.INSTANCE.convert(purchasereceiptJobMain));
}
@GetMapping("/list")
@Operation(summary = "获得采购收货任务主列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:query')")
public CommonResult<List<PurchasereceiptJobMainRespVO>> getPurchasereceiptJobMainList(@RequestParam("ids") Collection<Long> ids) {
List<PurchasereceiptJobMainDO> list = purchasereceiptJobMainService.getPurchasereceiptJobMainList(ids);
return success(PurchasereceiptJobMainConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得采购收货任务主分页")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:query')")
public CommonResult<PageResult<PurchasereceiptJobMainRespVO>> getPurchasereceiptJobMainPage(@Valid PurchasereceiptJobMainPageReqVO pageVO) {
PageResult<PurchasereceiptJobMainDO> pageResult = purchasereceiptJobMainService.getPurchasereceiptJobMainPage(pageVO);
return success(PurchasereceiptJobMainConvert.INSTANCE.convertPage(pageResult));
PageResult<PurchasereceiptJobMainRespVO> pageResult1 = PurchasereceiptJobMainConvert.INSTANCE.convertPage(pageResult);
for(PurchasereceiptJobMainRespVO vo : pageResult1.getList()) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return success(pageResult1);
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得采购收货任务主信息分页")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:query')")
@ -106,6 +79,7 @@ public class PurchasereceiptJobMainController {
}
return success(result);
}
@GetMapping("/export-excel")
@Operation(summary = "导出采购收货任务主 Excel")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:export')")
@ -113,14 +87,43 @@ public class PurchasereceiptJobMainController {
public void exportPurchasereceiptJobMainExcel(@Valid PurchasereceiptJobMainExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<PurchasereceiptJobMainDO> list = purchasereceiptJobMainService.getPurchasereceiptJobMainList(exportReqVO);
// 导出 Excel
List<PurchasereceiptJobMainExcelVO> datas = PurchasereceiptJobMainConvert.INSTANCE.convertList02(list);
for(PurchasereceiptJobMainExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
//组装vo
Map<Integer, String[]> mapDropDown = new HashMap<>();
String[] transferMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRANSFER_MODE);
mapDropDown.put(6, transferMode);
String[] status = JobStatusEnum.getStatusNameArray();
mapDropDown.put(12, status);
String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE);
mapDropDown.put(22, locationType);
mapDropDown.put(23, locationType);
String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(27, trueFalse);
mapDropDown.put(30, trueFalse);
mapDropDown.put(31, trueFalse);
mapDropDown.put(32, trueFalse);
mapDropDown.put(33, trueFalse);
mapDropDown.put(34, trueFalse);
mapDropDown.put(35, trueFalse);
mapDropDown.put(36, trueFalse);
mapDropDown.put(37, trueFalse);
mapDropDown.put(38, trueFalse);
String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
mapDropDown.put(46, inventoryStatus);
String[] packUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT);
mapDropDown.put(52, packUnit);
String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(54, uom);
mapDropDown.put(62, uom);
List<PurchasereceiptJobMainExcelVO> resultList = new ArrayList<>();
// 导出
for(PurchasereceiptJobMainDO mainDO : list) {
List<PurchasereceiptJobDetailDO> subList = purchasereceiptJobDetailService.selectList(mainDO.getId());
for(PurchasereceiptJobDetailDO detailDO : subList) {
PurchasereceiptJobMainExcelVO vo = PurchasereceiptJobMainConvert.INSTANCE.convert(mainDO, detailDO);
resultList.add(vo);
}
ExcelUtils.write(response, "采购收货任务主.xls", "数据", PurchasereceiptJobMainExcelVO.class, datas);
}
ExcelUtils.write(response, "采购收货任务主.xlsx", "数据", PurchasereceiptJobMainExcelVO.class, resultList, mapDropDown);
}
@GetMapping("/getPurchasereceiptJobyId")
@ -156,6 +159,4 @@ public class PurchasereceiptJobMainController {
return success(countByStatus);
}
}

14
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailPageReqVO.java

@ -1,12 +1,13 @@
package com.win.module.wms.controller.purchasereceiptJob.vo;
import lombok.*;
import java.math.BigDecimal;
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.math.BigDecimal;
import java.time.LocalDateTime;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@ -26,6 +27,9 @@ public class PurchasereceiptJobDetailPageReqVO extends PageParam {
@Schema(description = "批次")
private String batch;
@Schema(description = "主表ID")
private Long masterId;
@Schema(description = "替代批次")
private String altBatch;

17
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainBaseVO.java

@ -1,18 +1,12 @@
package com.win.module.wms.controller.purchasereceiptJob.vo;
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 java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import javax.validation.constraints.*;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
/**
@ -78,9 +72,6 @@ public class PurchasereceiptJobMainBaseVO {
@Schema(description = "最后更新者Id")
private String updater;
@Schema(description = "状态")
private String jobStageStatus;
@Schema(description = "优先级")
private Integer priority;

162
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainExcelVO.java

@ -1,19 +1,14 @@
package com.win.module.wms.controller.purchasereceiptJob.vo;
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 java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.ExcelProperty;
import com.win.framework.excel.core.annotations.DictFormat;
import com.win.framework.excel.core.convert.DictConvert;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.enums.job.JobStatusConverter;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@ -43,11 +38,10 @@ public class PurchasereceiptJobMainExcelVO {
private String carrierCode;
@ExcelProperty(value = "运输方式", converter = DictConvert.class)
@DictFormat("transfer_mode") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRANSFER_MODE)
private String transferMode;
@ExcelProperty(value = "车牌号", converter = DictConvert.class)
@DictFormat("vehicle_plate_number") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@ExcelProperty(value = "车牌号")
private String vehiclePlateNumber;
@ExcelProperty("从仓库代码")
@ -62,23 +56,12 @@ public class PurchasereceiptJobMainExcelVO {
@ExcelProperty("要求截止时间")
private LocalDateTime requestDueTime;
@ExcelProperty(value = "状态", converter = DictConvert.class)
@DictFormat("job_status") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@ExcelProperty(value = "状态", converter = JobStatusConverter.class)
private String status;
@ExcelProperty("过期时间")
private LocalDateTime expiredTime;
@ExcelProperty("最后更新时间")
private LocalDateTime updateTime;
@ExcelProperty("最后更新者Id")
private String updater;
@ExcelProperty(value = "状态", converter = DictConvert.class)
@DictFormat("job_stage_status") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
private String jobStageStatus;
@ExcelProperty("优先级")
private Integer priority;
@ -104,11 +87,11 @@ public class PurchasereceiptJobMainExcelVO {
private LocalDateTime completeTime;
@ExcelProperty(value = "从库位类型范围", converter = DictConvert.class)
@DictFormat("location_type") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.LOCATION_TYPE)
private String fromLocationTypes;
@ExcelProperty(value = "到库位类型范围", converter = DictConvert.class)
@DictFormat("location_type") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.LOCATION_TYPE)
private String toLocationTypes;
@ExcelProperty("单据号")
@ -120,14 +103,8 @@ public class PurchasereceiptJobMainExcelVO {
@ExcelProperty("备注")
private String remark;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("创建者id")
private String creator;
@ExcelProperty(value = "允许修改批次", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowModifyBatch;
@ExcelProperty("从库区代码范围")
@ -137,39 +114,136 @@ public class PurchasereceiptJobMainExcelVO {
private String toAreaCodes;
@ExcelProperty(value = "自动完成", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String autoComplete;
@ExcelProperty(value = "允许修改库位", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowModifyLocation;
@ExcelProperty(value = "允许修改数量", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowModifyQty;
@ExcelProperty(value = "允许大于推荐数量", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowBiggerQty;
@ExcelProperty(value = "允许小于推荐数量", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowSmallerQty;
@ExcelProperty(value = "允许修改库存状态", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowModifyInventoryStatus;
@ExcelProperty(value = "允许连续扫描", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowContinuousScanning;
@ExcelProperty(value = "允许部分完成", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowPartialComplete;
@ExcelProperty(value = "允许修改箱码", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowModifyPackingNumber;
@ExcelProperty("包装号")
private String packingNumber;
@ExcelProperty("器具号")
private String containerNumber;
@ExcelProperty("批次")
private String batch;
@ExcelProperty("替代批次")
private String altBatch;
@ExcelProperty("到货日期")
private LocalDateTime arriveDate;
@ExcelProperty("生产日期")
private LocalDateTime produceDate;
@ExcelProperty("过期日期")
private LocalDateTime expireDate;
@ExcelProperty(value = "库存状态", converter = DictConvert.class)
@DictFormat(DictTypeConstants.INVENTORY_STATUS)
private String inventoryStatus;
@ExcelProperty("从库位代码")
private String fromLocationCode;
@ExcelProperty("到库位代码")
private String toLocationCode;
@ExcelProperty("订单号")
private String poNumber;
@ExcelProperty("订单行")
private String poLine;
@ExcelProperty("标包数量")
private BigDecimal stdPackQty;
@ExcelProperty(value = "标包单位", converter = DictConvert.class)
@DictFormat(DictTypeConstants.PACK_UNIT)
private String stdPackUnit;
@ExcelProperty("供应商计量数量")
private BigDecimal supplierQty;
@ExcelProperty(value = "供应商计量单位", converter = DictConvert.class)
@DictFormat(DictTypeConstants.UOM)
private String supplierUom;
@ExcelProperty("转换率")
private BigDecimal convertRate;
@ExcelProperty("物品代码")
private String itemCode;
@ExcelProperty("物品名称")
private String itemName;
@ExcelProperty("物品描述1")
private String itemDesc1;
@ExcelProperty("物品描述2")
private String itemDesc2;
@ExcelProperty("项目代码")
private String projectCode;
@ExcelProperty("数量")
private BigDecimal qty;
@ExcelProperty(value = "计量单位", converter = DictConvert.class)
@DictFormat(DictTypeConstants.UOM)
private String uom;
@ExcelProperty("从货主代码")
private String fromOwnerCode;
@ExcelProperty("到货主代码")
private String toOwnerCode;
@ExcelProperty("明细备注")
private String remarkDetail;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("创建者Id")
private String creator;
@ExcelProperty("最后更新时间")
private LocalDateTime updateTime;
@ExcelProperty("最后更新者Id")
private String updater;
}

10
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainExportReqVO.java

@ -1,12 +1,11 @@
package com.win.module.wms.controller.purchasereceiptJob.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,参数和 PurchasereceiptJobMainPageReqVO 是一致的")
@ -65,9 +64,6 @@ public class PurchasereceiptJobMainExportReqVO {
@Schema(description = "最后更新者Id")
private String updater;
@Schema(description = "状态")
private String jobStageStatus;
@Schema(description = "优先级")
private Integer priority;

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainPageReqVO.java

@ -1,11 +1,14 @@
package com.win.module.wms.controller.purchasereceiptJob.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 java.util.List;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@ -67,9 +70,6 @@ public class PurchasereceiptJobMainPageReqVO extends PageParam {
@Schema(description = "最后更新者Id")
private String updater;
@Schema(description = "状态")
private String jobStageStatus;
@Schema(description = "优先级")
private Integer priority;

14
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereceiptJob/PurchasereceiptJobMainConvert.java

@ -5,9 +5,12 @@ import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMai
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainExcelVO;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainRespVO;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainUpdateReqVO;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO;
import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers;
import java.util.List;
@ -36,4 +39,15 @@ public interface PurchasereceiptJobMainConvert {
PurchasereceiptJobMainCreateReqVO convert(PurchasereceiptRequestMainDO bean);
@Mappings({
@Mapping(source = "mainDO.number", target = "number"),
@Mapping(source = "mainDO.remark", target = "remark"),
@Mapping(source = "detailDO.remark", target = "remarkDetail"),
@Mapping(source = "mainDO.createTime", target = "createTime"),
@Mapping(source = "mainDO.creator", target = "creator"),
@Mapping(source = "mainDO.updateTime", target = "updateTime"),
@Mapping(source = "mainDO.updater", target = "updater"),
})
PurchasereceiptJobMainExcelVO convert(PurchasereceiptJobMainDO mainDO, PurchasereceiptJobDetailDO detailDO);
}

20
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptJob/PurchasereceiptJobMainDO.java

@ -1,16 +1,12 @@
package com.win.module.wms.dal.dataobject.purchasereceiptJob;
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 java.time.LocalDateTime;
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
@ -101,12 +97,6 @@ public class PurchasereceiptJobMainDO extends BaseDO {
* 并发乐观锁
*/
private String concurrencyStamp;
/**
* 状态
*
* 枚举 {@link TODO job_stage_status 对应的类}
*/
private String jobStageStatus;
/**
* 优先级
*/

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobDetailMapper.java

@ -1,16 +1,16 @@
package com.win.module.wms.dal.mysql.purchasereceiptJob;
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.dal.dataobject.barcode.BarcodeDO;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailExportReqVO;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailPageReqVO;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO;
import org.apache.ibatis.annotations.Mapper;
import com.win.module.wms.controller.purchasereceiptJob.vo.*;
import java.util.List;
/**
* 采购收货任务子 Mapper
@ -22,6 +22,7 @@ public interface PurchasereceiptJobDetailMapper extends BaseMapperX<Purchaserece
default PageResult<PurchasereceiptJobDetailDO> selectPage(PurchasereceiptJobDetailPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<PurchasereceiptJobDetailDO>()
.eq(PurchasereceiptJobDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(PurchasereceiptJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
.eqIfPresent(PurchasereceiptJobDetailDO::getContainerNumber, reqVO.getContainerNumber())
.eqIfPresent(PurchasereceiptJobDetailDO::getBatch, reqVO.getBatch())
@ -93,4 +94,9 @@ public interface PurchasereceiptJobDetailMapper extends BaseMapperX<Purchaserece
.orderByDesc(PurchasereceiptJobDetailDO::getId));
}
default List<PurchasereceiptJobDetailDO> selectList(Long masterId) {
return selectList(new LambdaQueryWrapperX<PurchasereceiptJobDetailDO>()
.eq(PurchasereceiptJobDetailDO::getMasterId, masterId));
}
}

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java

@ -7,7 +7,6 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.win.framework.mybatis.core.util.QueryWrapperUtils;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainExportReqVO;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainPageReqVO;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainRespVO;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO;
import com.win.module.wms.enums.order.OrderStatusEnum;
import org.apache.ibatis.annotations.Mapper;
@ -42,7 +41,6 @@ public interface PurchasereceiptJobMainMapper extends BaseMapperX<Purchasereceip
.betweenIfPresent(PurchasereceiptJobMainDO::getExpiredTime, reqVO.getExpiredTime())
.betweenIfPresent(PurchasereceiptJobMainDO::getUpdateTime, reqVO.getUpdateTime())
.eqIfPresent(PurchasereceiptJobMainDO::getUpdater, reqVO.getUpdater())
.eqIfPresent(PurchasereceiptJobMainDO::getJobStageStatus, reqVO.getJobStageStatus())
.eqIfPresent(PurchasereceiptJobMainDO::getPriority, reqVO.getPriority())
.eqIfPresent(PurchasereceiptJobMainDO::getPriorityIncrement, reqVO.getPriorityIncrement())
.eqIfPresent(PurchasereceiptJobMainDO::getDepartmentCode, reqVO.getDepartmentCode())
@ -100,7 +98,6 @@ public interface PurchasereceiptJobMainMapper extends BaseMapperX<Purchasereceip
.betweenIfPresent(PurchasereceiptJobMainDO::getExpiredTime, reqVO.getExpiredTime())
.betweenIfPresent(PurchasereceiptJobMainDO::getUpdateTime, reqVO.getUpdateTime())
.eqIfPresent(PurchasereceiptJobMainDO::getUpdater, reqVO.getUpdater())
.eqIfPresent(PurchasereceiptJobMainDO::getJobStageStatus, reqVO.getJobStageStatus())
.eqIfPresent(PurchasereceiptJobMainDO::getPriority, reqVO.getPriority())
.eqIfPresent(PurchasereceiptJobMainDO::getPriorityIncrement, reqVO.getPriorityIncrement())
.eqIfPresent(PurchasereceiptJobMainDO::getDepartmentCode, reqVO.getDepartmentCode())

33
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/job/JobStatusConverter.java

@ -0,0 +1,33 @@
package com.win.module.wms.enums.job;
import com.alibaba.excel.converters.Converter;
import com.alibaba.excel.converters.ReadConverterContext;
import com.alibaba.excel.converters.WriteConverterContext;
import com.alibaba.excel.enums.CellDataTypeEnum;
import com.alibaba.excel.metadata.data.WriteCellData;
import lombok.extern.slf4j.Slf4j;
@Slf4j
public class JobStatusConverter implements Converter<Object> {
@Override
public Class<?> supportJavaTypeKey() {
throw new UnsupportedOperationException("暂不支持,也不需要");
}
@Override
public CellDataTypeEnum supportExcelTypeKey() {
throw new UnsupportedOperationException("暂不支持,也不需要");
}
@Override
public String convertToJavaData(ReadConverterContext<?> context) {
return JobStatusEnum.convertName(context.getReadCellData().getStringValue()).getCode();
}
@Override
public WriteCellData<Object> convertToExcelData(WriteConverterContext<Object> context) {
return new WriteCellData<>(JobStatusEnum.convertCode(String.valueOf(context.getValue())).getName());
}
}

43
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/job/JobStatusEnum.java

@ -1,33 +1,60 @@
package com.win.module.wms.enums.job;
import java.util.stream.Stream;
public enum JobStatusEnum {
PENDING("1"), // 待处理
PROCESSING("2"), // 进行中
COMPLETED("3"), // 完成
CLOSED("4"), // 关闭
PENDING("1", "待处理"),
PROCESSING("2", "进行中"),
COMPLETED("3", "完成"),
CLOSED("4", "关闭"),
;
private final String code;
private final String name;
JobStatusEnum(String code) {
JobStatusEnum(String code, String name) {
this.code = code;
this.name = name;
}
public String getCode() {
return code;
}
public String getName() {
return name;
}
/**
* 用状态值获取枚举
* @param status
* @param code
* @return
*/
static JobStatusEnum getJobStatusEnum(String status) {
static JobStatusEnum getJobStatusEnum(String code) {
for (JobStatusEnum jobStatusEnum : values()) {
if (jobStatusEnum.getCode().equals(status)) {
if (jobStatusEnum.getCode().equals(code)) {
return jobStatusEnum;
}
}
return PROCESSING;
}
public static JobStatusEnum convertCode(String code) {
return Stream.of(values())
.filter(bean -> bean.code.equals(code))
.findAny()
.orElse(PENDING);
}
public static JobStatusEnum convertName(String name) {
return Stream.of(values())
.filter(bean -> bean.name.equals(name))
.findAny()
.orElse(PENDING);
}
public static String[] getStatusNameArray() {
return Stream.of(values()).map(JobStatusEnum::getName).toArray(String[]::new);
}
}

45
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java

@ -1,12 +1,12 @@
package com.win.module.wms.service.purchasereceiptJob;
import java.util.*;
import javax.validation.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.purchasereceiptJob.vo.*;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailExportReqVO;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailPageReqVO;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO;
import java.util.List;
/**
* 采购收货任务子 Service 接口
@ -15,13 +15,6 @@ import com.win.framework.common.pojo.PageResult;
*/
public interface PurchasereceiptJobDetailService {
/**
* 创建采购收货任务子
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createPurchasereceiptJobDetail(@Valid PurchasereceiptJobDetailCreateReqVO createReqVO);
/**
* 获得用高级搜索采购收货任务子分页列表
*
@ -29,19 +22,6 @@ public interface PurchasereceiptJobDetailService {
* @return 分页列表
*/
PageResult<PurchasereceiptJobDetailDO> getPurchasereceiptJobDetailSenior(CustomConditions conditions);
/**
* 更新采购收货任务子
*
* @param updateReqVO 更新信息
*/
void updatePurchasereceiptJobDetail(@Valid PurchasereceiptJobDetailUpdateReqVO updateReqVO);
/**
* 删除采购收货任务子
*
* @param id 编号
*/
void deletePurchasereceiptJobDetail(Long id);
/**
* 获得采购收货任务子
@ -51,14 +31,6 @@ public interface PurchasereceiptJobDetailService {
*/
PurchasereceiptJobDetailDO getPurchasereceiptJobDetail(Long id);
/**
* 获得采购收货任务子列表
*
* @param ids 编号
* @return 采购收货任务子列表
*/
List<PurchasereceiptJobDetailDO> getPurchasereceiptJobDetailList(Collection<Long> ids);
/**
* 获得采购收货任务子分页
*
@ -67,6 +39,13 @@ public interface PurchasereceiptJobDetailService {
*/
PageResult<PurchasereceiptJobDetailDO> getPurchasereceiptJobDetailPage(PurchasereceiptJobDetailPageReqVO pageReqVO);
/**
* 根据主表id查询
* @param masterId
* @return
*/
List<PurchasereceiptJobDetailDO> selectList(Long masterId);
/**
* 获得采购收货任务子列表, 用于 Excel 导出
*

54
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java

@ -1,20 +1,16 @@
package com.win.module.wms.service.purchasereceiptJob;
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.purchasereceiptJob.vo.*;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobDetailConvert;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailExportReqVO;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailPageReqVO;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO;
import com.win.module.wms.dal.mysql.purchasereceiptJob.PurchasereceiptJobDetailMapper;
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 实现类
@ -28,39 +24,14 @@ public class PurchasereceiptJobDetailServiceImpl implements PurchasereceiptJobDe
@Resource
private PurchasereceiptJobDetailMapper purchasereceiptJobDetailMapper;
@Override
public Long createPurchasereceiptJobDetail(PurchasereceiptJobDetailCreateReqVO createReqVO) {
// 插入
PurchasereceiptJobDetailDO purchasereceiptJobDetail = PurchasereceiptJobDetailConvert.INSTANCE.convert(createReqVO);
purchasereceiptJobDetailMapper.insert(purchasereceiptJobDetail);
// 返回
return purchasereceiptJobDetail.getId();
}
@Override
public void updatePurchasereceiptJobDetail(PurchasereceiptJobDetailUpdateReqVO updateReqVO) {
// 校验存在
validatePurchasereceiptJobDetailExists(updateReqVO.getId());
// 更新
PurchasereceiptJobDetailDO updateObj = PurchasereceiptJobDetailConvert.INSTANCE.convert(updateReqVO);
purchasereceiptJobDetailMapper.updateById(updateObj);
}
@Override
public PageResult<PurchasereceiptJobDetailDO> getPurchasereceiptJobDetailSenior(CustomConditions conditions) {
return purchasereceiptJobDetailMapper.selectSenior(conditions);
}
@Override
public void deletePurchasereceiptJobDetail(Long id) {
// 校验存在
validatePurchasereceiptJobDetailExists(id);
// 删除
purchasereceiptJobDetailMapper.deleteById(id);
}
private void validatePurchasereceiptJobDetailExists(Long id) {
if (purchasereceiptJobDetailMapper.selectById(id) == null) {
throw exception(PURCHASERECEIPT_JOB_DETAIL_NOT_EXISTS);
}
@Override
public List<PurchasereceiptJobDetailDO> selectList(Long masterId) {
return purchasereceiptJobDetailMapper.selectList(masterId);
}
@Override
@ -68,11 +39,6 @@ public class PurchasereceiptJobDetailServiceImpl implements PurchasereceiptJobDe
return purchasereceiptJobDetailMapper.selectById(id);
}
@Override
public List<PurchasereceiptJobDetailDO> getPurchasereceiptJobDetailList(Collection<Long> ids) {
return purchasereceiptJobDetailMapper.selectBatchIds(ids);
}
@Override
public PageResult<PurchasereceiptJobDetailDO> getPurchasereceiptJobDetailPage(PurchasereceiptJobDetailPageReqVO pageReqVO) {
return purchasereceiptJobDetailMapper.selectPage(pageReqVO);

53
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java

@ -1,14 +1,17 @@
package com.win.module.wms.service.purchasereceiptJob;
import java.util.*;
import javax.validation.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.purchasereceiptJob.vo.*;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainExportReqVO;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainPageReqVO;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO;
import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO;
import org.springframework.lang.Nullable;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* 采购收货任务主 Service 接口
*
@ -16,13 +19,6 @@ import org.springframework.lang.Nullable;
*/
public interface PurchasereceiptJobMainService {
/**
* 创建采购收货任务主
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createPurchasereceiptJobMain(@Valid PurchasereceiptJobMainCreateReqVO createReqVO);
/**
* 获得用高级搜索户分页列表
*
@ -30,19 +26,6 @@ public interface PurchasereceiptJobMainService {
* @return 分页列表
*/
PageResult<PurchasereceiptJobMainDO> getPurchasereceiptJobMainSenior(CustomConditions conditions);
/**
* 更新采购收货任务主
*
* @param updateReqVO 更新信息
*/
void updatePurchasereceiptJobMain(@Valid PurchasereceiptJobMainUpdateReqVO updateReqVO);
/**
* 删除采购收货任务主
*
* @param id 编号
*/
void deletePurchasereceiptJobMain(Long id);
/**
* 获得采购收货任务主
@ -52,14 +35,6 @@ public interface PurchasereceiptJobMainService {
*/
PurchasereceiptJobMainDO getPurchasereceiptJobMain(Long id);
/**
* 获得采购收货任务主列表
*
* @param ids 编号
* @return 采购收货任务主列表
*/
List<PurchasereceiptJobMainDO> getPurchasereceiptJobMainList(Collection<Long> ids);
/**
* 获得采购收货任务主分页
*
@ -75,6 +50,18 @@ public interface PurchasereceiptJobMainService {
* @return 采购收货任务主列表
*/
List<PurchasereceiptJobMainDO> getPurchasereceiptJobMainList(PurchasereceiptJobMainExportReqVO exportReqVO);
/**
* 调用校验供应商发货记录方法
*
* @param pasnNumber 发货单号
* @param pitemCode 物品代码
* @param ppoNumber 订单号
* @param ppoLine 订单行
* @return 供应商发货记录子
*/
SupplierdeliverRecordDetailDO selectSupplierdeliverRecordDetailDoExist(String psupplierCode, String pasnNumber, String pitemCode, String ppoNumber, String ppoLine);
/**
* 校验任务状态正确
*@author chenfang

59
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java

@ -2,19 +2,21 @@ package com.win.module.wms.service.purchasereceiptJob;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainExportReqVO;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainPageReqVO;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO;
import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO;
import com.win.module.wms.dal.mysql.purchasereceiptJob.PurchasereceiptJobMainMapper;
import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import java.util.*;
import com.win.module.wms.controller.purchasereceiptJob.vo.*;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobMainConvert;
import com.win.module.wms.dal.mysql.purchasereceiptJob.PurchasereceiptJobMainMapper;
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.*;
@ -33,34 +35,10 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
@Resource
private SupplierdeliverRecordMainService supplierdeliverRecordMainService;
@Override
public Long createPurchasereceiptJobMain(PurchasereceiptJobMainCreateReqVO createReqVO) {
// 插入
PurchasereceiptJobMainDO purchasereceiptJobMain = PurchasereceiptJobMainConvert.INSTANCE.convert(createReqVO);
purchasereceiptJobMainMapper.insert(purchasereceiptJobMain);
// 返回
return purchasereceiptJobMain.getId();
}
@Override
public void updatePurchasereceiptJobMain(PurchasereceiptJobMainUpdateReqVO updateReqVO) {
// 校验存在
validatePurchasereceiptJobMainExists(updateReqVO.getId());
// 更新
PurchasereceiptJobMainDO updateObj = PurchasereceiptJobMainConvert.INSTANCE.convert(updateReqVO);
purchasereceiptJobMainMapper.updateById(updateObj);
}
@Override
public PageResult<PurchasereceiptJobMainDO> getPurchasereceiptJobMainSenior(CustomConditions conditions) {
return purchasereceiptJobMainMapper.selectSenior(conditions);
}
@Override
public void deletePurchasereceiptJobMain(Long id) {
// 校验存在
validatePurchasereceiptJobMainExists(id);
// 删除
purchasereceiptJobMainMapper.deleteById(id);
}
private void validatePurchasereceiptJobMainExists(Long id) {
if (purchasereceiptJobMainMapper.selectById(id) == null) {
@ -73,11 +51,6 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
return purchasereceiptJobMainMapper.selectById(id);
}
@Override
public List<PurchasereceiptJobMainDO> getPurchasereceiptJobMainList(Collection<Long> ids) {
return purchasereceiptJobMainMapper.selectBatchIds(ids);
}
@Override
public PageResult<PurchasereceiptJobMainDO> getPurchasereceiptJobMainPage(PurchasereceiptJobMainPageReqVO pageReqVO) {
return purchasereceiptJobMainMapper.selectPage(pageReqVO);
@ -87,15 +60,8 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
public List<PurchasereceiptJobMainDO> getPurchasereceiptJobMainList(PurchasereceiptJobMainExportReqVO exportReqVO) {
return purchasereceiptJobMainMapper.selectList(exportReqVO);
}
/**
* 调用校验供应商发货记录方法
*
* @param pasnNumber 发货单号
* @param pitemCode 物品代码
* @param ppoNumber 订单号
* @param ppoLine 订单行
* @return 供应商发货记录子
*/
@Override
public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordDetailDoExist(String psupplierCode,String pasnNumber,String pitemCode,String ppoNumber,String ppoLine) {
SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = supplierdeliverRecordMainService.selectSupplierdeliverRecordMainDO(psupplierCode,pasnNumber, pitemCode, ppoNumber, ppoLine);
if(supplierdeliverRecordDetailDO != null){
@ -104,6 +70,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
throw exception(SUPPLIERDELIVER_RECORD_DETAIL_NOT_EXISTS);
}
}
@Override
public PurchasereceiptJobMainDO purchasereceiptJobMainDoStatusRight(String pnumber, String pstatus) {
QueryWrapper queryWrapper = new QueryWrapper();

Loading…
Cancel
Save