Browse Source

盘点申请接口开发。

master
刘忱 2 years ago
parent
commit
78817367d4
  1. 94
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordDetailController.java
  2. 141
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordMainController.java
  3. 11
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailExportReqVO.java
  4. 13
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailPageReqVO.java
  5. 76
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordMainExcelVO.java
  6. 98
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestDetailController.java
  7. 142
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java
  8. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailExportReqVO.java
  9. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailPageReqVO.java
  10. 83
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestMainExcelVO.java
  11. 20
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countadjustRecord/CountadjustRecordMainConvert.java
  12. 20
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countadjustRequest/CountadjustRequestMainConvert.java
  13. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordDetailMapper.java
  14. 11
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordMainMapper.java
  15. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRequest/CountadjustRequestDetailMapper.java
  16. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRequest/CountadjustRequestMainMapper.java
  17. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java
  18. 58
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordDetailService.java
  19. 67
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordDetailServiceImpl.java
  20. 55
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordMainService.java
  21. 65
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordMainServiceImpl.java
  22. 64
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestDetailService.java
  23. 69
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestDetailServiceImpl.java
  24. 55
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java
  25. 64
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java
  26. 25
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainServiceImpl.java
  27. 45
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java
  28. 32
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java
  29. 31
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java
  30. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java
  31. 39
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainServiceImpl.java
  32. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java
  33. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java
  34. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java
  35. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java
  36. 6
      win-server/src/main/resources/application-test.yaml

94
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordDetailController.java

@ -1,35 +1,26 @@
package com.win.module.wms.controller.countadjustRecord;
import com.win.framework.common.pojo.CommonResult;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.countadjustRecord.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordDetailPageReqVO;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordDetailRespVO;
import com.win.module.wms.convert.countadjustRecord.CountadjustRecordDetailConvert;
import com.win.module.wms.dal.dataobject.countadjustRecord.CountadjustRecordDetailDO;
import com.win.module.wms.service.countadjustRecord.CountadjustRecordDetailService;
import io.swagger.v3.oas.annotations.Operation;
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.*;
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.dal.dataobject.countadjustRecord.CountadjustRecordDetailDO;
import com.win.module.wms.convert.countadjustRecord.CountadjustRecordDetailConvert;
import com.win.module.wms.service.countadjustRecord.CountadjustRecordDetailService;
@Tag(name = "管理后台 - 盘点调整记录子")
@RestController
@RequestMapping("/wms/countadjust-record-detail")
@ -42,48 +33,6 @@ public class CountadjustRecordDetailController {
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建盘点调整记录子")
@PreAuthorize("@ss.hasPermission('wms:countadjust-record-detail:create')")
public CommonResult<Long> createCountadjustRecordDetail(@Valid @RequestBody CountadjustRecordDetailCreateReqVO createReqVO) {
return success(countadjustRecordDetailService.createCountadjustRecordDetail(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新盘点调整记录子")
@PreAuthorize("@ss.hasPermission('wms:countadjust-record-detail:update')")
public CommonResult<Boolean> updateCountadjustRecordDetail(@Valid @RequestBody CountadjustRecordDetailUpdateReqVO updateReqVO) {
countadjustRecordDetailService.updateCountadjustRecordDetail(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除盘点调整记录子")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:countadjust-record-detail:delete')")
public CommonResult<Boolean> deleteCountadjustRecordDetail(@RequestParam("id") Long id) {
countadjustRecordDetailService.deleteCountadjustRecordDetail(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得盘点调整记录子")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:countadjust-record-detail:query')")
public CommonResult<CountadjustRecordDetailRespVO> getCountadjustRecordDetail(@RequestParam("id") Long id) {
CountadjustRecordDetailDO countadjustRecordDetail = countadjustRecordDetailService.getCountadjustRecordDetail(id);
return success(CountadjustRecordDetailConvert.INSTANCE.convert(countadjustRecordDetail));
}
@GetMapping("/list")
@Operation(summary = "获得盘点调整记录子列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:countadjust-record-detail:query')")
public CommonResult<List<CountadjustRecordDetailRespVO>> getCountadjustRecordDetailList(@RequestParam("ids") Collection<Long> ids) {
List<CountadjustRecordDetailDO> list = countadjustRecordDetailService.getCountadjustRecordDetailList(ids);
return success(CountadjustRecordDetailConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得盘点调整记录子分页")
@PreAuthorize("@ss.hasPermission('wms:countadjust-record-detail:query')")
@ -91,6 +40,7 @@ public class CountadjustRecordDetailController {
PageResult<CountadjustRecordDetailDO> pageResult = countadjustRecordDetailService.getCountadjustRecordDetailPage(pageVO);
return success(CountadjustRecordDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得盘点调整记录子分页")
@PreAuthorize("@ss.hasPermission('wms:countadjust-record-detail:query')")
@ -104,21 +54,5 @@ public class CountadjustRecordDetailController {
}
return success(result);
}
@GetMapping("/export-excel")
@Operation(summary = "导出盘点调整记录子 Excel")
@PreAuthorize("@ss.hasPermission('wms:countadjust-record-detail:export')")
@OperateLog(type = EXPORT)
public void exportCountadjustRecordDetailExcel(@Valid CountadjustRecordDetailExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<CountadjustRecordDetailDO> list = countadjustRecordDetailService.getCountadjustRecordDetailList(exportReqVO);
// 导出 Excel
List<CountadjustRecordDetailExcelVO> datas = CountadjustRecordDetailConvert.INSTANCE.convertList02(list);
for(CountadjustRecordDetailExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "盘点调整记录子.xls", "数据", CountadjustRecordDetailExcelVO.class, datas);
}
}

141
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordMainController.java

@ -1,35 +1,40 @@
package com.win.module.wms.controller.countadjustRecord;
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.countadjustRecord.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainExcelVO;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainExportReqVO;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainPageReqVO;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainRespVO;
import com.win.module.wms.convert.countadjustRecord.CountadjustRecordMainConvert;
import com.win.module.wms.dal.dataobject.countadjustRecord.CountadjustRecordDetailDO;
import com.win.module.wms.dal.dataobject.countadjustRecord.CountadjustRecordMainDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.countadjustRecord.CountadjustRecordDetailService;
import com.win.module.wms.service.countadjustRecord.CountadjustRecordMainService;
import io.swagger.v3.oas.annotations.Operation;
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.*;
import javax.servlet.http.*;
import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
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.countadjustRecord.vo.*;
import com.win.module.wms.dal.dataobject.countadjustRecord.CountadjustRecordMainDO;
import com.win.module.wms.convert.countadjustRecord.CountadjustRecordMainConvert;
import com.win.module.wms.service.countadjustRecord.CountadjustRecordMainService;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@Tag(name = "管理后台 - 盘点调整记录主")
@RestController
@ -39,52 +44,12 @@ public class CountadjustRecordMainController {
@Resource
private CountadjustRecordMainService countadjustRecordMainService;
@Resource
private CountadjustRecordDetailService countadjustRecordDetailService;
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建盘点调整记录主")
@PreAuthorize("@ss.hasPermission('wms:countadjust-record-main:create')")
public CommonResult<Long> createCountadjustRecordMain(@Valid @RequestBody CountadjustRecordMainCreateReqVO createReqVO) {
return success(countadjustRecordMainService.createCountadjustRecordMain(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新盘点调整记录主")
@PreAuthorize("@ss.hasPermission('wms:countadjust-record-main:update')")
public CommonResult<Boolean> updateCountadjustRecordMain(@Valid @RequestBody CountadjustRecordMainUpdateReqVO updateReqVO) {
countadjustRecordMainService.updateCountadjustRecordMain(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除盘点调整记录主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:countadjust-record-main:delete')")
public CommonResult<Boolean> deleteCountadjustRecordMain(@RequestParam("id") Long id) {
countadjustRecordMainService.deleteCountadjustRecordMain(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得盘点调整记录主")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:countadjust-record-main:query')")
public CommonResult<CountadjustRecordMainRespVO> getCountadjustRecordMain(@RequestParam("id") Long id) {
CountadjustRecordMainDO countadjustRecordMain = countadjustRecordMainService.getCountadjustRecordMain(id);
return success(CountadjustRecordMainConvert.INSTANCE.convert(countadjustRecordMain));
}
@GetMapping("/list")
@Operation(summary = "获得盘点调整记录主列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:countadjust-record-main:query')")
public CommonResult<List<CountadjustRecordMainRespVO>> getCountadjustRecordMainList(@RequestParam("ids") Collection<Long> ids) {
List<CountadjustRecordMainDO> list = countadjustRecordMainService.getCountadjustRecordMainList(ids);
return success(CountadjustRecordMainConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得盘点调整记录主分页")
@PreAuthorize("@ss.hasPermission('wms:countadjust-record-main:query')")
@ -92,6 +57,7 @@ public class CountadjustRecordMainController {
PageResult<CountadjustRecordMainDO> pageResult = countadjustRecordMainService.getCountadjustRecordMainPage(pageVO);
return success(CountadjustRecordMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得盘点调整记录主分页")
@PreAuthorize("@ss.hasPermission('wms:countadjust-record-main:query')")
@ -105,21 +71,50 @@ public class CountadjustRecordMainController {
}
return success(result);
}
@GetMapping("/export-excel")
@Operation(summary = "导出盘点调整记录主 Excel")
@PreAuthorize("@ss.hasPermission('wms:countadjust-record-main:export')")
@OperateLog(type = EXPORT)
public void exportCountadjustRecordMainExcel(@Valid CountadjustRecordMainExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
public void exportCountadjustRecordMainExcel(@Valid CountadjustRecordMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException {
List<CountadjustRecordMainDO> list = countadjustRecordMainService.getCountadjustRecordMainList(exportReqVO);
// 导出 Excel
List<CountadjustRecordMainExcelVO> datas = CountadjustRecordMainConvert.INSTANCE.convertList02(list);
for(CountadjustRecordMainExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<CountadjustRecordMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "盘点调整记录主.xls", "盘点调整数据", CountadjustRecordMainExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出盘点调整记录主 Excel")
@PreAuthorize("@ss.hasPermission('wms:countadjust-record-main:export')")
@OperateLog(type = EXPORT)
public void exportCountadjustRecordMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<CountadjustRecordMainDO> list = countadjustRecordMainService.getCountadjustRecordMainList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<CountadjustRecordMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "检验记录主.xls", "检验记录数据", CountadjustRecordMainExcelVO.class, resultList, mapDropDown);
}
private List<CountadjustRecordMainExcelVO> getExcelVo(List<CountadjustRecordMainDO> list, Map<Integer, String[]> mapDropDown) {
//组装vo
String[] interfaceType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INTERFACE_TYPE);
mapDropDown.put(11, interfaceType);
String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
mapDropDown.put(23, inventoryStatus);
String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(32, uom);
List<CountadjustRecordMainExcelVO> resultList = new ArrayList<>();
// 导出
for(CountadjustRecordMainDO mainDO : list) {
List<CountadjustRecordDetailDO> subList = countadjustRecordDetailService.selectList(mainDO.getId());
for(CountadjustRecordDetailDO detailDO : subList) {
CountadjustRecordMainExcelVO vo = CountadjustRecordMainConvert.INSTANCE.convert(mainDO, detailDO);
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
resultList.add(vo);
}
}
ExcelUtils.write(response, "盘点调整记录主.xls", "数据", CountadjustRecordMainExcelVO.class, datas);
return resultList;
}
}

11
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailExportReqVO.java

@ -1,13 +1,11 @@
package com.win.module.wms.controller.countadjustRecord.vo;
import lombok.*;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.win.framework.common.pojo.PageParam;
import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@ -88,4 +86,7 @@ public class CountadjustRecordDetailExportReqVO {
@Schema(description = "任务明细ID")
private String jobDetailId;
@Schema(description = "主表ID")
private Long masterId;
}

13
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailPageReqVO.java

@ -1,12 +1,13 @@
package com.win.module.wms.controller.countadjustRecord.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;
@ -90,4 +91,6 @@ public class CountadjustRecordDetailPageReqVO extends PageParam {
@Schema(description = "任务明细ID")
private String jobDetailId;
@Schema(description = "主表ID")
private Long masterId;
}

76
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordMainExcelVO.java

@ -1,17 +1,13 @@
package com.win.module.wms.controller.countadjustRecord.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 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 lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@ -53,7 +49,7 @@ public class CountadjustRecordMainExcelVO {
private String departmentCode;
@ExcelProperty(value = "接口类型", converter = DictConvert.class)
@DictFormat("interface_type") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.INTERFACE_TYPE)
private String interfaceType;
@ExcelProperty("代码")
@ -68,13 +64,69 @@ public class CountadjustRecordMainExcelVO {
@ExcelProperty("备注")
private String remark;
@ExcelProperty("是否可用")
private String available;
@ExcelProperty("盘点明细号")
private String countDetailNumber;
@ExcelProperty("货主代码")
private String ownerCode;
@ExcelProperty("包装号")
private String packingNumber;
@ExcelProperty("器具号")
private String containerNumber;
@ExcelProperty("批次")
private String batch;
@ExcelProperty("库位代码")
private String locationCode;
@ExcelProperty(value = "库存状态", converter = DictConvert.class)
@DictFormat(DictTypeConstants.INVENTORY_STATUS)
private String inventoryStatus;
@ExcelProperty("库存数量")
private BigDecimal inventoryQty;
@ExcelProperty("盘点数量")
private BigDecimal countQty;
@ExcelProperty("调整数量")
private BigDecimal adjustQty;
@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 itemCode;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("创建者Id")
private String creator;
@ExcelProperty("是否可用")
private String available;
@ExcelProperty("任务明细ID")
private String jobDetailId;
}

98
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestDetailController.java

@ -1,35 +1,26 @@
package com.win.module.wms.controller.countadjustRequest;
import com.win.framework.common.pojo.CommonResult;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.countadjustRequest.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestDetailPageReqVO;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestDetailRespVO;
import com.win.module.wms.convert.countadjustRequest.CountadjustRequestDetailConvert;
import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestDetailDO;
import com.win.module.wms.service.countadjustRequest.CountadjustRequestDetailService;
import io.swagger.v3.oas.annotations.Operation;
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.*;
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.countadjustRequest.vo.*;
import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestDetailDO;
import com.win.module.wms.convert.countadjustRequest.CountadjustRequestDetailConvert;
import com.win.module.wms.service.countadjustRequest.CountadjustRequestDetailService;
@Tag(name = "管理后台 - 盘点调整申请子")
@RestController
@RequestMapping("/wms/countadjust-request-detail")
@ -42,48 +33,6 @@ public class CountadjustRequestDetailController {
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建盘点调整申请子")
@PreAuthorize("@ss.hasPermission('wms:countadjust-request-detail:create')")
public CommonResult<Long> createCountadjustRequestDetail(@Valid @RequestBody CountadjustRequestDetailCreateReqVO createReqVO) {
return success(countadjustRequestDetailService.createCountadjustRequestDetail(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新盘点调整申请子")
@PreAuthorize("@ss.hasPermission('wms:countadjust-request-detail:update')")
public CommonResult<Boolean> updateCountadjustRequestDetail(@Valid @RequestBody CountadjustRequestDetailUpdateReqVO updateReqVO) {
countadjustRequestDetailService.updateCountadjustRequestDetail(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除盘点调整申请子")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:countadjust-request-detail:delete')")
public CommonResult<Boolean> deleteCountadjustRequestDetail(@RequestParam("id") Long id) {
countadjustRequestDetailService.deleteCountadjustRequestDetail(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得盘点调整申请子")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:countadjust-request-detail:query')")
public CommonResult<CountadjustRequestDetailRespVO> getCountadjustRequestDetail(@RequestParam("id") Long id) {
CountadjustRequestDetailDO countadjustRequestDetail = countadjustRequestDetailService.getCountadjustRequestDetail(id);
return success(CountadjustRequestDetailConvert.INSTANCE.convert(countadjustRequestDetail));
}
@GetMapping("/list")
@Operation(summary = "获得盘点调整申请子列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:countadjust-request-detail:query')")
public CommonResult<List<CountadjustRequestDetailRespVO>> getCountadjustRequestDetailList(@RequestParam("ids") Collection<Long> ids) {
List<CountadjustRequestDetailDO> list = countadjustRequestDetailService.getCountadjustRequestDetailList(ids);
return success(CountadjustRequestDetailConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得盘点调整申请子分页")
@PreAuthorize("@ss.hasPermission('wms:countadjust-request-detail:query')")
@ -92,21 +41,18 @@ public class CountadjustRequestDetailController {
return success(CountadjustRequestDetailConvert.INSTANCE.convertPage(pageResult));
}
@GetMapping("/export-excel")
@Operation(summary = "导出盘点调整申请子 Excel")
@PreAuthorize("@ss.hasPermission('wms:countadjust-request-detail:export')")
@OperateLog(type = EXPORT)
public void exportCountadjustRequestDetailExcel(@Valid CountadjustRequestDetailExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<CountadjustRequestDetailDO> list = countadjustRequestDetailService.getCountadjustRequestDetailList(exportReqVO);
// 导出 Excel
List<CountadjustRequestDetailExcelVO> datas = CountadjustRequestDetailConvert.INSTANCE.convertList02(list);
for(CountadjustRequestDetailExcelVO vo : datas) {
@PostMapping("/senior")
@Operation(summary = "高级搜索获得盘点调整申请子分页")
@PreAuthorize("@ss.hasPermission('wms:countadjust-request-detail:query')")
public CommonResult<PageResult<CountadjustRequestDetailRespVO>> getCountadjustRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CountadjustRequestDetailDO> pageResult = countadjustRequestDetailService.getCountadjustRequestDetailSenior(conditions);
PageResult<CountadjustRequestDetailRespVO> result = CountadjustRequestDetailConvert.INSTANCE.convertPage(pageResult);
for(CountadjustRequestDetailRespVO vo : result.getList()) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "盘点调整申请子.xls", "数据", CountadjustRequestDetailExcelVO.class, datas);
return success(result);
}
}

142
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java

@ -1,35 +1,41 @@
package com.win.module.wms.controller.countadjustRequest;
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.countadjustRequest.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainExcelVO;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainExportReqVO;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainPageReqVO;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainRespVO;
import com.win.module.wms.convert.countadjustRequest.CountadjustRequestMainConvert;
import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestDetailDO;
import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestMainDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.enums.request.RequestStatusEnum;
import com.win.module.wms.service.countadjustRequest.CountadjustRequestDetailService;
import com.win.module.wms.service.countadjustRequest.CountadjustRequestMainService;
import io.swagger.v3.oas.annotations.Operation;
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.*;
import javax.servlet.http.*;
import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
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.countadjustRequest.vo.*;
import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestMainDO;
import com.win.module.wms.convert.countadjustRequest.CountadjustRequestMainConvert;
import com.win.module.wms.service.countadjustRequest.CountadjustRequestMainService;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@Tag(name = "管理后台 - 盘点调整申请主")
@RestController
@ -39,52 +45,12 @@ public class CountadjustRequestMainController {
@Resource
private CountadjustRequestMainService countadjustRequestMainService;
@Resource
private CountadjustRequestDetailService countadjustRequestDetailService;
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建盘点调整申请主")
@PreAuthorize("@ss.hasPermission('wms:countadjust-request-main:create')")
public CommonResult<Long> createCountadjustRequestMain(@Valid @RequestBody CountadjustRequestMainCreateReqVO createReqVO) {
return success(countadjustRequestMainService.createCountadjustRequestMain(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新盘点调整申请主")
@PreAuthorize("@ss.hasPermission('wms:countadjust-request-main:update')")
public CommonResult<Boolean> updateCountadjustRequestMain(@Valid @RequestBody CountadjustRequestMainUpdateReqVO updateReqVO) {
countadjustRequestMainService.updateCountadjustRequestMain(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除盘点调整申请主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:countadjust-request-main:delete')")
public CommonResult<Boolean> deleteCountadjustRequestMain(@RequestParam("id") Long id) {
countadjustRequestMainService.deleteCountadjustRequestMain(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得盘点调整申请主")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:countadjust-request-main:query')")
public CommonResult<CountadjustRequestMainRespVO> getCountadjustRequestMain(@RequestParam("id") Long id) {
CountadjustRequestMainDO countadjustRequestMain = countadjustRequestMainService.getCountadjustRequestMain(id);
return success(CountadjustRequestMainConvert.INSTANCE.convert(countadjustRequestMain));
}
@GetMapping("/list")
@Operation(summary = "获得盘点调整申请主列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:countadjust-request-main:query')")
public CommonResult<List<CountadjustRequestMainRespVO>> getCountadjustRequestMainList(@RequestParam("ids") Collection<Long> ids) {
List<CountadjustRequestMainDO> list = countadjustRequestMainService.getCountadjustRequestMainList(ids);
return success(CountadjustRequestMainConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得盘点调整申请主分页")
@PreAuthorize("@ss.hasPermission('wms:countadjust-request-main:query')")
@ -92,6 +58,7 @@ public class CountadjustRequestMainController {
PageResult<CountadjustRequestMainDO> pageResult = countadjustRequestMainService.getCountadjustRequestMainPage(pageVO);
return success(CountadjustRequestMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得盘点调整申请主分页")
@PreAuthorize("@ss.hasPermission('wms:countadjust-request-main:query')")
@ -105,21 +72,50 @@ public class CountadjustRequestMainController {
}
return success(result);
}
@GetMapping("/export-excel")
@Operation(summary = "导出盘点调整申请主 Excel")
@PreAuthorize("@ss.hasPermission('wms:countadjust-request-main:export')")
@OperateLog(type = EXPORT)
public void exportCountadjustRequestMainExcel(@Valid CountadjustRequestMainExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
public void exportCountadjustRequestMainExcel(@Valid CountadjustRequestMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException {
List<CountadjustRequestMainDO> list = countadjustRequestMainService.getCountadjustRequestMainList(exportReqVO);
// 导出 Excel
List<CountadjustRequestMainExcelVO> datas = CountadjustRequestMainConvert.INSTANCE.convertList02(list);
for(CountadjustRequestMainExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<CountadjustRequestMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "盘点调整申请主.xls", "盘点调整数据", CountadjustRequestMainExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出盘点调整记录主 Excel")
@PreAuthorize("@ss.hasPermission('wms:countadjust-request-main:export')")
@OperateLog(type = EXPORT)
public void exportCountadjustRequestMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<CountadjustRequestMainDO> list = countadjustRequestMainService.getCountadjustRequestMainList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<CountadjustRequestMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "盘点调整申请主.xls", "盘点调整数据", CountadjustRequestMainExcelVO.class, resultList, mapDropDown);
}
private List<CountadjustRequestMainExcelVO> getExcelVo(List<CountadjustRequestMainDO> list, Map<Integer, String[]> mapDropDown) {
//组装vo
String[] status = RequestStatusEnum.getStatusNameArray();
mapDropDown.put(8, status);
String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
mapDropDown.put(19, inventoryStatus);
String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(28, uom);
List<CountadjustRequestMainExcelVO> resultList = new ArrayList<>();
// 导出
for(CountadjustRequestMainDO mainDO : list) {
List<CountadjustRequestDetailDO> subList = countadjustRequestDetailService.selectList(mainDO.getId());
for(CountadjustRequestDetailDO detailDO : subList) {
CountadjustRequestMainExcelVO vo = CountadjustRequestMainConvert.INSTANCE.convert(mainDO, detailDO);
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
resultList.add(vo);
}
}
ExcelUtils.write(response, "盘点调整申请主.xls", "数据", CountadjustRequestMainExcelVO.class, datas);
return resultList;
}
}

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailExportReqVO.java

@ -84,4 +84,7 @@ public class CountadjustRequestDetailExportReqVO {
@Schema(description = "物品代码")
private String itemCode;
@Schema(description = "主表ID")
private Long masterId;
}

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailPageReqVO.java

@ -89,4 +89,7 @@ public class CountadjustRequestDetailPageReqVO extends PageParam {
@Schema(description = "物品代码")
private String itemCode;
@Schema(description = "主表ID")
private Long masterId;
}

83
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestMainExcelVO.java

@ -3,8 +3,11 @@ package com.win.module.wms.controller.countadjustRequest.vo;
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.request.RequestStatusConverter;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@ -31,12 +34,6 @@ public class CountadjustRequestMainExcelVO {
@ExcelProperty("备注")
private String remark;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("创建者用户名")
private String creator;
@ExcelProperty("申请时间")
private LocalDateTime requestTime;
@ -46,16 +43,9 @@ public class CountadjustRequestMainExcelVO {
@ExcelProperty("部门")
private String departmentCode;
@ExcelProperty(value = "状态", converter = DictConvert.class)
@DictFormat("request_status") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@ExcelProperty(value = "状态", converter = RequestStatusConverter.class)
private String status;
@ExcelProperty("最后更新时间")
private LocalDateTime updateTime;
@ExcelProperty("最后更新者用户名")
private String updater;
@ExcelProperty("自动提交")
private String autoCommit;
@ -68,4 +58,69 @@ public class CountadjustRequestMainExcelVO {
@ExcelProperty("直接生成记录")
private String directCreateRecord;
@ExcelProperty("盘点明细号")
private String countDetailNumber;
@ExcelProperty("货主代码")
private String ownerCode;
@ExcelProperty("包装号")
private String packingNumber;
@ExcelProperty("器具号")
private String containerNumber;
@ExcelProperty("批次")
private String batch;
@ExcelProperty("库位代码")
private String locationCode;
@ExcelProperty(value = "库存状态", converter = DictConvert.class)
@DictFormat(DictTypeConstants.INVENTORY_STATUS)
private String inventoryStatus;
@ExcelProperty("库存数量")
private BigDecimal inventoryQty;
@ExcelProperty("盘点数量")
private BigDecimal countQty;
@ExcelProperty("调整数量")
private BigDecimal adjustQty;
@ExcelProperty("物品名称")
private String itemName;
@ExcelProperty("物品描述1")
private String itemDesc1;
@ExcelProperty("物品描述2")
private String itelDesc2;
@ExcelProperty("项目代码")
private String projectCode;
@ExcelProperty("数量")
private BigDecimal qty;
@ExcelProperty(value = "计量单位", converter = DictConvert.class)
@DictFormat(DictTypeConstants.UOM)
private String uom;
@ExcelProperty("物品代码")
private String itemCode;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("创建者用户名")
private String creator;
@ExcelProperty("最后更新时间")
private LocalDateTime updateTime;
@ExcelProperty("最后更新者用户名")
private String updater;
}

20
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countadjustRecord/CountadjustRecordMainConvert.java

@ -1,16 +1,18 @@
package com.win.module.wms.convert.countadjustRecord;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainCreateReqVO;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainExcelVO;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainRespVO;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainUpdateReqVO;
import com.win.module.wms.dal.dataobject.countadjustRecord.CountadjustRecordDetailDO;
import com.win.module.wms.dal.dataobject.countadjustRecord.CountadjustRecordMainDO;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers;
import com.win.module.wms.dal.dataobject.countadjustRecord.CountadjustRecordMainDO;
import java.util.List;
/**
* 盘点调整记录主 Convert
@ -34,4 +36,14 @@ public interface CountadjustRecordMainConvert {
List<CountadjustRecordMainExcelVO> convertList02(List<CountadjustRecordMainDO> list);
@Mappings({
@Mapping(source = "mainDO.number", target = "number"),
@Mapping(source = "detailDO.code", target = "code"),
@Mapping(source = "detailDO.interfaceType", target = "interfaceType"),
@Mapping(source = "mainDO.remark", target = "remark"),
@Mapping(source = "mainDO.createTime", target = "createTime"),
@Mapping(source = "mainDO.creator", target = "creator"),
})
CountadjustRecordMainExcelVO convert(CountadjustRecordMainDO mainDO, CountadjustRecordDetailDO detailDO);
}

20
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countadjustRequest/CountadjustRequestMainConvert.java

@ -1,16 +1,18 @@
package com.win.module.wms.convert.countadjustRequest;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainCreateReqVO;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainExcelVO;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainRespVO;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainUpdateReqVO;
import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestDetailDO;
import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestMainDO;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers;
import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestMainDO;
import java.util.List;
/**
* 盘点调整申请主 Convert
@ -34,4 +36,14 @@ public interface CountadjustRequestMainConvert {
List<CountadjustRequestMainExcelVO> convertList02(List<CountadjustRequestMainDO> list);
@Mappings({
@Mapping(source = "mainDO.number", target = "number"),
@Mapping(source = "mainDO.remark", target = "remark"),
@Mapping(source = "mainDO.createTime", target = "createTime"),
@Mapping(source = "mainDO.creator", target = "creator"),
@Mapping(source = "mainDO.updateTime", target = "updateTime"),
@Mapping(source = "mainDO.updater", target = "updater"),
})
CountadjustRequestMainExcelVO convert(CountadjustRequestMainDO mainDO, CountadjustRequestDetailDO detailDO);
}

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordDetailMapper.java

@ -1,17 +1,17 @@
package com.win.module.wms.dal.mysql.countadjustRecord;
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.countadjustRecord.vo.CountadjustRecordDetailExportReqVO;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordDetailPageReqVO;
import com.win.module.wms.dal.dataobject.countadjustRecord.CountadjustRecordDetailDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 盘点调整记录子 Mapper
*
@ -22,6 +22,7 @@ public interface CountadjustRecordDetailMapper extends BaseMapperX<CountadjustRe
default PageResult<CountadjustRecordDetailDO> selectPage(CountadjustRecordDetailPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<CountadjustRecordDetailDO>()
.eqIfPresent(CountadjustRecordDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(CountadjustRecordDetailDO::getCountDetailNumber, reqVO.getCountDetailNumber())
.eqIfPresent(CountadjustRecordDetailDO::getOwnerCode, reqVO.getOwnerCode())
.eqIfPresent(CountadjustRecordDetailDO::getPackingNumber, reqVO.getPackingNumber())
@ -48,11 +49,14 @@ public interface CountadjustRecordDetailMapper extends BaseMapperX<CountadjustRe
.eqIfPresent(CountadjustRecordDetailDO::getJobDetailId, reqVO.getJobDetailId())
.orderByDesc(CountadjustRecordDetailDO::getId));
}
default PageResult<CountadjustRecordDetailDO> selectSenior(CustomConditions conditions) {
return selectPage(conditions, QueryWrapperUtils.structure(conditions));
}
default List<CountadjustRecordDetailDO> selectList(CountadjustRecordDetailExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<CountadjustRecordDetailDO>()
.eqIfPresent(CountadjustRecordDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(CountadjustRecordDetailDO::getCountDetailNumber, reqVO.getCountDetailNumber())
.eqIfPresent(CountadjustRecordDetailDO::getOwnerCode, reqVO.getOwnerCode())
.eqIfPresent(CountadjustRecordDetailDO::getPackingNumber, reqVO.getPackingNumber())
@ -80,4 +84,9 @@ public interface CountadjustRecordDetailMapper extends BaseMapperX<CountadjustRe
.orderByDesc(CountadjustRecordDetailDO::getId));
}
default List<CountadjustRecordDetailDO> selectList(Long masterId) {
return selectList(new LambdaQueryWrapperX<CountadjustRecordDetailDO>()
.eq(CountadjustRecordDetailDO::getMasterId, masterId));
}
}

11
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordMainMapper.java

@ -1,18 +1,17 @@
package com.win.module.wms.dal.mysql.countadjustRecord;
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.countadjustRecord.vo.CountadjustRecordMainExportReqVO;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainPageReqVO;
import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO;
import com.win.module.wms.dal.dataobject.countadjustRecord.CountadjustRecordMainDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 盘点调整记录主 Mapper
*
@ -69,4 +68,8 @@ public interface CountadjustRecordMainMapper extends BaseMapperX<CountadjustReco
.orderByDesc(CountadjustRecordMainDO::getId));
}
default List<CountadjustRecordMainDO> selectSeniorList(CustomConditions conditions) {
return selectList(QueryWrapperUtils.structure(conditions));
}
}

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRequest/CountadjustRequestDetailMapper.java

@ -1,8 +1,10 @@
package com.win.module.wms.dal.mysql.countadjustRequest;
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.framework.mybatis.core.util.QueryWrapperUtils;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestDetailExportReqVO;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestDetailPageReqVO;
import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestDetailDO;
@ -20,6 +22,7 @@ public interface CountadjustRequestDetailMapper extends BaseMapperX<CountadjustR
default PageResult<CountadjustRequestDetailDO> selectPage(CountadjustRequestDetailPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<CountadjustRequestDetailDO>()
.eqIfPresent(CountadjustRequestDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(CountadjustRequestDetailDO::getCountDetailNumber, reqVO.getCountDetailNumber())
.eqIfPresent(CountadjustRequestDetailDO::getOwnerCode, reqVO.getOwnerCode())
.eqIfPresent(CountadjustRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())
@ -46,8 +49,12 @@ public interface CountadjustRequestDetailMapper extends BaseMapperX<CountadjustR
.orderByDesc(CountadjustRequestDetailDO::getId));
}
default PageResult<CountadjustRequestDetailDO> selectSenior(CustomConditions conditions) {
return selectPage(conditions, QueryWrapperUtils.structure(conditions));
}
default List<CountadjustRequestDetailDO> selectList(CountadjustRequestDetailExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<CountadjustRequestDetailDO>()
.eqIfPresent(CountadjustRequestDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(CountadjustRequestDetailDO::getCountDetailNumber, reqVO.getCountDetailNumber())
.eqIfPresent(CountadjustRequestDetailDO::getOwnerCode, reqVO.getOwnerCode())
.eqIfPresent(CountadjustRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())
@ -74,4 +81,9 @@ public interface CountadjustRequestDetailMapper extends BaseMapperX<CountadjustR
.orderByDesc(CountadjustRequestDetailDO::getId));
}
default List<CountadjustRequestDetailDO> selectList(Long masterId) {
return selectList(new LambdaQueryWrapperX<CountadjustRequestDetailDO>()
.eq(CountadjustRequestDetailDO::getMasterId, masterId));
}
}

14
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRequest/CountadjustRequestMainMapper.java

@ -1,17 +1,17 @@
package com.win.module.wms.dal.mysql.countadjustRequest;
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.countadjustRequest.vo.CountadjustRequestMainExportReqVO;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainPageReqVO;
import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestMainDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 盘点调整申请主 Mapper
*
@ -66,4 +66,12 @@ public interface CountadjustRequestMainMapper extends BaseMapperX<CountadjustReq
.orderByDesc(CountadjustRequestMainDO::getId));
}
default List<CountadjustRequestMainDO> selectSeniorList(CustomConditions conditions) {
return selectList(QueryWrapperUtils.structure(conditions));
}
default CountadjustRequestMainDO selectByNumber(String number) {
return selectOne(CountadjustRequestMainDO::getNumber, number);
}
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java

@ -291,7 +291,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
// 校验存在
CountRequestMainDO mainDO = validateCountRequestMainExists(id);
RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());
boolean flag = requestStatusState.agree(mainDO.getAutoExecute());
boolean flag = requestStatusState.agree(mainDO.getAutoAgree());
if(!flag) {
throw new ServiceException(COUNT_REQUEST_CANNOT_AGREE);
}

58
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordDetailService.java

@ -1,15 +1,11 @@
package com.win.module.wms.service.countadjustRecord;
import java.util.*;
import javax.validation.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordDetailCreateReqVO;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordDetailExportReqVO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordDetailPageReqVO;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordDetailUpdateReqVO;
import com.win.module.wms.dal.dataobject.countadjustRecord.CountadjustRecordDetailDO;
import com.win.framework.common.pojo.PageResult;
import java.util.List;
/**
* 盘点调整记录子 Service 接口
@ -18,44 +14,6 @@ import com.win.framework.common.pojo.PageResult;
*/
public interface CountadjustRecordDetailService {
/**
* 创建盘点调整记录子
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createCountadjustRecordDetail(@Valid CountadjustRecordDetailCreateReqVO createReqVO);
/**
* 更新盘点调整记录子
*
* @param updateReqVO 更新信息
*/
void updateCountadjustRecordDetail(@Valid CountadjustRecordDetailUpdateReqVO updateReqVO);
/**
* 删除盘点调整记录子
*
* @param id 编号
*/
void deleteCountadjustRecordDetail(Long id);
/**
* 获得盘点调整记录子
*
* @param id 编号
* @return 盘点调整记录子
*/
CountadjustRecordDetailDO getCountadjustRecordDetail(Long id);
/**
* 获得盘点调整记录子列表
*
* @param ids 编号
* @return 盘点调整记录子列表
*/
List<CountadjustRecordDetailDO> getCountadjustRecordDetailList(Collection<Long> ids);
/**
* 获得盘点调整记录子分页
*
@ -63,6 +21,7 @@ public interface CountadjustRecordDetailService {
* @return 盘点调整记录子分页
*/
PageResult<CountadjustRecordDetailDO> getCountadjustRecordDetailPage(CountadjustRecordDetailPageReqVO pageReqVO);
/**
* 获得用高级搜索盘点调整记录子分页列表
*
@ -72,11 +31,10 @@ public interface CountadjustRecordDetailService {
PageResult<CountadjustRecordDetailDO> getCountadjustRecordDetailSenior(CustomConditions conditions);
/**
* 获得盘点调整记录子列表, 用于 Excel 导出
*
* @param exportReqVO 查询条件
* @return 盘点调整记录子列表
* 根据主表id查询盘点调整记录
* @param masterId
* @return
*/
List<CountadjustRecordDetailDO> getCountadjustRecordDetailList(CountadjustRecordDetailExportReqVO exportReqVO);
List<CountadjustRecordDetailDO> selectList(Long masterId);
}

67
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordDetailServiceImpl.java

@ -1,24 +1,15 @@
package com.win.module.wms.service.countadjustRecord;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordDetailCreateReqVO;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordDetailExportReqVO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordDetailPageReqVO;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordDetailUpdateReqVO;
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.countadjustRecord.CountadjustRecordDetailDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.countadjustRecord.CountadjustRecordDetailConvert;
import com.win.module.wms.dal.mysql.countadjustRecord.CountadjustRecordDetailMapper;
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,59 +23,19 @@ public class CountadjustRecordDetailServiceImpl implements CountadjustRecordDeta
@Resource
private CountadjustRecordDetailMapper countadjustRecordDetailMapper;
@Override
public Long createCountadjustRecordDetail(CountadjustRecordDetailCreateReqVO createReqVO) {
// 插入
CountadjustRecordDetailDO countadjustRecordDetail = CountadjustRecordDetailConvert.INSTANCE.convert(createReqVO);
countadjustRecordDetailMapper.insert(countadjustRecordDetail);
// 返回
return countadjustRecordDetail.getId();
}
@Override
public void updateCountadjustRecordDetail(CountadjustRecordDetailUpdateReqVO updateReqVO) {
// 校验存在
validateCountadjustRecordDetailExists(updateReqVO.getId());
// 更新
CountadjustRecordDetailDO updateObj = CountadjustRecordDetailConvert.INSTANCE.convert(updateReqVO);
countadjustRecordDetailMapper.updateById(updateObj);
}
@Override
public void deleteCountadjustRecordDetail(Long id) {
// 校验存在
validateCountadjustRecordDetailExists(id);
// 删除
countadjustRecordDetailMapper.deleteById(id);
}
private void validateCountadjustRecordDetailExists(Long id) {
if (countadjustRecordDetailMapper.selectById(id) == null) {
throw exception(COUNTADJUST_RECORD_DETAIL_NOT_EXISTS);
}
}
@Override
public CountadjustRecordDetailDO getCountadjustRecordDetail(Long id) {
return countadjustRecordDetailMapper.selectById(id);
}
@Override
public List<CountadjustRecordDetailDO> getCountadjustRecordDetailList(Collection<Long> ids) {
return countadjustRecordDetailMapper.selectBatchIds(ids);
}
@Override
public PageResult<CountadjustRecordDetailDO> getCountadjustRecordDetailPage(CountadjustRecordDetailPageReqVO pageReqVO) {
return countadjustRecordDetailMapper.selectPage(pageReqVO);
}
@Override
public PageResult<CountadjustRecordDetailDO> getCountadjustRecordDetailSenior(CustomConditions conditions) {
return countadjustRecordDetailMapper.selectSenior(conditions);
}
@Override
public List<CountadjustRecordDetailDO> getCountadjustRecordDetailList(CountadjustRecordDetailExportReqVO exportReqVO) {
return countadjustRecordDetailMapper.selectList(exportReqVO);
public List<CountadjustRecordDetailDO> selectList(Long masterId) {
return countadjustRecordDetailMapper.selectList(masterId);
}
}

55
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordMainService.java

@ -1,15 +1,12 @@
package com.win.module.wms.service.countadjustRecord;
import java.util.*;
import javax.validation.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainCreateReqVO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainExportReqVO;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainPageReqVO;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainUpdateReqVO;
import com.win.module.wms.dal.dataobject.countadjustRecord.CountadjustRecordMainDO;
import com.win.framework.common.pojo.PageResult;
import java.util.List;
/**
* 盘点调整记录主 Service 接口
@ -18,44 +15,6 @@ import com.win.framework.common.pojo.PageResult;
*/
public interface CountadjustRecordMainService {
/**
* 创建盘点调整记录主
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createCountadjustRecordMain(@Valid CountadjustRecordMainCreateReqVO createReqVO);
/**
* 更新盘点调整记录主
*
* @param updateReqVO 更新信息
*/
void updateCountadjustRecordMain(@Valid CountadjustRecordMainUpdateReqVO updateReqVO);
/**
* 删除盘点调整记录主
*
* @param id 编号
*/
void deleteCountadjustRecordMain(Long id);
/**
* 获得盘点调整记录主
*
* @param id 编号
* @return 盘点调整记录主
*/
CountadjustRecordMainDO getCountadjustRecordMain(Long id);
/**
* 获得盘点调整记录主列表
*
* @param ids 编号
* @return 盘点调整记录主列表
*/
List<CountadjustRecordMainDO> getCountadjustRecordMainList(Collection<Long> ids);
/**
* 获得盘点调整记录主分页
*
@ -79,4 +38,12 @@ public interface CountadjustRecordMainService {
*/
List<CountadjustRecordMainDO> getCountadjustRecordMainList(CountadjustRecordMainExportReqVO exportReqVO);
/**
* 获得检验记录主列表, 用于 Excel 导出
*
* @param conditions 查询条件
* @return 检验记录主列表
*/
List<CountadjustRecordMainDO> getCountadjustRecordMainList(CustomConditions conditions);
}

65
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordMainServiceImpl.java

@ -1,24 +1,16 @@
package com.win.module.wms.service.countadjustRecord;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainCreateReqVO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainExportReqVO;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainPageReqVO;
import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainUpdateReqVO;
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.countadjustRecord.CountadjustRecordMainDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.countadjustRecord.CountadjustRecordMainConvert;
import com.win.module.wms.dal.mysql.countadjustRecord.CountadjustRecordMainMapper;
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,48 +24,6 @@ public class CountadjustRecordMainServiceImpl implements CountadjustRecordMainSe
@Resource
private CountadjustRecordMainMapper countadjustRecordMainMapper;
@Override
public Long createCountadjustRecordMain(CountadjustRecordMainCreateReqVO createReqVO) {
// 插入
CountadjustRecordMainDO countadjustRecordMain = CountadjustRecordMainConvert.INSTANCE.convert(createReqVO);
countadjustRecordMainMapper.insert(countadjustRecordMain);
// 返回
return countadjustRecordMain.getId();
}
@Override
public void updateCountadjustRecordMain(CountadjustRecordMainUpdateReqVO updateReqVO) {
// 校验存在
validateCountadjustRecordMainExists(updateReqVO.getId());
// 更新
CountadjustRecordMainDO updateObj = CountadjustRecordMainConvert.INSTANCE.convert(updateReqVO);
countadjustRecordMainMapper.updateById(updateObj);
}
@Override
public void deleteCountadjustRecordMain(Long id) {
// 校验存在
validateCountadjustRecordMainExists(id);
// 删除
countadjustRecordMainMapper.deleteById(id);
}
private void validateCountadjustRecordMainExists(Long id) {
if (countadjustRecordMainMapper.selectById(id) == null) {
throw exception(COUNTADJUST_RECORD_MAIN_NOT_EXISTS);
}
}
@Override
public CountadjustRecordMainDO getCountadjustRecordMain(Long id) {
return countadjustRecordMainMapper.selectById(id);
}
@Override
public List<CountadjustRecordMainDO> getCountadjustRecordMainList(Collection<Long> ids) {
return countadjustRecordMainMapper.selectBatchIds(ids);
}
@Override
public PageResult<CountadjustRecordMainDO> getCountadjustRecordMainPage(CountadjustRecordMainPageReqVO pageReqVO) {
return countadjustRecordMainMapper.selectPage(pageReqVO);
@ -87,4 +37,9 @@ public class CountadjustRecordMainServiceImpl implements CountadjustRecordMainSe
return countadjustRecordMainMapper.selectList(exportReqVO);
}
@Override
public List<CountadjustRecordMainDO> getCountadjustRecordMainList(CustomConditions conditions) {
return countadjustRecordMainMapper.selectSeniorList(conditions);
}
}

64
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestDetailService.java

@ -1,14 +1,11 @@
package com.win.module.wms.service.countadjustRequest;
import java.util.*;
import javax.validation.*;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestDetailCreateReqVO;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestDetailExportReqVO;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestDetailPageReqVO;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestDetailUpdateReqVO;
import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestDetailDO;
import com.win.framework.common.pojo.PageResult;
import java.util.List;
/**
* 盘点调整申请子 Service 接口
@ -17,44 +14,6 @@ import com.win.framework.common.pojo.PageResult;
*/
public interface CountadjustRequestDetailService {
/**
* 创建盘点调整申请子
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createCountadjustRequestDetail(@Valid CountadjustRequestDetailCreateReqVO createReqVO);
/**
* 更新盘点调整申请子
*
* @param updateReqVO 更新信息
*/
void updateCountadjustRequestDetail(@Valid CountadjustRequestDetailUpdateReqVO updateReqVO);
/**
* 删除盘点调整申请子
*
* @param id 编号
*/
void deleteCountadjustRequestDetail(Long id);
/**
* 获得盘点调整申请子
*
* @param id 编号
* @return 盘点调整申请子
*/
CountadjustRequestDetailDO getCountadjustRequestDetail(Long id);
/**
* 获得盘点调整申请子列表
*
* @param ids 编号
* @return 盘点调整申请子列表
*/
List<CountadjustRequestDetailDO> getCountadjustRequestDetailList(Collection<Long> ids);
/**
* 获得盘点调整申请子分页
*
@ -64,11 +23,18 @@ public interface CountadjustRequestDetailService {
PageResult<CountadjustRequestDetailDO> getCountadjustRequestDetailPage(CountadjustRequestDetailPageReqVO pageReqVO);
/**
* 获得盘点调整申请子列表, 用于 Excel 导出
* 获得用高级搜索盘点调整申请子分页列表
*
* @param exportReqVO 查询条件
* @return 盘点调整申请子列表
* @param conditions 分页排序和自定义条件
* @return 分页列表
*/
PageResult<CountadjustRequestDetailDO> getCountadjustRequestDetailSenior(CustomConditions conditions);
/**
* 根据主表id查询盘点调整申请
* @param masterId
* @return
*/
List<CountadjustRequestDetailDO> getCountadjustRequestDetailList(CountadjustRequestDetailExportReqVO exportReqVO);
List<CountadjustRequestDetailDO> selectList(Long masterId);
}

69
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestDetailServiceImpl.java

@ -1,23 +1,15 @@
package com.win.module.wms.service.countadjustRequest;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestDetailCreateReqVO;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestDetailExportReqVO;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestDetailPageReqVO;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestDetailUpdateReqVO;
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.countadjustRequest.CountadjustRequestDetailDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.countadjustRequest.CountadjustRequestDetailConvert;
import com.win.module.wms.dal.mysql.countadjustRequest.CountadjustRequestDetailMapper;
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 +24,18 @@ public class CountadjustRequestDetailServiceImpl implements CountadjustRequestDe
private CountadjustRequestDetailMapper countadjustRequestDetailMapper;
@Override
public Long createCountadjustRequestDetail(CountadjustRequestDetailCreateReqVO createReqVO) {
// 插入
CountadjustRequestDetailDO countadjustRequestDetail = CountadjustRequestDetailConvert.INSTANCE.convert(createReqVO);
countadjustRequestDetailMapper.insert(countadjustRequestDetail);
// 返回
return countadjustRequestDetail.getId();
}
@Override
public void updateCountadjustRequestDetail(CountadjustRequestDetailUpdateReqVO updateReqVO) {
// 校验存在
validateCountadjustRequestDetailExists(updateReqVO.getId());
// 更新
CountadjustRequestDetailDO updateObj = CountadjustRequestDetailConvert.INSTANCE.convert(updateReqVO);
countadjustRequestDetailMapper.updateById(updateObj);
}
@Override
public void deleteCountadjustRequestDetail(Long id) {
// 校验存在
validateCountadjustRequestDetailExists(id);
// 删除
countadjustRequestDetailMapper.deleteById(id);
}
private void validateCountadjustRequestDetailExists(Long id) {
if (countadjustRequestDetailMapper.selectById(id) == null) {
throw exception(COUNTADJUST_REQUEST_DETAIL_NOT_EXISTS);
}
}
@Override
public CountadjustRequestDetailDO getCountadjustRequestDetail(Long id) {
return countadjustRequestDetailMapper.selectById(id);
}
@Override
public List<CountadjustRequestDetailDO> getCountadjustRequestDetailList(Collection<Long> ids) {
return countadjustRequestDetailMapper.selectBatchIds(ids);
public PageResult<CountadjustRequestDetailDO> getCountadjustRequestDetailPage(CountadjustRequestDetailPageReqVO pageReqVO) {
return countadjustRequestDetailMapper.selectPage(pageReqVO);
}
@Override
public PageResult<CountadjustRequestDetailDO> getCountadjustRequestDetailPage(CountadjustRequestDetailPageReqVO pageReqVO) {
return countadjustRequestDetailMapper.selectPage(pageReqVO);
public PageResult<CountadjustRequestDetailDO> getCountadjustRequestDetailSenior(CustomConditions conditions) {
return countadjustRequestDetailMapper.selectSenior(conditions);
}
@Override
public List<CountadjustRequestDetailDO> getCountadjustRequestDetailList(CountadjustRequestDetailExportReqVO exportReqVO) {
return countadjustRequestDetailMapper.selectList(exportReqVO);
public List<CountadjustRequestDetailDO> selectList(Long masterId) {
return countadjustRequestDetailMapper.selectList(masterId);
}
}

55
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java

@ -1,15 +1,12 @@
package com.win.module.wms.service.countadjustRequest;
import java.util.*;
import javax.validation.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainCreateReqVO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainExportReqVO;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainPageReqVO;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainUpdateReqVO;
import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestMainDO;
import com.win.framework.common.pojo.PageResult;
import java.util.List;
/**
* 盘点调整申请主 Service 接口
@ -18,44 +15,6 @@ import com.win.framework.common.pojo.PageResult;
*/
public interface CountadjustRequestMainService {
/**
* 创建盘点调整申请主
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createCountadjustRequestMain(@Valid CountadjustRequestMainCreateReqVO createReqVO);
/**
* 更新盘点调整申请主
*
* @param updateReqVO 更新信息
*/
void updateCountadjustRequestMain(@Valid CountadjustRequestMainUpdateReqVO updateReqVO);
/**
* 删除盘点调整申请主
*
* @param id 编号
*/
void deleteCountadjustRequestMain(Long id);
/**
* 获得盘点调整申请主
*
* @param id 编号
* @return 盘点调整申请主
*/
CountadjustRequestMainDO getCountadjustRequestMain(Long id);
/**
* 获得盘点调整申请主列表
*
* @param ids 编号
* @return 盘点调整申请主列表
*/
List<CountadjustRequestMainDO> getCountadjustRequestMainList(Collection<Long> ids);
/**
* 获得盘点调整申请主分页
*
@ -79,4 +38,12 @@ public interface CountadjustRequestMainService {
*/
List<CountadjustRequestMainDO> getCountadjustRequestMainList(CountadjustRequestMainExportReqVO exportReqVO);
/**
* 获得盘点调整申请主列表, 用于 Excel 导出
*
* @param conditions 查询条件
* @return 盘点调整申请主列表
*/
List<CountadjustRequestMainDO> getCountadjustRequestMainList(CustomConditions conditions);
}

64
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java

@ -1,24 +1,16 @@
package com.win.module.wms.service.countadjustRequest;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainCreateReqVO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainExportReqVO;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainPageReqVO;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainUpdateReqVO;
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.countadjustRequest.CountadjustRequestMainDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.countadjustRequest.CountadjustRequestMainConvert;
import com.win.module.wms.dal.mysql.countadjustRequest.CountadjustRequestMainMapper;
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,47 +24,6 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain
@Resource
private CountadjustRequestMainMapper countadjustRequestMainMapper;
@Override
public Long createCountadjustRequestMain(CountadjustRequestMainCreateReqVO createReqVO) {
// 插入
CountadjustRequestMainDO countadjustRequestMain = CountadjustRequestMainConvert.INSTANCE.convert(createReqVO);
countadjustRequestMainMapper.insert(countadjustRequestMain);
// 返回
return countadjustRequestMain.getId();
}
@Override
public void updateCountadjustRequestMain(CountadjustRequestMainUpdateReqVO updateReqVO) {
// 校验存在
validateCountadjustRequestMainExists(updateReqVO.getId());
// 更新
CountadjustRequestMainDO updateObj = CountadjustRequestMainConvert.INSTANCE.convert(updateReqVO);
countadjustRequestMainMapper.updateById(updateObj);
}
@Override
public void deleteCountadjustRequestMain(Long id) {
// 校验存在
validateCountadjustRequestMainExists(id);
// 删除
countadjustRequestMainMapper.deleteById(id);
}
private void validateCountadjustRequestMainExists(Long id) {
if (countadjustRequestMainMapper.selectById(id) == null) {
throw exception(COUNTADJUST_REQUEST_MAIN_NOT_EXISTS);
}
}
@Override
public CountadjustRequestMainDO getCountadjustRequestMain(Long id) {
return countadjustRequestMainMapper.selectById(id);
}
@Override
public List<CountadjustRequestMainDO> getCountadjustRequestMainList(Collection<Long> ids) {
return countadjustRequestMainMapper.selectBatchIds(ids);
}
@Override
public PageResult<CountadjustRequestMainDO> getCountadjustRequestMainSenior(CustomConditions conditions) {
return countadjustRequestMainMapper.selectSenior(conditions);
@ -88,4 +39,9 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain
return countadjustRequestMainMapper.selectList(exportReqVO);
}
@Override
public List<CountadjustRequestMainDO> getCountadjustRequestMainList(CustomConditions conditions) {
return countadjustRequestMainMapper.selectSeniorList(conditions);
}
}

25
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainServiceImpl.java

@ -2,50 +2,45 @@ package com.win.module.wms.service.customerreceiptRequest;
import com.win.framework.common.exception.ServiceException;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.infra.api.trends.TrendsApi;
import com.win.module.infra.enums.TrendsTypeEnum;
import com.win.module.system.api.serialnumber.SerialNumberApi;
import com.win.module.system.enums.serialNumber.RuleCodeEnum;
import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordDetailCreateReqVO;
import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordMainCreateReqVO;
import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestMainCreateReqVO;
import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestMainExportReqVO;
import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestMainPageReqVO;
import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestMainUpdateReqVO;
import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordDetailCreateReqVO;
import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordMainCreateReqVO;
import com.win.module.wms.convert.customerreceiptRecord.CustomerreceiptRecordDetailConvert;
import com.win.module.wms.convert.customerreceiptRecord.CustomerreceiptRecordMainConvert;
import com.win.module.wms.convert.customerreceiptRequest.CustomerreceiptRequestDetailConvert;
import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestDetailConvert;
import com.win.module.wms.convert.customerreceiptRequest.CustomerreceiptRequestMainConvert;
import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
import com.win.module.wms.dal.dataobject.customerreceiptRequest.CustomerreceiptRequestMainDO;
import com.win.module.wms.dal.dataobject.customerreceiptRequest.CustomerreceiptRequestDetailDO;
import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO;
import com.win.module.wms.dal.dataobject.customerreceiptRequest.CustomerreceiptRequestMainDO;
import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
import com.win.module.wms.dal.mysql.customerreceiptRecord.CustomerreceiptRecordDetailMapper;
import com.win.module.wms.dal.mysql.customerreceiptRecord.CustomerreceiptRecordMainMapper;
import com.win.module.wms.dal.mysql.customerreceiptRequest.CustomerreceiptRequestDetailMapper;
import com.win.module.wms.dal.mysql.customerreceiptRequest.CustomerreceiptRequestMainMapper;
import com.win.module.wms.enums.request.RequestStatusEnum;
import com.win.module.wms.enums.request.RequestStatusState;
import com.win.module.wms.service.requestsetting.RequestsettingService;
import com.win.module.wms.util.JobUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.customerreceiptRequest.CustomerreceiptRequestMainConvert;
import com.win.module.wms.dal.mysql.customerreceiptRequest.CustomerreceiptRequestMainMapper;
import java.util.Collection;
import java.util.List;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.module.wms.enums.ErrorCodeConstants.*;
import static com.win.module.wms.enums.ErrorCodeConstants.CUSTOMERRECEIPT_REQUEST_CANNOT_SUBMIT;
/**
* 客户收货申请主 Service 实现类
@ -245,7 +240,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
// 校验存在
CustomerreceiptRequestMainDO mainDO = validateCustomerreceiptRequestMainExists(id);
RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());
boolean flag = requestStatusState.agree(mainDO.getAutoExecute());
boolean flag = requestStatusState.agree(mainDO.getAutoAgree());
if (!flag) {
throw new ServiceException(CUSTOMERRECEIPT_REQUEST_CANNOT_AGREE);
}

45
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java

@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.exceptions.UtilException;
import com.win.framework.common.exception.ServiceException;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.common.util.validation.ValidationUtils;
import com.win.module.infra.api.trends.TrendsApi;
import com.win.module.infra.enums.TrendsTypeEnum;
@ -19,49 +20,51 @@ import com.win.module.wms.convert.customerreturnJob.CustomerreturnJobDetailConve
import com.win.module.wms.convert.customerreturnJob.CustomerreturnJobMainConvert;
import com.win.module.wms.convert.customerreturnRecord.CustomerreturnRecordDetailConvert;
import com.win.module.wms.convert.customerreturnRecord.CustomerreturnRecordMainConvert;
import com.win.module.wms.convert.customerreturnRequest.CustomerreturnRequestDetailConvert;
import com.win.module.wms.convert.customerreturnRequest.CustomerreturnRequestMainConvert;
import com.win.module.wms.dal.dataobject.balance.BalanceDO;
import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobDetailDO;
import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO;
import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestDetailDO;
import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestMainDO;
import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordDetailDO;
import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordMainDO;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.jobsetting.JobsettingDO;
import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
import com.win.module.wms.dal.mysql.customerreturnJob.CustomerreturnJobDetailMapper;
import com.win.module.wms.dal.mysql.customerreturnJob.CustomerreturnJobMainMapper;
import com.win.module.wms.dal.mysql.customerreturnRecord.CustomerreturnRecordDetailMapper;
import com.win.module.wms.dal.mysql.customerreturnRecord.CustomerreturnRecordMainMapper;
import com.win.module.wms.dal.mysql.customerreturnRequest.CustomerreturnRequestDetailMapper;
import com.win.module.wms.dal.mysql.customerreturnRequest.CustomerreturnRequestMainMapper;
import com.win.module.wms.enums.job.JobStatusEnum;
import com.win.module.wms.enums.plan.PlanStatusEnum;
import com.win.module.wms.enums.request.RequestStatusEnum;
import com.win.module.wms.enums.request.RequestStatusState;
import com.win.module.wms.service.customerdock.CustomerdockService;
import com.win.module.wms.service.deliverRecord.*;
import com.win.module.wms.dal.mysql.customerreturnRequest.CustomerreturnRequestDetailMapper;
import com.win.module.wms.service.deliverRecord.DeliverRecordMainService;
import com.win.module.wms.service.expectin.ExpectinService;
import com.win.module.wms.service.itembasic.ItembasicService;
import com.win.module.wms.service.jobsetting.JobsettingService;
import com.win.module.wms.service.location.LocationService;
import com.win.module.wms.service.recordsetting.RecordsettingService;
import com.win.module.wms.service.requestsetting.*;
import com.win.module.wms.dal.dataobject.balance.BalanceDO;
import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
import com.win.module.wms.util.*;
import com.win.module.wms.service.location.*;
import com.win.module.wms.convert.customerreturnRequest.CustomerreturnRequestDetailConvert;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.service.itembasic.*;
import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestDetailDO;
import com.win.module.wms.service.requestsetting.RequestsettingService;
import com.win.module.wms.util.JobUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.validation.Validator;
import java.time.LocalDateTime;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import javax.validation.Validator;
import java.math.BigDecimal;
import java.util.*;
import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestMainDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.customerreturnRequest.CustomerreturnRequestMainConvert;
import com.win.module.wms.dal.mysql.customerreturnRequest.CustomerreturnRequestMainMapper;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static com.win.module.wms.enums.ErrorCodeConstants.*;
@ -514,7 +517,7 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque
// 校验存在
CustomerreturnRequestMainDO mainDO = validateCustomerreturnRequestMainExists(id);
RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());
boolean flag = requestStatusState.agree(mainDO.getAutoExecute());
boolean flag = requestStatusState.agree(mainDO.getAutoAgree());
if(!flag) {
throw new ServiceException(CUSTOMERRETURN_REQUEST_CANNOT_AGREE);
}

32
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java

@ -4,8 +4,8 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.exceptions.UtilException;
import com.win.framework.common.exception.ServiceException;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.common.util.validation.ValidationUtils;
import com.win.framework.dict.core.util.DictFrameworkUtils;
import com.win.module.infra.api.trends.TrendsApi;
import com.win.module.infra.enums.TrendsTypeEnum;
import com.win.module.system.api.serialnumber.SerialNumberApi;
@ -13,51 +13,39 @@ import com.win.module.system.enums.serialNumber.RuleCodeEnum;
import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordDetailCreateReqVO;
import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordMainCreateReqVO;
import com.win.module.wms.controller.customersettleRequest.vo.*;
import com.win.module.wms.controller.deliverRequest.vo.DeliverRequestDetailCreateReqVO;
import com.win.module.wms.controller.deliverRequest.vo.DeliverRequestMainCreateReqVO;
import com.win.module.wms.convert.customersettleRecord.CustomersettleRecordDetailConvert;
import com.win.module.wms.convert.customersettleRecord.CustomersettleRecordMainConvert;
import com.win.module.wms.convert.customersettleRequest.CustomersettleRequestDetailConvert;
import com.win.module.wms.convert.deliverRequest.DeliverRequestDetailConvert;
import com.win.module.wms.convert.customersettleRequest.CustomersettleRequestMainConvert;
import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestMainDO;
import com.win.module.wms.dal.dataobject.customersettleRecord.CustomersettleRecordMainDO;
import com.win.module.wms.dal.dataobject.customersettleRequest.CustomersettleRequestDetailDO;
import com.win.module.wms.dal.dataobject.customersettleRequest.CustomersettleRequestMainDO;
import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordDetailDO;
import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordMainDO;
import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestDetailDO;
import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestMainDO;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.purchasereturnRequest.PurchasereturnRequestMainDO;
import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
import com.win.module.wms.dal.mysql.customersettleRecord.CustomersettleRecordDetailMapper;
import com.win.module.wms.dal.mysql.customersettleRecord.CustomersettleRecordMainMapper;
import com.win.module.wms.dal.mysql.customersettleRequest.CustomersettleRequestDetailMapper;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.dal.mysql.customersettleRequest.CustomersettleRequestMainMapper;
import com.win.module.wms.enums.request.RequestStatusEnum;
import com.win.module.wms.enums.request.RequestStatusState;
import com.win.module.wms.service.customersettleRecord.CustomersettleRecordMainService;
import com.win.module.wms.service.deliverRecord.DeliverRecordMainService;
import com.win.module.wms.service.requestsetting.RequestsettingService;
import com.win.module.wms.util.JobUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.validation.Validator;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import javax.validation.Validator;
import java.time.LocalDateTime;
import java.util.*;
import com.win.module.wms.dal.dataobject.customersettleRequest.CustomersettleRequestMainDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.customersettleRequest.CustomersettleRequestMainConvert;
import com.win.module.wms.dal.mysql.customersettleRequest.CustomersettleRequestMainMapper;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.module.wms.enums.ErrorCodeConstants.*;
@ -217,7 +205,7 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque
// 校验存在
CustomersettleRequestMainDO mainDO = validateCustomersettleRequestMainExists(id);
RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());
boolean flag = requestStatusState.agree(mainDO.getAutoExecute());
boolean flag = requestStatusState.agree(mainDO.getAutoAgree());
if(!flag) {
throw new ServiceException(CUSTOMERSETTLE_REQUEST_CANNOT_AGREE);
}

31
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java

@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.exceptions.UtilException;
import com.win.framework.common.exception.ServiceException;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.common.util.validation.ValidationUtils;
import com.win.framework.dict.core.util.DictFrameworkUtils;
import com.win.module.infra.api.trends.TrendsApi;
@ -15,18 +16,19 @@ import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.enums.serialNumber.RuleCodeEnum;
import com.win.module.wms.controller.deliverRequest.vo.*;
import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO;
import com.win.module.wms.convert.deliverRequest.DeliverRequestDetailConvert;
import com.win.module.wms.convert.deliverJob.DeliverJobMainConvert;
import com.win.module.wms.convert.deliverRequest.DeliverRequestDetailConvert;
import com.win.module.wms.convert.deliverRequest.DeliverRequestMainConvert;
import com.win.module.wms.dal.dataobject.balance.BalanceDO;
import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
import com.win.module.wms.dal.dataobject.customerdock.CustomerdockDO;
import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobDetailDO;
import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobMainDO;
import com.win.module.wms.dal.dataobject.deliverPlan.DeliverPlanDetailDO;
import com.win.module.wms.dal.dataobject.deliverPlan.DeliverPlanMainDO;
import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestDetailDO;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestMainDO;
import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobDetailDO;
import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobMainDO;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.jobsetting.JobsettingDO;
import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
import com.win.module.wms.dal.dataobject.sale.SaleDetailDO;
@ -35,13 +37,15 @@ import com.win.module.wms.dal.mysql.customerreturnJob.CustomerreturnJobDetailMap
import com.win.module.wms.dal.mysql.deliverJob.DeliverJobDetailMapper;
import com.win.module.wms.dal.mysql.deliverJob.DeliverJobMainMapper;
import com.win.module.wms.dal.mysql.deliverRequest.DeliverRequestDetailMapper;
import com.win.module.wms.dal.mysql.deliverRequest.DeliverRequestMainMapper;
import com.win.module.wms.dal.mysql.expectout.ExpectoutMapper;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.enums.job.JobStatusEnum;
import com.win.module.wms.enums.request.RequestStatusEnum;
import com.win.module.wms.enums.request.RequestStatusState;
import com.win.module.wms.service.customer.*;
import com.win.module.wms.service.customerdock.*;
import com.win.module.wms.service.customer.CustomerService;
import com.win.module.wms.service.customerdock.CustomerdockService;
import com.win.module.wms.service.deliverJob.DeliverJobMainService;
import com.win.module.wms.service.deliverPlan.DeliverPlanDetailService;
import com.win.module.wms.service.deliverPlan.DeliverPlanMainService;
import com.win.module.wms.service.expectout.ExpectoutService;
@ -52,20 +56,19 @@ import com.win.module.wms.service.rule.RuleService;
import com.win.module.wms.util.JobUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.validation.Validator;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import javax.validation.Validator;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.deliverRequest.DeliverRequestMainConvert;
import com.win.module.wms.dal.mysql.deliverRequest.DeliverRequestMainMapper;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.module.wms.enums.ErrorCodeConstants.*;
import com.win.module.wms.service.deliverJob.*;
/**
* 发货申请主 Service 实现类
@ -285,7 +288,7 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService
// 校验存在
DeliverRequestMainDO mainDO = validateDeliverRequestMainExists(id);
RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());
boolean flag = requestStatusState.agree(mainDO.getAutoExecute());
boolean flag = requestStatusState.agree(mainDO.getAutoAgree());
if(!flag) {
throw new ServiceException(DELIVER_REQUEST_CANNOT_AGREE);
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java

@ -301,7 +301,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
// 校验存在
InspectRequestMainDO mainDO = validateInspectRequestMainExists(id);
RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());
boolean flag = requestStatusState.agree(mainDO.getAutoExecute());
boolean flag = requestStatusState.agree(mainDO.getAutoAgree());
if(!flag) {
throw new ServiceException(INSPECT_REQUEST_CANNOT_AGREE);
}

39
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainServiceImpl.java

@ -2,6 +2,8 @@ package com.win.module.wms.service.inventoryinitRequest;
import cn.hutool.core.collection.CollUtil;
import com.win.framework.common.exception.ServiceException;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.common.util.validation.ValidationUtils;
import com.win.module.infra.api.trends.TrendsApi;
import com.win.module.infra.enums.TrendsTypeEnum;
@ -9,43 +11,46 @@ import com.win.module.system.api.serialnumber.SerialNumberApi;
import com.win.module.system.enums.serialNumber.RuleCodeEnum;
import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordDetailCreateReqVO;
import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordMainCreateReqVO;
import com.win.module.wms.controller.inventoryinitRequest.vo.*;
import com.win.module.wms.convert.inventoryinitRecord.InventoryinitRecordDetailConvert;
import com.win.module.wms.convert.inventoryinitRecord.InventoryinitRecordMainConvert;
import com.win.module.wms.dal.dataobject.inventoryinitRecord.InventoryinitRecordDetailDO;
import com.win.module.wms.dal.dataobject.inventoryinitRecord.InventoryinitRecordMainDO;
import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
import com.win.module.wms.enums.request.RequestStatusEnum;
import com.win.module.wms.enums.request.RequestStatusState;
import com.win.module.wms.util.*;
import com.win.module.wms.service.requestsetting.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.inventoryinitRequest.vo.*;
import com.win.module.wms.convert.inventoryinitRequest.InventoryinitRequestDetailConvert;
import com.win.module.wms.convert.inventoryinitRequest.InventoryinitRequestMainConvert;
import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
import com.win.module.wms.dal.dataobject.inventoryinitRecord.InventoryinitRecordDetailDO;
import com.win.module.wms.dal.dataobject.inventoryinitRecord.InventoryinitRecordMainDO;
import com.win.module.wms.dal.dataobject.inventoryinitRequest.InventoryinitRequestDetailDO;
import com.win.module.wms.dal.dataobject.inventoryinitRequest.InventoryinitRequestMainDO;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO;
import com.win.module.wms.dal.dataobject.location.LocationDO;
import com.win.module.wms.dal.mysql.inventoryinitRecord.*;
import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
import com.win.module.wms.dal.mysql.inventoryinitRecord.InventoryinitRecordDetailMapper;
import com.win.module.wms.dal.mysql.inventoryinitRecord.InventoryinitRecordMainMapper;
import com.win.module.wms.dal.mysql.inventoryinitRequest.InventoryinitRequestDetailMapper;
import com.win.module.wms.dal.mysql.inventoryinitRequest.InventoryinitRequestMainMapper;
import com.win.module.wms.enums.request.RequestStatusEnum;
import com.win.module.wms.enums.request.RequestStatusState;
import com.win.module.wms.service.itembasic.ItembasicService;
import com.win.module.wms.service.itempackaging.ItempackagingService;
import com.win.module.wms.service.location.LocationService;
import com.win.module.wms.service.recordsetting.RecordsettingService;
import com.win.module.wms.service.requestsetting.RequestsettingService;
import com.win.module.wms.util.JobUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import javax.validation.Validator;
import java.time.LocalDateTime;
import java.util.*;
import com.win.module.wms.service.itembasic.*;
import com.win.module.wms.service.location.*;
import com.win.module.wms.service.itempackaging.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.module.wms.enums.ErrorCodeConstants.*;
import com.win.module.wms.service.recordsetting.*;
/**
* 库存初始化申请主 Service 实现类
@ -462,7 +467,7 @@ public class InventoryinitRequestMainServiceImpl implements InventoryinitRequest
// 校验存在
InventoryinitRequestMainDO mainDO = valiteInventoryinitRequestMainExists(id);
RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());
boolean flag = requestStatusState.agree(mainDO.getAutoExecute());
boolean flag = requestStatusState.agree(mainDO.getAutoAgree());
if(!flag) {
throw new ServiceException(INVENTORYINIT_REQUEST_CANNOT_AGREE);
}

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

@ -414,9 +414,9 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
list.add(purchasereceiptRecordDetailDO);
listMap.put(key, list);
}
List<InspectRequestDetailCreateReqVO> inspectRequestDetailCreateReqVOList = new ArrayList<>();
//组装到货检验数据
for(String mapKey : listMap.keySet()) {
List<InspectRequestDetailCreateReqVO> inspectRequestDetailCreateReqVOList = new ArrayList<>();
List<PurchasereceiptRecordDetailDO> purchasereceiptRecordDetailDOList1 = listMap.get(mapKey);
//创建主表信息
PurchasereceiptRecordDetailDO recordDetailDO = purchasereceiptRecordDetailDOList1.get(0);
@ -426,7 +426,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
inspectRequestMainCreateReqVO.setPurchaseReceiptRecordNumber(number);
inspectRequestMainCreateReqVO.setSupplierCode(purchasereceiptRecordMainDO.getSupplierCode());
inspectRequestMainCreateReqVO.setItemCode(recordDetailDO.getItemCode());
inspectRequestMainCreateReqVO.setBatch(recordDetailDO.getFromBatch());
inspectRequestMainCreateReqVO.setBatch(recordDetailDO.getToBatch());
inspectRequestMainCreateReqVO.setPoNumber(recordDetailDO.getPoNumber());
inspectRequestMainCreateReqVO.setPoLine(recordDetailDO.getPoLine());
inspectRequestMainCreateReqVO.setUom(recordDetailDO.getUom());

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java

@ -340,7 +340,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
// 校验存在
PurchasereceiptRequestMainDO mainDO = validatePurchasereceiptRequestMainExists(id);
RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());
boolean flag = requestStatusState.agree(mainDO.getAutoExecute());
boolean flag = requestStatusState.agree(mainDO.getAutoAgree());
if(!flag) {
throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_AGREE);
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java

@ -289,7 +289,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
// 校验存在
PurchasereturnRequestMainDO mainDO = validatePurchasereturnRequestMainExists(id);
RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());
boolean flag = requestStatusState.agree(mainDO.getAutoExecute());
boolean flag = requestStatusState.agree(mainDO.getAutoAgree());
if (!flag) {
throw new ServiceException(PURCHASERETURN_REQUEST_CANNOT_AGREE);
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java

@ -268,7 +268,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
// 校验存在
PutawayRequestMainDO mainDO = validatePutawayRequestMainExists(id);
RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());
boolean flag = requestStatusState.agree(mainDO.getAutoExecute());
boolean flag = requestStatusState.agree(mainDO.getAutoAgree());
if(!flag) {
throw new ServiceException(PUTAWAY_REQUEST_CANNOT_AGREE);
}

6
win-server/src/main/resources/application-test.yaml

@ -1,5 +1,5 @@
server:
port: 25110
port: 25100
--- #################### 数据库相关配置 ####################
@ -175,7 +175,7 @@ logging:
file:
path: logs
level:
com.win: info
com.win: debug
org.springframework: warn
--- #################### 闻荫相关配置 ####################
@ -188,5 +188,5 @@ win:
- ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求
demo: false # 开启演示模式
security:
mock-enable: false # 是否开启 Token 的模拟机制
mock-enable: true # 是否开启 Token 的模拟机制
mock-secret: test # Token 模拟机制的 Token 前缀
Loading…
Cancel
Save