From 78817367d4309d0ec8f0069e4721d466f4c0dbfb Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Wed, 6 Dec 2023 13:47:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=94=B3=E8=AF=B7=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CountadjustRecordDetailController.java | 94 ++---------- .../CountadjustRecordMainController.java | 141 +++++++++-------- .../CountadjustRecordDetailExportReqVO.java | 11 +- .../vo/CountadjustRecordDetailPageReqVO.java | 13 +- .../vo/CountadjustRecordMainExcelVO.java | 76 ++++++++-- .../CountadjustRequestDetailController.java | 98 +++--------- .../CountadjustRequestMainController.java | 142 +++++++++--------- .../CountadjustRequestDetailExportReqVO.java | 3 + .../vo/CountadjustRequestDetailPageReqVO.java | 3 + .../vo/CountadjustRequestMainExcelVO.java | 83 ++++++++-- .../CountadjustRecordMainConvert.java | 20 ++- .../CountadjustRequestMainConvert.java | 20 ++- .../CountadjustRecordDetailMapper.java | 15 +- .../CountadjustRecordMainMapper.java | 11 +- .../CountadjustRequestDetailMapper.java | 12 ++ .../CountadjustRequestMainMapper.java | 14 +- .../CountRequestMainServiceImpl.java | 2 +- .../CountadjustRecordDetailService.java | 58 +------ .../CountadjustRecordDetailServiceImpl.java | 67 ++------- .../CountadjustRecordMainService.java | 55 ++----- .../CountadjustRecordMainServiceImpl.java | 65 ++------ .../CountadjustRequestDetailService.java | 64 ++------ .../CountadjustRequestDetailServiceImpl.java | 69 ++------- .../CountadjustRequestMainService.java | 55 ++----- .../CountadjustRequestMainServiceImpl.java | 64 ++------ ...CustomerreceiptRequestMainServiceImpl.java | 25 ++- .../CustomerreturnRequestMainServiceImpl.java | 45 +++--- .../CustomersettleRequestMainServiceImpl.java | 32 ++-- .../DeliverRequestMainServiceImpl.java | 31 ++-- .../InspectRequestMainServiceImpl.java | 2 +- .../InventoryinitRequestMainServiceImpl.java | 39 ++--- .../PurchasereceiptJobMainServiceImpl.java | 4 +- ...PurchasereceiptRequestMainServiceImpl.java | 2 +- .../PurchasereturnRequestMainServiceImpl.java | 2 +- .../PutawayRequestMainServiceImpl.java | 2 +- .../src/main/resources/application-test.yaml | 6 +- 36 files changed, 579 insertions(+), 866 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordDetailController.java index 4d9ebf18..b6e18159 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordDetailController.java +++ b/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 createCountadjustRecordDetail(@Valid @RequestBody CountadjustRecordDetailCreateReqVO createReqVO) { - return success(countadjustRecordDetailService.createCountadjustRecordDetail(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新盘点调整记录子") - @PreAuthorize("@ss.hasPermission('wms:countadjust-record-detail:update')") - public CommonResult 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 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 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> getCountadjustRecordDetailList(@RequestParam("ids") Collection ids) { - List 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 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 list = countadjustRecordDetailService.getCountadjustRecordDetailList(exportReqVO); - // 导出 Excel - List 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); - } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordMainController.java index e38ede95..46da90cf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordMainController.java +++ b/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 createCountadjustRecordMain(@Valid @RequestBody CountadjustRecordMainCreateReqVO createReqVO) { - return success(countadjustRecordMainService.createCountadjustRecordMain(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新盘点调整记录主") - @PreAuthorize("@ss.hasPermission('wms:countadjust-record-main:update')") - public CommonResult 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 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 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> getCountadjustRecordMainList(@RequestParam("ids") Collection ids) { - List 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 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 list = countadjustRecordMainService.getCountadjustRecordMainList(exportReqVO); - // 导出 Excel - List datas = CountadjustRecordMainConvert.INSTANCE.convertList02(list); - for(CountadjustRecordMainExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); + Map mapDropDown = new HashMap<>(); + List 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 list = countadjustRecordMainService.getCountadjustRecordMainList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "检验记录主.xls", "检验记录数据", CountadjustRecordMainExcelVO.class, resultList, mapDropDown); + } + + private List getExcelVo(List list, Map 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 resultList = new ArrayList<>(); + // 导出 + for(CountadjustRecordMainDO mainDO : list) { + List 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; } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailExportReqVO.java index f804c276..59b54ed5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailExportReqVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailPageReqVO.java index bde35031..f0cb5403 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailPageReqVO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordMainExcelVO.java index 495164e2..e8e6c521 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordMainExcelVO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestDetailController.java index 6a736028..9d48a148 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestDetailController.java +++ b/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 createCountadjustRequestDetail(@Valid @RequestBody CountadjustRequestDetailCreateReqVO createReqVO) { - return success(countadjustRequestDetailService.createCountadjustRequestDetail(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新盘点调整申请子") - @PreAuthorize("@ss.hasPermission('wms:countadjust-request-detail:update')") - public CommonResult 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 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 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> getCountadjustRequestDetailList(@RequestParam("ids") Collection ids) { - List 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 list = countadjustRequestDetailService.getCountadjustRequestDetailList(exportReqVO); - // 导出 Excel - List datas = CountadjustRequestDetailConvert.INSTANCE.convertList02(list); - for(CountadjustRequestDetailExcelVO vo : datas) { + @PostMapping("/senior") + @Operation(summary = "高级搜索获得盘点调整申请子分页") + @PreAuthorize("@ss.hasPermission('wms:countadjust-request-detail:query')") + public CommonResult> getCountadjustRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = countadjustRequestDetailService.getCountadjustRequestDetailSenior(conditions); + PageResult 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); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java index e2bb80f3..2b351b13 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java +++ b/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 createCountadjustRequestMain(@Valid @RequestBody CountadjustRequestMainCreateReqVO createReqVO) { - return success(countadjustRequestMainService.createCountadjustRequestMain(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新盘点调整申请主") - @PreAuthorize("@ss.hasPermission('wms:countadjust-request-main:update')") - public CommonResult 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 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 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> getCountadjustRequestMainList(@RequestParam("ids") Collection ids) { - List 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 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 list = countadjustRequestMainService.getCountadjustRequestMainList(exportReqVO); - // 导出 Excel - List datas = CountadjustRequestMainConvert.INSTANCE.convertList02(list); - for(CountadjustRequestMainExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); + Map mapDropDown = new HashMap<>(); + List 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 list = countadjustRequestMainService.getCountadjustRequestMainList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "盘点调整申请主.xls", "盘点调整数据", CountadjustRequestMainExcelVO.class, resultList, mapDropDown); + } + + private List getExcelVo(List list, Map 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 resultList = new ArrayList<>(); + // 导出 + for(CountadjustRequestMainDO mainDO : list) { + List 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; } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailExportReqVO.java index dd9ae091..dc61fd92 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailExportReqVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailPageReqVO.java index f0073d59..731b7456 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailPageReqVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestMainExcelVO.java index 225f8000..e4611ad2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestMainExcelVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countadjustRecord/CountadjustRecordMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countadjustRecord/CountadjustRecordMainConvert.java index 39dc6c6a..a738ab5f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countadjustRecord/CountadjustRecordMainConvert.java +++ b/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 convertList02(List 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); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countadjustRequest/CountadjustRequestMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countadjustRequest/CountadjustRequestMainConvert.java index 5936113e..baaffe82 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countadjustRequest/CountadjustRequestMainConvert.java +++ b/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 convertList02(List 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); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordDetailMapper.java index f29a4651..0473a1d3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordDetailMapper.java +++ b/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 selectPage(CountadjustRecordDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .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 selectSenior(CustomConditions conditions) { return selectPage(conditions, QueryWrapperUtils.structure(conditions)); } + default List selectList(CountadjustRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .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 selectList(Long masterId) { + return selectList(new LambdaQueryWrapperX() + .eq(CountadjustRecordDetailDO::getMasterId, masterId)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordMainMapper.java index 13844368..88f82bab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordMainMapper.java +++ b/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 selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRequest/CountadjustRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRequest/CountadjustRequestDetailMapper.java index cb664cab..7237b8d7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRequest/CountadjustRequestDetailMapper.java +++ b/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 selectPage(CountadjustRequestDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .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 selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CountadjustRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .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 selectList(Long masterId) { + return selectList(new LambdaQueryWrapperX() + .eq(CountadjustRequestDetailDO::getMasterId, masterId)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRequest/CountadjustRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRequest/CountadjustRequestMainMapper.java index 051ffd7a..a98bc598 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRequest/CountadjustRequestMainMapper.java +++ b/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 selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } + + default CountadjustRequestMainDO selectByNumber(String number) { + return selectOne(CountadjustRequestMainDO::getNumber, number); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java index 74dd3af3..96bb4e6d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java +++ b/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); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordDetailService.java index 4c4179ca..ec4d1762 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordDetailService.java +++ b/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 getCountadjustRecordDetailList(Collection ids); - /** * 获得盘点调整记录子分页 * @@ -63,6 +21,7 @@ public interface CountadjustRecordDetailService { * @return 盘点调整记录子分页 */ PageResult getCountadjustRecordDetailPage(CountadjustRecordDetailPageReqVO pageReqVO); + /** * 获得用高级搜索盘点调整记录子分页列表 * @@ -72,11 +31,10 @@ public interface CountadjustRecordDetailService { PageResult getCountadjustRecordDetailSenior(CustomConditions conditions); /** - * 获得盘点调整记录子列表, 用于 Excel 导出 - * - * @param exportReqVO 查询条件 - * @return 盘点调整记录子列表 + * 根据主表id查询盘点调整记录 + * @param masterId + * @return */ - List getCountadjustRecordDetailList(CountadjustRecordDetailExportReqVO exportReqVO); + List selectList(Long masterId); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordDetailServiceImpl.java index 082cdf0e..6355c587 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordDetailServiceImpl.java +++ b/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 getCountadjustRecordDetailList(Collection ids) { - return countadjustRecordDetailMapper.selectBatchIds(ids); - } - @Override public PageResult getCountadjustRecordDetailPage(CountadjustRecordDetailPageReqVO pageReqVO) { return countadjustRecordDetailMapper.selectPage(pageReqVO); } + @Override public PageResult getCountadjustRecordDetailSenior(CustomConditions conditions) { return countadjustRecordDetailMapper.selectSenior(conditions); } + @Override - public List getCountadjustRecordDetailList(CountadjustRecordDetailExportReqVO exportReqVO) { - return countadjustRecordDetailMapper.selectList(exportReqVO); + public List selectList(Long masterId) { + return countadjustRecordDetailMapper.selectList(masterId); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordMainService.java index 506906b8..f441c873 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordMainService.java +++ b/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 getCountadjustRecordMainList(Collection ids); - /** * 获得盘点调整记录主分页 * @@ -79,4 +38,12 @@ public interface CountadjustRecordMainService { */ List getCountadjustRecordMainList(CountadjustRecordMainExportReqVO exportReqVO); + /** + * 获得检验记录主列表, 用于 Excel 导出 + * + * @param conditions 查询条件 + * @return 检验记录主列表 + */ + List getCountadjustRecordMainList(CustomConditions conditions); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordMainServiceImpl.java index e1bfcaed..b0988d5d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRecord/CountadjustRecordMainServiceImpl.java +++ b/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 getCountadjustRecordMainList(Collection ids) { - return countadjustRecordMainMapper.selectBatchIds(ids); - } - @Override public PageResult getCountadjustRecordMainPage(CountadjustRecordMainPageReqVO pageReqVO) { return countadjustRecordMainMapper.selectPage(pageReqVO); @@ -87,4 +37,9 @@ public class CountadjustRecordMainServiceImpl implements CountadjustRecordMainSe return countadjustRecordMainMapper.selectList(exportReqVO); } + @Override + public List getCountadjustRecordMainList(CustomConditions conditions) { + return countadjustRecordMainMapper.selectSeniorList(conditions); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestDetailService.java index e2b89bb4..04019973 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestDetailService.java +++ b/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 getCountadjustRequestDetailList(Collection ids); - /** * 获得盘点调整申请子分页 * @@ -64,11 +23,18 @@ public interface CountadjustRequestDetailService { PageResult getCountadjustRequestDetailPage(CountadjustRequestDetailPageReqVO pageReqVO); /** - * 获得盘点调整申请子列表, 用于 Excel 导出 + * 获得用高级搜索盘点调整申请子分页列表 * - * @param exportReqVO 查询条件 - * @return 盘点调整申请子列表 + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCountadjustRequestDetailSenior(CustomConditions conditions); + + /** + * 根据主表id查询盘点调整申请 + * @param masterId + * @return */ - List getCountadjustRequestDetailList(CountadjustRequestDetailExportReqVO exportReqVO); + List selectList(Long masterId); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestDetailServiceImpl.java index e0521bf5..4a02f2fc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestDetailServiceImpl.java +++ b/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 getCountadjustRequestDetailList(Collection ids) { - return countadjustRequestDetailMapper.selectBatchIds(ids); + public PageResult getCountadjustRequestDetailPage(CountadjustRequestDetailPageReqVO pageReqVO) { + return countadjustRequestDetailMapper.selectPage(pageReqVO); } @Override - public PageResult getCountadjustRequestDetailPage(CountadjustRequestDetailPageReqVO pageReqVO) { - return countadjustRequestDetailMapper.selectPage(pageReqVO); + public PageResult getCountadjustRequestDetailSenior(CustomConditions conditions) { + return countadjustRequestDetailMapper.selectSenior(conditions); } @Override - public List getCountadjustRequestDetailList(CountadjustRequestDetailExportReqVO exportReqVO) { - return countadjustRequestDetailMapper.selectList(exportReqVO); + public List selectList(Long masterId) { + return countadjustRequestDetailMapper.selectList(masterId); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java index 1562f7fd..8bc3c5eb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java +++ b/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 getCountadjustRequestMainList(Collection ids); - /** * 获得盘点调整申请主分页 * @@ -79,4 +38,12 @@ public interface CountadjustRequestMainService { */ List getCountadjustRequestMainList(CountadjustRequestMainExportReqVO exportReqVO); + /** + * 获得盘点调整申请主列表, 用于 Excel 导出 + * + * @param conditions 查询条件 + * @return 盘点调整申请主列表 + */ + List getCountadjustRequestMainList(CustomConditions conditions); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java index 67b29a2d..3673d08e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java +++ b/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 getCountadjustRequestMainList(Collection ids) { - return countadjustRequestMainMapper.selectBatchIds(ids); - } @Override public PageResult getCountadjustRequestMainSenior(CustomConditions conditions) { return countadjustRequestMainMapper.selectSenior(conditions); @@ -88,4 +39,9 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain return countadjustRequestMainMapper.selectList(exportReqVO); } + @Override + public List getCountadjustRequestMainList(CustomConditions conditions) { + return countadjustRequestMainMapper.selectSeniorList(conditions); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainServiceImpl.java index 9f47450b..dfef8fbe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainServiceImpl.java +++ b/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); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java index 051cdf46..50e9f50b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java +++ b/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); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java index 45d4b976..26d4d6d2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java +++ b/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); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java index 11a06632..505f089c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java +++ b/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); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java index 6cdccb8d..e33b76e2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java +++ b/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); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainServiceImpl.java index 63877a3e..ef0bf52c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainServiceImpl.java +++ b/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); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java index bec5aa1c..d9702b7b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java +++ b/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 inspectRequestDetailCreateReqVOList = new ArrayList<>(); //组装到货检验数据 for(String mapKey : listMap.keySet()) { + List inspectRequestDetailCreateReqVOList = new ArrayList<>(); List 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()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java index f26a94fe..e8f12f15 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java +++ b/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); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java index 4269bd7a..1ecffcf0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java @@ -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); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java index e880717e..b6492242 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java +++ b/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); } diff --git a/win-server/src/main/resources/application-test.yaml b/win-server/src/main/resources/application-test.yaml index b949e29d..e50e60d5 100644 --- a/win-server/src/main/resources/application-test.yaml +++ b/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 前缀 \ No newline at end of file