From 42ffdefff7dc4bbd6396fd94e9d12dc698d18af8 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Fri, 10 Nov 2023 17:18:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wms/enums/DictTypeConstants.java | 2 +- .../PurchasereceiptJobMainController.java | 26 ++- ...PurchasereceiptRecordDetailController.java | 87 +++------- .../PurchasereceiptRecordMainController.java | 139 ++++++++-------- ...urchasereceiptRecordDetailExportReqVO.java | 11 +- .../PurchasereceiptRecordDetailPageReqVO.java | 14 +- .../vo/PurchasereceiptRecordMainExcelVO.java | 157 +++++++++++++++--- .../PurchasereceiptRequestMainController.java | 26 ++- .../PurchasereceiptRecordMainConvert.java | 23 ++- .../PurchasereceiptJobDetailMapper.java | 36 ---- .../PurchasereceiptJobMainMapper.java | 4 + .../PurchasereceiptRecordDetailMapper.java | 58 +------ .../PurchasereceiptRecordMainMapper.java | 10 +- .../PurchasereceiptRequestMainMapper.java | 4 + .../PurchasereceiptJobDetailService.java | 9 - .../PurchasereceiptJobDetailServiceImpl.java | 6 - .../PurchasereceiptJobMainService.java | 8 + .../PurchasereceiptJobMainServiceImpl.java | 5 + .../PurchasereceiptRecordDetailService.java | 19 +-- ...urchasereceiptRecordDetailServiceImpl.java | 22 ++- .../PurchasereceiptRecordMainService.java | 17 +- .../PurchasereceiptRecordMainServiceImpl.java | 23 ++- .../PurchasereceiptRequestMainService.java | 7 + ...PurchasereceiptRequestMainServiceImpl.java | 5 + 24 files changed, 395 insertions(+), 323 deletions(-) diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java index 5d222b21..d4041077 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java @@ -69,5 +69,5 @@ public interface DictTypeConstants { String PURCHASE_RETURN_REASON = "purchase_return_reason";//原因 String TRANSFER_MODE = "transfer_mode";//运输方式 - + String FAILED_REASON = "failed_reason";//采购收货不合格原因 } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java index 9d128f4d..7aeb490c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java @@ -61,7 +61,7 @@ public class PurchasereceiptJobMainController { } @Operation(summary = "取消承接任务") - @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:cancelAccept')") + @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:cancel-accept')") @PostMapping(value = "/cancelAccept/{id}") public CommonResult cancelAccept(@PathVariable("id") Long id) { int result = purchasereceiptJobMainService.cancelAccept(id); @@ -103,8 +103,24 @@ public class PurchasereceiptJobMainController { public void exportPurchasereceiptJobMainExcel(@Valid PurchasereceiptJobMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = purchasereceiptJobMainService.getPurchasereceiptJobMainList(exportReqVO); - //组装vo Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "采购收货任务主.xlsx", "数据", PurchasereceiptJobMainExcelVO.class, resultList, mapDropDown); + } + + @GetMapping("/export-excel-senior") + @Operation(summary = "导出采购收货任务主 Excel") + @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:export')") + @OperateLog(type = EXPORT) + public void exportPurchasereceiptJobMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = purchasereceiptJobMainService.getPurchasereceiptJobMainList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "采购收货任务主.xlsx", "数据", PurchasereceiptJobMainExcelVO.class, resultList, mapDropDown); + } + + private List getExcelVo(List list, Map mapDropDown) { + //组装vo String[] transferMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRANSFER_MODE); mapDropDown.put(6, transferMode); String[] status = JobStatusEnum.getStatusNameArray(); @@ -139,7 +155,7 @@ public class PurchasereceiptJobMainController { resultList.add(vo); } } - ExcelUtils.write(response, "采购收货任务主.xlsx", "数据", PurchasereceiptJobMainExcelVO.class, resultList, mapDropDown); + return resultList; } @GetMapping("/getPurchasereceiptJobyId") @@ -152,9 +168,7 @@ public class PurchasereceiptJobMainController { if(result==null) { return success(result); }; - PurchasereceiptJobDetailExportReqVO purchasereceiptJobDetailExportReqVO = new PurchasereceiptJobDetailExportReqVO(); - purchasereceiptJobDetailExportReqVO.setMasterId(result.getId()); - List purchasereceiptJobDetailList = purchasereceiptJobDetailService.getPurchasereceiptJobDetailList(purchasereceiptJobDetailExportReqVO); + List purchasereceiptJobDetailList = purchasereceiptJobDetailService.selectList(result.getId()); List purchasereceiptJobDetailExcelVOS = PurchasereceiptJobDetailConvert.INSTANCE.convertList02(purchasereceiptJobDetailList); result.setSubList(purchasereceiptJobDetailExcelVOS); return success(result); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java index 4f6da022..64165100 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java @@ -1,35 +1,29 @@ package com.win.module.wms.controller.purchasereceiptRecord; +import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailPageReqVO; +import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailRespVO; +import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordDetailConvert; +import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO; +import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.IOException; +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; -import com.win.framework.excel.core.util.ExcelUtils; - -import com.win.framework.operatelog.core.annotations.OperateLog; -import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.purchasereceiptRecord.vo.*; -import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO; -import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordDetailConvert; -import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordDetailService; - @Tag(name = "管理后台 - 采购收货记录子") @RestController @RequestMapping("/wms/purchasereceipt-record-detail") @@ -42,30 +36,6 @@ public class PurchasereceiptRecordDetailController { @Resource private AdminUserApi userApi; - @PostMapping("/create") - @Operation(summary = "创建采购收货记录子") - @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:create')") - public CommonResult createPurchasereceiptRecordDetail(@Valid @RequestBody PurchasereceiptRecordDetailCreateReqVO createReqVO) { - return success(purchasereceiptRecordDetailService.createPurchasereceiptRecordDetail(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新采购收货记录子") - @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:update')") - public CommonResult updatePurchasereceiptRecordDetail(@Valid @RequestBody PurchasereceiptRecordDetailUpdateReqVO updateReqVO) { - purchasereceiptRecordDetailService.updatePurchasereceiptRecordDetail(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除采购收货记录子") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:delete')") - public CommonResult deletePurchasereceiptRecordDetail(@RequestParam("id") Long id) { - purchasereceiptRecordDetailService.deletePurchasereceiptRecordDetail(id); - return success(true); - } - @GetMapping("/get") @Operation(summary = "获得采购收货记录子") @Parameter(name = "id", description = "编号", required = true, example = "1024") @@ -89,8 +59,15 @@ public class PurchasereceiptRecordDetailController { @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:query')") public CommonResult> getPurchasereceiptRecordDetailPage(@Valid PurchasereceiptRecordDetailPageReqVO pageVO) { PageResult pageResult = purchasereceiptRecordDetailService.getPurchasereceiptRecordDetailPage(pageVO); - return success(PurchasereceiptRecordDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = PurchasereceiptRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(PurchasereceiptRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); } + @PostMapping("/senior") @Operation(summary = "高级搜索获得采购收货记录子信息分页") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:query')") @@ -104,21 +81,5 @@ public class PurchasereceiptRecordDetailController { } return success(result); } - @GetMapping("/export-excel") - @Operation(summary = "导出采购收货记录子 Excel") - @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:export')") - @OperateLog(type = EXPORT) - public void exportPurchasereceiptRecordDetailExcel(@Valid PurchasereceiptRecordDetailExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { - List list = purchasereceiptRecordDetailService.getPurchasereceiptRecordDetailList(exportReqVO); - // 导出 Excel - List datas = PurchasereceiptRecordDetailConvert.INSTANCE.convertList02(list); - for(PurchasereceiptRecordDetailExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "采购收货记录子.xls", "数据", PurchasereceiptRecordDetailExcelVO.class, datas); - } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java index 0f2c78a0..9f800048 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java @@ -1,34 +1,40 @@ package com.win.module.wms.controller.purchasereceiptRecord; +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.purchasereceiptRecord.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.purchasereceiptRecord.vo.PurchasereceiptRecordMainExcelVO; +import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainExportReqVO; +import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainPageReqVO; +import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainRespVO; +import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordMainConvert; +import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO; +import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordMainDO; +import com.win.module.wms.enums.DictTypeConstants; +import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordDetailService; +import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordMainService; 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.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordMainDO; -import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordMainConvert; -import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 采购收货记录主") @RestController @@ -38,24 +44,12 @@ public class PurchasereceiptRecordMainController { @Resource private PurchasereceiptRecordMainService purchasereceiptRecordMainService; + @Resource + private PurchasereceiptRecordDetailService purchasereceiptRecordDetailService; @Resource private AdminUserApi userApi; - @PostMapping("/create") - @Operation(summary = "创建采购收货记录主") - @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-main:create')") - public CommonResult createPurchasereceiptRecordMain(@Valid @RequestBody PurchasereceiptRecordMainCreateReqVO createReqVO) { - return success(purchasereceiptRecordMainService.createPurchasereceiptRecordMain(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新采购收货记录主") - @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-main:update')") - public CommonResult updatePurchasereceiptRecordMain(@Valid @RequestBody PurchasereceiptRecordMainUpdateReqVO updateReqVO) { - purchasereceiptRecordMainService.updatePurchasereceiptRecordMain(updateReqVO); - return success(true); - } @PostMapping("/senior") @Operation(summary = "高级搜索获得采购收货记录主信息分页") @PreAuthorize("@ss.hasPermission('wms:PurchasereceiptRecordMain:query')") @@ -69,32 +63,6 @@ public class PurchasereceiptRecordMainController { } return success(result); } - @DeleteMapping("/delete") - @Operation(summary = "删除采购收货记录主") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-main:delete')") - public CommonResult deletePurchasereceiptRecordMain(@RequestParam("id") Long id) { - purchasereceiptRecordMainService.deletePurchasereceiptRecordMain(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得采购收货记录主") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-main:query')") - public CommonResult getPurchasereceiptRecordMain(@RequestParam("id") Long id) { - PurchasereceiptRecordMainDO purchasereceiptRecordMain = purchasereceiptRecordMainService.getPurchasereceiptRecordMain(id); - return success(PurchasereceiptRecordMainConvert.INSTANCE.convert(purchasereceiptRecordMain)); - } - - @GetMapping("/list") - @Operation(summary = "获得采购收货记录主列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-main:query')") - public CommonResult> getPurchasereceiptRecordMainList(@RequestParam("ids") Collection ids) { - List list = purchasereceiptRecordMainService.getPurchasereceiptRecordMainList(ids); - return success(PurchasereceiptRecordMainConvert.INSTANCE.convertList(list)); - } @GetMapping("/page") @Operation(summary = "获得采购收货记录主分页") @@ -108,17 +76,48 @@ public class PurchasereceiptRecordMainController { @Operation(summary = "导出采购收货记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-main:export')") @OperateLog(type = EXPORT) - public void exportPurchasereceiptRecordMainExcel(@Valid PurchasereceiptRecordMainExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { + public void exportPurchasereceiptRecordMainExcel(@Valid PurchasereceiptRecordMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = purchasereceiptRecordMainService.getPurchasereceiptRecordMainList(exportReqVO); - // 导出 Excel - List datas = PurchasereceiptRecordMainConvert.INSTANCE.convertList02(list); - for(PurchasereceiptRecordMainExcelVO 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", "数据", PurchasereceiptRecordMainExcelVO.class, resultList, mapDropDown); + } + + @GetMapping("/export-excel-senior") + @Operation(summary = "导出采购收货记录主 Excel") + @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-main:export')") + @OperateLog(type = EXPORT) + public void exportPurchasereceiptRecordMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = purchasereceiptRecordMainService.getPurchasereceiptRecordMainList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "采购收货记录主.xls", "数据", PurchasereceiptRecordMainExcelVO.class, resultList, mapDropDown); + } + + private List getExcelVo(List list, Map mapDropDown) { + //组装vo + String[] transferMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRANSFER_MODE); + mapDropDown.put(7, transferMode); + String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE); + mapDropDown.put(22, locationType); + mapDropDown.put(23, locationType); + String[] packUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); + mapDropDown.put(44, packUnit); + String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(46, uom); + mapDropDown.put(48, uom); + String[] failedReason = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.FAILED_REASON); + mapDropDown.put(52, failedReason); + List resultList = new ArrayList<>(); + // 导出 + for(PurchasereceiptRecordMainDO mainDO : list) { + List subList = purchasereceiptRecordDetailService.selectList(mainDO.getId()); + for(PurchasereceiptRecordDetailDO detailDO : subList) { + PurchasereceiptRecordMainExcelVO vo = PurchasereceiptRecordMainConvert.INSTANCE.convert(mainDO, detailDO); + resultList.add(vo); + } } - ExcelUtils.write(response, "采购收货记录主.xls", "数据", PurchasereceiptRecordMainExcelVO.class, datas); + return resultList; } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailExportReqVO.java index 59d97634..09cf3d64 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailExportReqVO.java @@ -1,13 +1,11 @@ package com.win.module.wms.controller.purchasereceiptRecord.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; @@ -33,6 +31,9 @@ public class PurchasereceiptRecordDetailExportReqVO { @Schema(description = "替代批次") private String altBatch; + @Schema(description = "主表ID") + private Long masterId; + @Schema(description = "到货日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] arriveDate; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailPageReqVO.java index ed2a316e..667c236a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailPageReqVO.java @@ -1,12 +1,13 @@ package com.win.module.wms.controller.purchasereceiptRecord.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; @@ -35,6 +36,9 @@ public class PurchasereceiptRecordDetailPageReqVO extends PageParam { @Schema(description = "替代批次") private String altBatch; + @Schema(description = "主表ID") + private Long masterId; + @Schema(description = "到货日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] arriveDate; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordMainExcelVO.java index d9eb4501..f81eed7d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordMainExcelVO.java @@ -1,17 +1,13 @@ package com.win.module.wms.controller.purchasereceiptRecord.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; /** @@ -44,11 +40,10 @@ public class PurchasereceiptRecordMainExcelVO { private String carrierCode; @ExcelProperty(value = "运输方式", converter = DictConvert.class) - @DictFormat("transfer_mode") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRANSFER_MODE) private String transferMode; - @ExcelProperty(value = "车牌号", converter = DictConvert.class) - @DictFormat("vehicle_plate_number") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @ExcelProperty(value = "车牌号") private String vehiclePlateNumber; @ExcelProperty("从仓库代码") @@ -78,10 +73,6 @@ public class PurchasereceiptRecordMainExcelVO { @ExcelProperty("部门") private String departmentCode; - @ExcelProperty(value = "接口类型", converter = DictConvert.class) - @DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 - private String interfaceType; - @ExcelProperty("单据号") private String number; @@ -91,21 +82,15 @@ public class PurchasereceiptRecordMainExcelVO { @ExcelProperty("备注") private String remark; - @ExcelProperty("创建时间") - private LocalDateTime createTime; - - @ExcelProperty("创建者id") - private String creator; - @ExcelProperty("代码") private String code; @ExcelProperty(value = "从库位类型范围", converter = DictConvert.class) - @DictFormat("location_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.LOCATION_TYPE) private String fromLocationTypes; @ExcelProperty(value = "到库位类型范围", converter = DictConvert.class) - @DictFormat("location_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.LOCATION_TYPE) private String toLocationTypes; @ExcelProperty("从库区代码范围") @@ -117,4 +102,128 @@ public class PurchasereceiptRecordMainExcelVO { @ExcelProperty("是否可用") private String available; + @ExcelProperty("从包装号") + private String fromPackingNumber; + + @ExcelProperty("到包装号") + private String toPackingNumber; + + @ExcelProperty("从器具号") + private String fromContainerNumber; + + @ExcelProperty("到器具号") + private String toContainerNumber; + + @ExcelProperty("从批次") + private String fromBatch; + + @ExcelProperty("替代批次") + private String altBatch; + + @ExcelProperty("到货日期") + private LocalDateTime arriveDate; + + @ExcelProperty("生产日期") + private LocalDateTime produceDate; + + @ExcelProperty("过期日期") + private LocalDateTime expireDate; + + @ExcelProperty("库存状态") + private String inventoryStatus; + + @ExcelProperty("从库位代码") + private String fromLocationCode; + + @ExcelProperty("到库位代码") + private String toLocationCode; + + @ExcelProperty("从库位组代码") + private String fromLocationGroupCode; + + @ExcelProperty("到库位组代码") + private String toLocationGroupCode; + + @ExcelProperty("订单号") + private String poNumber; + + @ExcelProperty("订单行") + private String poLine; + + @ExcelProperty("标包数量") + private BigDecimal stdPackQty; + + @ExcelProperty(value = "标包单位", converter = DictConvert.class) + @DictFormat(DictTypeConstants.PACK_UNIT) + private String stdPackUnit; + + @ExcelProperty("数量") + private BigDecimal qty; + + @ExcelProperty(value = "单位", converter = DictConvert.class) + @DictFormat(DictTypeConstants.UOM) + private String uom; + + @ExcelProperty("供应商计量数量") + private BigDecimal supplierQty; + + @ExcelProperty(value = "供应商计量单位", converter = DictConvert.class) + @DictFormat(DictTypeConstants.UOM) + private String supplierUom; + + @ExcelProperty("转换率") + private BigDecimal convertRate; + + @ExcelProperty("目检结果") + private String visualInspectResult; + + @ExcelProperty("目检照片") + private String visualInspectPhotos; + + @ExcelProperty(value = "不合格原因", converter = DictConvert.class) + @DictFormat(DictTypeConstants.FAILED_REASON) + private String failedReason; + + @ExcelProperty("单价") + private BigDecimal singlePrice; + + @ExcelProperty("金额") + private BigDecimal amount; + + @ExcelProperty("任务明细ID") + private String jobDetailId; + + @ExcelProperty("物品代码") + private String itemCode; + + @ExcelProperty("物品名称") + private String itemName; + + @ExcelProperty("物品描述1") + private String itemDesc1; + + @ExcelProperty("物品描述2") + private String itemDesc2; + + @ExcelProperty("明细备注") + private String remarkDetail; + + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @ExcelProperty("创建者Id") + private String creator; + + @ExcelProperty("项目代码") + private String projectCode; + + @ExcelProperty("从货主代码") + private String fromOwnerCode; + + @ExcelProperty("到货主代码") + private String toOwnerCode; + + @ExcelProperty("到批次") + private String toBatch; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java index fffedaa0..d9809c2a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java @@ -118,11 +118,29 @@ public class PurchasereceiptRequestMainController { @Operation(summary = "导出采购收货申请主 Excel") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-main:export')") @OperateLog(type = EXPORT) - public void exportPurchasereceiptRequestMainExcel(@Valid PurchasereceiptRequestMainExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { + public void exportPurchasereceiptRequestMainExcel(@Valid PurchasereceiptRequestMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = purchasereceiptRequestMainService.getPurchasereceiptRequestMainList(exportReqVO); //组装vo Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + // 导出 Excel + ExcelUtils.write(response, "采购收货申请主.xlsx", "数据", PurchasereceiptRequestMainExcelVO.class, resultList, mapDropDown); + } + + @GetMapping("/export-excel-senior") + @Operation(summary = "导出采购收货申请主 Excel") + @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-main:export')") + @OperateLog(type = EXPORT) + public void exportPurchasereceiptRequestMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = purchasereceiptRequestMainService.getPurchasereceiptRequestMainList(conditions); + //组装vo + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + // 导出 Excel + ExcelUtils.write(response, "采购收货申请主.xlsx", "数据", PurchasereceiptRequestMainExcelVO.class, resultList, mapDropDown); + } + + private List getExcelVo(List list, Map mapDropDown) { String[] transferMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRANSFER_MODE); mapDropDown.put(4, transferMode); String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE); @@ -146,10 +164,8 @@ public class PurchasereceiptRequestMainController { resultList.add(vo); } } - // 导出 Excel - ExcelUtils.write(response, "采购收货申请主.xlsx", "数据", PurchasereceiptRequestMainExcelVO.class, resultList, mapDropDown); + return resultList; } - @GetMapping("/get-import-template") @Operation(summary = "获得导入采购收货申请信息模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereceiptRecord/PurchasereceiptRecordMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereceiptRecord/PurchasereceiptRecordMainConvert.java index 6a8a6357..826837ee 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereceiptRecord/PurchasereceiptRecordMainConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereceiptRecord/PurchasereceiptRecordMainConvert.java @@ -1,16 +1,18 @@ package com.win.module.wms.convert.purchasereceiptRecord; -import java.util.*; - import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainCreateReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainExcelVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainRespVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO; +import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordMainDO; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordMainDO; + +import java.util.List; /** * 采购收货记录主 Convert @@ -34,4 +36,17 @@ public interface PurchasereceiptRecordMainConvert { List convertList02(List list); + @Mappings({ + @Mapping(source = "mainDO.number", target = "number"), + @Mapping(source = "mainDO.fromAreaCodes", target = "fromAreaCodes"), + @Mapping(source = "mainDO.toAreaCodes", target = "toAreaCodes"), + @Mapping(source = "mainDO.interfaceType", target = "interfaceType"), + @Mapping(source = "mainDO.code", target = "code"), + @Mapping(source = "mainDO.remark", target = "remark"), + @Mapping(source = "detailDO.remark", target = "remarkDetail"), + @Mapping(source = "mainDO.createTime", target = "createTime"), + @Mapping(source = "mainDO.creator", target = "creator"), + }) + PurchasereceiptRecordMainExcelVO convert(PurchasereceiptRecordMainDO mainDO, PurchasereceiptRecordDetailDO detailDO); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobDetailMapper.java index 4790bb06..441a78a4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobDetailMapper.java @@ -5,7 +5,6 @@ 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.purchasereceiptJob.vo.PurchasereceiptJobDetailExportReqVO; import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO; import org.apache.ibatis.annotations.Mapper; @@ -58,41 +57,6 @@ public interface PurchasereceiptJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { return selectPage(conditions, QueryWrapperUtils.structure(conditions)); } - default List selectList(PurchasereceiptJobDetailExportReqVO reqVO) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(PurchasereceiptJobDetailDO::getMasterId, reqVO.getMasterId()) - .eqIfPresent(PurchasereceiptJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) - .eqIfPresent(PurchasereceiptJobDetailDO::getContainerNumber, reqVO.getContainerNumber()) - .eqIfPresent(PurchasereceiptJobDetailDO::getBatch, reqVO.getBatch()) - .eqIfPresent(PurchasereceiptJobDetailDO::getAltBatch, reqVO.getAltBatch()) - .betweenIfPresent(PurchasereceiptJobDetailDO::getArriveDate, reqVO.getArriveDate()) - .betweenIfPresent(PurchasereceiptJobDetailDO::getProduceDate, reqVO.getProduceDate()) - .betweenIfPresent(PurchasereceiptJobDetailDO::getExpireDate, reqVO.getExpireDate()) - .eqIfPresent(PurchasereceiptJobDetailDO::getInventoryStatus, reqVO.getInventoryStatus()) - .eqIfPresent(PurchasereceiptJobDetailDO::getFromLocationCode, reqVO.getFromLocationCode()) - .eqIfPresent(PurchasereceiptJobDetailDO::getToLocationCode, reqVO.getToLocationCode()) - .eqIfPresent(PurchasereceiptJobDetailDO::getPoNumber, reqVO.getPoNumber()) - .eqIfPresent(PurchasereceiptJobDetailDO::getPoLine, reqVO.getPoLine()) - .eqIfPresent(PurchasereceiptJobDetailDO::getStdPackQty, reqVO.getStdPackQty()) - .eqIfPresent(PurchasereceiptJobDetailDO::getStdPackUnit, reqVO.getStdPackUnit()) - .eqIfPresent(PurchasereceiptJobDetailDO::getSupplierQty, reqVO.getSupplierQty()) - .eqIfPresent(PurchasereceiptJobDetailDO::getSupplierUom, reqVO.getSupplierUom()) - .eqIfPresent(PurchasereceiptJobDetailDO::getConvertRate, reqVO.getConvertRate()) - .eqIfPresent(PurchasereceiptJobDetailDO::getItemCode, reqVO.getItemCode()) - .likeIfPresent(PurchasereceiptJobDetailDO::getItemName, reqVO.getItemName()) - .eqIfPresent(PurchasereceiptJobDetailDO::getItemDesc1, reqVO.getItemDesc1()) - .eqIfPresent(PurchasereceiptJobDetailDO::getItemDesc2, reqVO.getItemDesc2()) - .eqIfPresent(PurchasereceiptJobDetailDO::getProjectCode, reqVO.getProjectCode()) - .eqIfPresent(PurchasereceiptJobDetailDO::getQty, reqVO.getQty()) - .eqIfPresent(PurchasereceiptJobDetailDO::getUom, reqVO.getUom()) - .eqIfPresent(PurchasereceiptJobDetailDO::getNumber, reqVO.getNumber()) - .eqIfPresent(PurchasereceiptJobDetailDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(PurchasereceiptJobDetailDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(PurchasereceiptJobDetailDO::getCreator, reqVO.getCreator()) - .eqIfPresent(PurchasereceiptJobDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) - .eqIfPresent(PurchasereceiptJobDetailDO::getToOwnerCode, reqVO.getToOwnerCode()) - .orderByDesc(PurchasereceiptJobDetailDO::getId)); - } default List selectList(Long masterId) { return selectList(new LambdaQueryWrapperX() diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java index bcc1b497..67b9103b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java @@ -139,4 +139,8 @@ public interface PurchasereceiptJobMainMapper 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/purchasereceiptRecord/PurchasereceiptRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordDetailMapper.java index f188bd31..13f2a460 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordDetailMapper.java @@ -1,17 +1,16 @@ package com.win.module.wms.dal.mysql.purchasereceiptRecord; -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.purchasereceiptRecord.vo.PurchasereceiptRecordDetailExportReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 采购收货记录子 Mapper * @@ -22,6 +21,7 @@ public interface PurchasereceiptRecordDetailMapper extends BaseMapperX selectPage(PurchasereceiptRecordDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .eq(PurchasereceiptRecordDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(PurchasereceiptRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) .eqIfPresent(PurchasereceiptRecordDetailDO::getToPackingNumber, reqVO.getToPackingNumber()) .eqIfPresent(PurchasereceiptRecordDetailDO::getFromContainerNumber, reqVO.getFromContainerNumber()) @@ -72,54 +72,10 @@ public interface PurchasereceiptRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { return selectPage(conditions, QueryWrapperUtils.structure(conditions)); } - default List selectList(PurchasereceiptRecordDetailExportReqVO reqVO) { + + default List selectList(Long masterId) { return selectList(new LambdaQueryWrapperX() - .eqIfPresent(PurchasereceiptRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getToPackingNumber, reqVO.getToPackingNumber()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getFromContainerNumber, reqVO.getFromContainerNumber()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getToContainerNumber, reqVO.getToContainerNumber()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getFromBatch, reqVO.getFromBatch()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getAltBatch, reqVO.getAltBatch()) - .betweenIfPresent(PurchasereceiptRecordDetailDO::getArriveDate, reqVO.getArriveDate()) - .betweenIfPresent(PurchasereceiptRecordDetailDO::getProduceDate, reqVO.getProduceDate()) - .betweenIfPresent(PurchasereceiptRecordDetailDO::getExpireDate, reqVO.getExpireDate()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getInventoryStatus, reqVO.getInventoryStatus()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getFromLocationCode, reqVO.getFromLocationCode()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getToLocationCode, reqVO.getToLocationCode()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getFromLocationGroupCode, reqVO.getFromLocationGroupCode()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getToLocationGroupCode, reqVO.getToLocationGroupCode()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getFromAreaCodes, reqVO.getFromAreaCodes()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getToAreaCodes, reqVO.getToAreaCodes()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getPoNumber, reqVO.getPoNumber()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getPoLine, reqVO.getPoLine()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getStdPackQty, reqVO.getStdPackQty()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getStdPackUnit, reqVO.getStdPackUnit()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getQty, reqVO.getQty()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getUom, reqVO.getUom()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getSupplierQty, reqVO.getSupplierQty()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getSupplierUom, reqVO.getSupplierUom()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getConvertRate, reqVO.getConvertRate()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getVisualInspectResult, reqVO.getVisualInspectResult()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getVisualInspectPhotos, reqVO.getVisualInspectPhotos()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getFailedReason, reqVO.getFailedReason()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getSinglePrice, reqVO.getSinglePrice()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getAmount, reqVO.getAmount()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getJobDetailId, reqVO.getJobDetailId()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getItemCode, reqVO.getItemCode()) - .likeIfPresent(PurchasereceiptRecordDetailDO::getItemName, reqVO.getItemName()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getItemDesc1, reqVO.getItemDesc1()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getItemDesc2, reqVO.getItemDesc2()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getNumber, reqVO.getNumber()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(PurchasereceiptRecordDetailDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getCreator, reqVO.getCreator()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getProjectCode, reqVO.getProjectCode()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getCode, reqVO.getCode()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getInterfaceType, reqVO.getInterfaceType()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getToOwnerCode, reqVO.getToOwnerCode()) - .eqIfPresent(PurchasereceiptRecordDetailDO::getToBatch, reqVO.getToBatch()) - .orderByDesc(PurchasereceiptRecordDetailDO::getId)); + .eq(PurchasereceiptRecordDetailDO::getMasterId, masterId)); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordMainMapper.java index 513786c9..f3d6bcb2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordMainMapper.java @@ -1,17 +1,17 @@ package com.win.module.wms.dal.mysql.purchasereceiptRecord; -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.purchasereceiptRecord.vo.PurchasereceiptRecordMainExportReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 采购收货记录主 Mapper * @@ -92,4 +92,8 @@ public interface PurchasereceiptRecordMainMapper 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/purchasereceiptRequest/PurchasereceiptRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRequest/PurchasereceiptRequestMainMapper.java index 85378b4c..0bd41fc6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRequest/PurchasereceiptRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRequest/PurchasereceiptRequestMainMapper.java @@ -93,4 +93,8 @@ public interface PurchasereceiptRequestMainMapper 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/service/purchasereceiptJob/PurchasereceiptJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java index 0bfaaee2..264c3157 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java @@ -2,7 +2,6 @@ package com.win.module.wms.service.purchasereceiptJob; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailExportReqVO; import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO; @@ -46,12 +45,4 @@ public interface PurchasereceiptJobDetailService { */ List selectList(Long masterId); - /** - * 获得采购收货任务子列表, 用于 Excel 导出 - * - * @param exportReqVO 查询条件 - * @return 采购收货任务子列表 - */ - List getPurchasereceiptJobDetailList(PurchasereceiptJobDetailExportReqVO exportReqVO); - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java index 1469e03b..bf94c0af 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java @@ -2,7 +2,6 @@ package com.win.module.wms.service.purchasereceiptJob; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailExportReqVO; import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO; import com.win.module.wms.dal.mysql.purchasereceiptJob.PurchasereceiptJobDetailMapper; @@ -44,9 +43,4 @@ public class PurchasereceiptJobDetailServiceImpl implements PurchasereceiptJobDe return purchasereceiptJobDetailMapper.selectPage(pageReqVO); } - @Override - public List getPurchasereceiptJobDetailList(PurchasereceiptJobDetailExportReqVO exportReqVO) { - return purchasereceiptJobDetailMapper.selectList(exportReqVO); - } - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java index 30f8a559..b527f9e3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java @@ -65,6 +65,14 @@ public interface PurchasereceiptJobMainService { */ List getPurchasereceiptJobMainList(PurchasereceiptJobMainExportReqVO exportReqVO); + /** + * 获得采购收货任务主列表, 用于 Excel 导出 + * + * @param conditions 查询条件 + * @return 采购收货申请主列表 + */ + List getPurchasereceiptJobMainList(CustomConditions conditions); + /** * 调用校验供应商发货记录方法 * 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 852ad6f7..d67ab7f3 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 @@ -102,6 +102,11 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain return purchasereceiptJobMainMapper.selectList(exportReqVO); } + @Override + public List getPurchasereceiptJobMainList(CustomConditions conditions) { + return purchasereceiptJobMainMapper.selectSeniorList(conditions); + } + @Override public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordDetailDoExist(String psupplierCode,String pasnNumber,String pitemCode,String ppoNumber,String ppoLine) { SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = supplierdeliverRecordMainService.selectSupplierdeliverRecordMainDO(psupplierCode,pasnNumber, pitemCode, ppoNumber, ppoLine); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailService.java index 71fbe220..54a11057 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailService.java @@ -1,15 +1,15 @@ package com.win.module.wms.service.purchasereceiptRecord; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailCreateReqVO; -import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailExportReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailPageReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 采购收货记录子 Service 接口 @@ -71,11 +71,10 @@ public interface PurchasereceiptRecordDetailService { PageResult getPurchasereceiptRecordDetailPage(PurchasereceiptRecordDetailPageReqVO pageReqVO); /** - * 获得采购收货记录子列表, 用于 Excel 导出 - * - * @param exportReqVO 查询条件 - * @return 采购收货记录子列表 + * 根据主表id查询 + * @param masterId + * @return */ - List getPurchasereceiptRecordDetailList(PurchasereceiptRecordDetailExportReqVO exportReqVO); + List selectList(Long masterId); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java index cd5056f9..6075784e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java @@ -1,24 +1,22 @@ package com.win.module.wms.service.purchasereceiptRecord; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailCreateReqVO; -import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailExportReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailPageReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailUpdateReqVO; +import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordDetailConvert; +import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO; +import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordDetailMapper; 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.purchasereceiptRecord.PurchasereceiptRecordDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordDetailConvert; -import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordDetailMapper; +import javax.annotation.Resource; +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.PURCHASERECEIPT_RECORD_DETAIL_NOT_EXISTS; /** * 采购收货记录子 Service 实现类 @@ -83,8 +81,8 @@ public class PurchasereceiptRecordDetailServiceImpl implements PurchasereceiptRe } @Override - public List getPurchasereceiptRecordDetailList(PurchasereceiptRecordDetailExportReqVO exportReqVO) { - return purchasereceiptRecordDetailMapper.selectList(exportReqVO); + public List selectList(Long masterId) { + return purchasereceiptRecordDetailMapper.selectList(masterId); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainService.java index 613545a5..52c63c8b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainService.java @@ -1,16 +1,17 @@ package com.win.module.wms.service.purchasereceiptRecord; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainCreateReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainExportReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainPageReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainUpdateReqVO; import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO; import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 采购收货记录主 Service 接口 @@ -80,6 +81,14 @@ public interface PurchasereceiptRecordMainService { */ List getPurchasereceiptRecordMainList(PurchasereceiptRecordMainExportReqVO exportReqVO); + /** + * 获得采购收货记录主列表, 用于 Excel 导出 + * + * @param conditions 查询条件 + * @return 采购收货申请主列表 + */ + List getPurchasereceiptRecordMainList(CustomConditions conditions); + /** * 查询采购收货记录是否存在 * Record-----VPur diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java index 88e19ec2..ad4dd7fb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java @@ -3,26 +3,25 @@ package com.win.module.wms.service.purchasereceiptRecord; import cn.hutool.core.exceptions.UtilException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainCreateReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainExportReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainPageReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainUpdateReqVO; +import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordMainConvert; import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO; +import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordMainDO; import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordDetailMapper; +import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordMainMapper; 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.purchasereceiptRecord.PurchasereceiptRecordMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordMainConvert; -import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordMainMapper; +import javax.annotation.Resource; +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.PURCHASERECEIPT_RECORD_MAIN_NOT_EXISTS; /** * 采购收货记录主 Service 实现类 @@ -93,6 +92,12 @@ public class PurchasereceiptRecordMainServiceImpl implements PurchasereceiptReco public List getPurchasereceiptRecordMainList(PurchasereceiptRecordMainExportReqVO exportReqVO) { return purchasereceiptRecordMainMapper.selectList(exportReqVO); } + + @Override + public List getPurchasereceiptRecordMainList(CustomConditions conditions) { + return purchasereceiptRecordMainMapper.selectSeniorList(conditions); + } + @Override public PurchasereceiptRecordDetailDO selectPurchasereceiptExist(String ppoNumber,String psupplierCode,String pNumber,String ppoLine,String pitemCode){ QueryWrapper queryWrapperMain = new QueryWrapper(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java index 06212877..da97314d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java @@ -78,6 +78,13 @@ public interface PurchasereceiptRequestMainService { */ List getPurchasereceiptRequestMainList(PurchasereceiptRequestMainExportReqVO exportReqVO); + /** + * 获得采购收货申请主列表, 用于 Excel 导出 + * + * @param conditions 查询条件 + * @return 采购收货申请主列表 + */ + List getPurchasereceiptRequestMainList(CustomConditions conditions); /** * 批量导入采购索赔申请主信息 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 5f99727e..935386a4 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 @@ -194,6 +194,11 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq return purchasereceiptRequestMainMapper.selectList(exportReqVO); } + @Override + public List getPurchasereceiptRequestMainList(CustomConditions conditions) { + return purchasereceiptRequestMainMapper.selectSeniorList(conditions); + } + @Override @Transactional public List importPurchasereceiptRequestMainList(List datas, Integer mode, boolean updatePart) {