From d5d0c1f443eb8ca66e08a689947f1845a8ebb8e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Thu, 14 Dec 2023 19:44:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E4=B8=8A=E6=9E=B6=20?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/IssueRecordDetailExportReqVO.java | 4 + .../ProductputawayRecordMainController.java | 79 +++++++++++++---- ...ProductputawayRecordDetailExportReqVO.java | 3 + .../ProductputawayRecordDetailPageReqVO.java | 3 + .../vo/ProductputawayRecordMainExcelVO.java | 88 ++++++++++++++++--- .../ProductputawayRecordMainConvert.java | 12 +++ .../issueRecord/IssueRecordDetailMapper.java | 1 + .../ProductputawayRecordDetailMapper.java | 7 ++ .../ProductputawayRecordMainMapper.java | 4 + .../ProductputawayJobMainServiceImpl.java | 1 + .../ProductputawayRecordDetailService.java | 2 + ...ProductputawayRecordDetailServiceImpl.java | 5 ++ .../ProductputawayRecordMainService.java | 2 + .../ProductputawayRecordMainServiceImpl.java | 5 ++ 14 files changed, 187 insertions(+), 29 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailExportReqVO.java index 27f85850..3ebcc28a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailExportReqVO.java @@ -112,4 +112,8 @@ public class IssueRecordDetailExportReqVO { @Schema(description = "任务明细ID") private String jobDetailId; + @Schema(description = "主表ID") + private String masterId; + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordMainController.java index d8b3a2fc..facafb4e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordMainController.java @@ -3,13 +3,17 @@ package com.win.module.wms.controller.productputawayRecord; 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.productputawayRecord.vo.*; import com.win.module.wms.convert.productputawayRecord.ProductputawayRecordMainConvert; +import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordDetailDO; import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordMainDO; +import com.win.module.wms.enums.DictTypeConstants; +import com.win.module.wms.service.productputawayRecord.ProductputawayRecordDetailService; import com.win.module.wms.service.productputawayRecord.ProductputawayRecordMainService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -22,8 +26,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.util.Collection; -import java.util.List; +import java.util.*; import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @@ -34,6 +37,8 @@ import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Validated public class ProductputawayRecordMainController { + @Resource + private ProductputawayRecordDetailService productputawayRecordDetailService; @Resource private ProductputawayRecordMainService productputawayRecordMainService; @@ -90,23 +95,6 @@ public class ProductputawayRecordMainController { return success(ProductputawayRecordMainConvert.INSTANCE.convertPage(pageResult)); } - @GetMapping("/export-excel") - @Operation(summary = "导出制品上架记录主 Excel") - @PreAuthorize("@ss.hasPermission('wms:productputaway-record-main:export')") - @OperateLog(type = EXPORT) - public void exportProductputawayRecordMainExcel(@Valid ProductputawayRecordMainExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { - List list = productputawayRecordMainService.getProductputawayRecordMainList(exportReqVO); - // 导出 Excel - List datas = ProductputawayRecordMainConvert.INSTANCE.convertList02(list); - for(ProductputawayRecordMainExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "制品上架记录主.xls", "数据", ProductputawayRecordMainExcelVO.class, datas); - } - @PostMapping("/senior") @Operation(summary = "高级搜索获得制品上架记录主分页") @PreAuthorize("@ss.hasPermission('wms:productputaway-record-main:query')") @@ -121,4 +109,57 @@ public class ProductputawayRecordMainController { return success(result); } + private List getExcelVo(List list, Map mapDropDown) { + + String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE); + mapDropDown.put(17, locationType); + mapDropDown.put(20, locationType); + String[] useOnTheWayLocation = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(23, useOnTheWayLocation); + String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS); + mapDropDown.put(32, inventoryStatus); + String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(49, uom); + List resultList = new ArrayList<>(); + // 导出 + for(ProductputawayRecordMainDO mainDO : list) { + List subList = productputawayRecordDetailService.selectList(mainDO.getId()); + for(ProductputawayRecordDetailDO detailDO : subList) { + ProductputawayRecordMainExcelVO vo = ProductputawayRecordMainConvert.INSTANCE.convert(mainDO, detailDO); + AdminUserRespDTO user = userApi.getUser(Long.valueOf(mainDO.getCreator())); + vo.setCreator(user.getNickname()); + vo.setUpdater(user.getNickname()); + resultList.add(vo); + } + } + return resultList; + } + + @GetMapping("/export-excel") + @Operation(summary = "导出制品上架记录 Excel") + @PreAuthorize("@ss.hasPermission('wms:productputaway-record-main:export')") + @OperateLog(type = EXPORT) + public void exportProductputawayRecordMainExcel(@Valid ProductputawayRecordMainExportReqVO exportReqVO, + HttpServletResponse response) throws IOException { + List list = productputawayRecordMainService.getProductputawayRecordMainList(exportReqVO); + //组装vo + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + // 导出 Excel + ExcelUtils.write(response, "制品上架记录.xlsx", "制品上架记录", ProductputawayRecordMainExcelVO.class, resultList, mapDropDown); + } + + @PostMapping("/export-excel-senior") + @Operation(summary = "导出制品上架记录 Excel") + @PreAuthorize("@ss.hasPermission('wms:productputaway-record-main:export')") + @OperateLog(type = EXPORT) + public void exportProductputawayRecordMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = productputawayRecordMainService.getProductputawayRecordMainList(conditions); + //组装vo + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + // 导出 Excel + ExcelUtils.write(response, "制品上架记录.xlsx", "制品上架记录", ProductputawayRecordMainExcelVO.class, resultList, mapDropDown); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailExportReqVO.java index 6f05d304..f2e424e4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailExportReqVO.java @@ -109,4 +109,7 @@ public class ProductputawayRecordDetailExportReqVO { @Schema(description = "任务明细ID") private String jobDetailId; + @Schema(description = "主表ID") + private String masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailPageReqVO.java index 71daa604..7e788faa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailPageReqVO.java @@ -111,4 +111,7 @@ public class ProductputawayRecordDetailPageReqVO extends PageParam { @Schema(description = "任务明细ID") private String jobDetailId; + @Schema(description = "主表ID") + private String masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordMainExcelVO.java index 1fdc3e22..6421e688 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordMainExcelVO.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.productputawayRecord.vo; +import com.win.module.wms.enums.DictTypeConstants; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -52,10 +53,6 @@ public class ProductputawayRecordMainExcelVO { @ExcelProperty("部门") private String departmentCode; - @ExcelProperty(value = "接口类型", converter = DictConvert.class) - @DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 - private String interfaceType; - @ExcelProperty("单据号") private String number; @@ -71,14 +68,11 @@ public class ProductputawayRecordMainExcelVO { @ExcelProperty("创建者Id") private String creator; - @ExcelProperty("代码") - private String code; - @ExcelProperty("从仓库代码") private String fromWarehouseCode; @ExcelProperty(value = "从库位类型范围", converter = DictConvert.class) - @DictFormat("location_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.LOCATION_TYPE) private String fromLocationTypes; @ExcelProperty("从库区代码范围") @@ -88,7 +82,7 @@ public class ProductputawayRecordMainExcelVO { private String toWarehouseCode; @ExcelProperty(value = "到库位类型范围", converter = DictConvert.class) - @DictFormat("location_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.LOCATION_TYPE) private String toLocationTypes; @ExcelProperty("到库区代码范围") @@ -97,7 +91,81 @@ public class ProductputawayRecordMainExcelVO { @ExcelProperty("权限所属人员id") private Long ruleUserId; - @ExcelProperty("是否可用") + @ExcelProperty(value = "是否可用", converter = DictConvert.class) + @DictFormat(DictTypeConstants.TRUE_FALSE) private String available; + @ExcelProperty("最后更新时间") + private LocalDateTime updateTime; + + @ExcelProperty("最后更新者Id") + private String updater; + + // 子表信息 + @ExcelProperty("从包装号") + private String fromPackingNumber; + @ExcelProperty("到包装号") + private String toPackingNumber; + + @ExcelProperty("从批次") + private String fromBatch; + @ExcelProperty("到批次") + private String toBatch; + + @ExcelProperty("从器具号") + private String fromContainerNumber; + @ExcelProperty("到器具号") + private String toContainerNumber; + + @ExcelProperty(value = "库存状态", converter = DictConvert.class) + @DictFormat(DictTypeConstants.INVENTORY_STATUS) + private String inventoryStatus; + + @ExcelProperty("订单号") + private String poNumber; + + @ExcelProperty("订单行") + private String poLine; + + @ExcelProperty("从货主代码") + private String fromOwnerCode; + @ExcelProperty("到货主代码") + private String toOwnerCode; + + @ExcelProperty("从库位代码") + private String fromLocationCode; + @ExcelProperty("到库位代码") + private String toLocationCode; + + @ExcelProperty("从库位组代码") + private String fromLocationGroupCode; + @ExcelProperty("到库位组代码") + private String toLocationGroupCode; + + @ExcelProperty("从库区代码") + private String fromAreaCode; + @ExcelProperty("到库区代码") + private String toAreaCode; + + @ExcelProperty("物品代码") + private String itemCode; + + @ExcelProperty("物品名称") + private String itemName; + + @ExcelProperty("物品描述1") + private String itemDesc1; + + @ExcelProperty("物品描述2") + private String itemDesc2; + + @ExcelProperty("项目代码") + private String projectCode; + + @ExcelProperty("数量") + private String qty; + + @ExcelProperty(value = "计量单位", converter = DictConvert.class) + @DictFormat(DictTypeConstants.UOM) + private String uom; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productputawayRecord/ProductputawayRecordMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productputawayRecord/ProductputawayRecordMainConvert.java index 6eb8d1f4..e24cadd8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productputawayRecord/ProductputawayRecordMainConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productputawayRecord/ProductputawayRecordMainConvert.java @@ -8,7 +8,10 @@ import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecor import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainExcelVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainRespVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordDetailDO; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordMainDO; @@ -34,4 +37,13 @@ public interface ProductputawayRecordMainConvert { 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"), + }) + ProductputawayRecordMainExcelVO convert(ProductputawayRecordMainDO mainDO, ProductputawayRecordDetailDO detailDO); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordDetailMapper.java index c9e94451..4cf00342 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordDetailMapper.java @@ -64,6 +64,7 @@ public interface IssueRecordDetailMapper extends BaseMapperX selectList(IssueRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .eqIfPresent(IssueRecordDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(IssueRecordDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) .eqIfPresent(IssueRecordDetailDO::getWorkStationCode, reqVO.getWorkStationCode()) .eqIfPresent(IssueRecordDetailDO::getOnTheWayLocationCode, reqVO.getOnTheWayLocationCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordDetailMapper.java index e798e045..69f34528 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordDetailMapper.java @@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailExportReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailPageReqVO; +import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordDetailDO; import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordDetailDO; import org.apache.ibatis.annotations.Mapper; @@ -22,6 +23,7 @@ public interface ProductputawayRecordDetailMapper extends BaseMapperX selectPage(ProductputawayRecordDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(ProductputawayRecordDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(ProductputawayRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) .eqIfPresent(ProductputawayRecordDetailDO::getToPackingNumber, reqVO.getToPackingNumber()) .eqIfPresent(ProductputawayRecordDetailDO::getFromBatch, reqVO.getFromBatch()) @@ -62,6 +64,7 @@ public interface ProductputawayRecordDetailMapper extends BaseMapperX selectList(ProductputawayRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .eqIfPresent(ProductputawayRecordDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(ProductputawayRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) .eqIfPresent(ProductputawayRecordDetailDO::getToPackingNumber, reqVO.getToPackingNumber()) .eqIfPresent(ProductputawayRecordDetailDO::getFromBatch, reqVO.getFromBatch()) @@ -96,4 +99,8 @@ public interface ProductputawayRecordDetailMapper extends BaseMapperX selectList(Long masterId) { + return selectList(new LambdaQueryWrapperX() + .eq(ProductputawayRecordDetailDO::getMasterId, masterId)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordMainMapper.java index 8b49cacc..450aee34 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordMainMapper.java @@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainExportReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainPageReqVO; +import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO; import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordMainDO; import org.apache.ibatis.annotations.Mapper; @@ -84,4 +85,7 @@ public interface ProductputawayRecordMainMapper 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/productputawayJob/ProductputawayJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java index 66630784..a63d717b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java @@ -280,6 +280,7 @@ public class ProductputawayJobMainServiceImpl implements ProductputawayJobMainSe productputawayRecordDetailDO.setToBatch(productputawayJobDetailDO.getBatch()); productputawayRecordDetailDO.setFromContainerNumber(productputawayJobDetailDO.getContainerNumber()); productputawayRecordDetailDO.setToContainerNumber(productputawayJobDetailDO.getContainerNumber()); + productputawayRecordDetailDO.setMasterId(productputawayRecordMainDO.getId()); // 根据 to库位 查询 库位组 库区 LocationDO locationDO = locationService.selectLocation(productputawayJobDetailDO.getToLocationCode()); productputawayRecordDetailDO.setToLocationGroupCode(locationDO.getLocationGroupCode()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailService.java index cbd85ce2..0e59a469 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailService.java @@ -80,4 +80,6 @@ public interface ProductputawayRecordDetailService { * @return 分页列表 */ PageResult getProductputawayRecordDetailSenior(CustomConditions conditions); + + List selectList(Long id); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailServiceImpl.java index c395ca2f..394b6075 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailServiceImpl.java @@ -88,4 +88,9 @@ public class ProductputawayRecordDetailServiceImpl implements ProductputawayReco public PageResult getProductputawayRecordDetailSenior(CustomConditions conditions) { return productputawayRecordDetailMapper.selectSenior(conditions); } + + @Override + public List selectList(Long masterId) { + return productputawayRecordDetailMapper.selectList(masterId); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainService.java index b1bc0684..fbd1166f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainService.java @@ -80,4 +80,6 @@ public interface ProductputawayRecordMainService { * @return 分页列表 */ PageResult getProductputawayRecordMainSenior(CustomConditions conditions); + + List getProductputawayRecordMainList(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainServiceImpl.java index deb7996d..2b11f137 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainServiceImpl.java @@ -87,4 +87,9 @@ public class ProductputawayRecordMainServiceImpl implements ProductputawayRecord public PageResult getProductputawayRecordMainSenior(CustomConditions conditions) { return productputawayRecordMainMapper.selectSenior(conditions); } + + @Override + public List getProductputawayRecordMainList(CustomConditions conditions) { + return productputawayRecordMainMapper.selectSeniorList(conditions); + } }