上架导出。

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java

@@ -10,10 +10,8 @@ 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.inspectRequest.vo.*;
-import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailExcelVO;
 import com.win.module.wms.convert.inspectRequest.InspectRequestDetailConvert;
 import com.win.module.wms.convert.inspectRequest.InspectRequestMainConvert;
-import com.win.module.wms.convert.scrapRequest.ScrapRequestDetailConvert;
 import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO;
 import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO;
 import com.win.module.wms.enums.DictTypeConstants;
@@ -34,7 +32,10 @@ import javax.validation.Valid;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import static com.win.framework.common.pojo.CommonResult.success;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@@ -85,15 +86,6 @@ public class InspectRequestMainController {
         return success(InspectRequestMainConvert.INSTANCE.convert(inspectRequestMain));
     }
 
-    @GetMapping("/list")
-    @Operation(summary = "获得检验申请主列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:query')")
-    public CommonResult<List<InspectRequestMainRespVO>> getInspectRequestMainList(@RequestParam("ids") Collection<Long> ids) {
-        List<InspectRequestMainDO> list = inspectRequestMainService.getInspectRequestMainList(ids);
-        return success(InspectRequestMainConvert.INSTANCE.convertList(list));
-    }
-
     @GetMapping("/page")
     @Operation(summary = "获得检验申请主分页")
     @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:query')")
@@ -252,7 +244,6 @@ public class InspectRequestMainController {
         return success(count > 0);
     }
 
-
     @GetMapping("/getInspectRequestById")
     @Operation(summary = "APP获得检验申请主子表明细列表")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
@@ -263,7 +254,6 @@ public class InspectRequestMainController {
         if (result == null) {
             return success(result);
         }
-        ;
         InspectRequestDetailExportReqVO reqVO = new InspectRequestDetailExportReqVO();
         reqVO.setMasterId(result.getId());
         List<InspectRequestDetailDO> list = inspectRequestDetailService.getInspectRequestDetailList(reqVO);
@@ -272,5 +262,4 @@ public class InspectRequestMainController {
         return success(result);
     }
 
-
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestDetailController.java

@@ -1,35 +1,29 @@
 package com.win.module.wms.controller.putawayRequest;
 
+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 com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailCreateReqVO;
-import javax.annotation.Resource;
+import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailPageReqVO;
-import org.springframework.validation.annotation.Validated;
+import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailRespVO;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailUpdateReqVO;
-import io.swagger.v3.oas.annotations.tags.Tag;
+import com.win.module.wms.convert.putawayRequest.PutawayRequestDetailConvert;
-import io.swagger.v3.oas.annotations.Parameter;
+import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestDetailDO;
+import com.win.module.wms.service.putawayRequest.PutawayRequestDetailService;
 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.annotation.Resource;
-import javax.servlet.http.*;
+import javax.validation.Valid;
-import java.util.*;
-import java.io.IOException;
 
-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.putawayRequest.vo.*;
-import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestDetailDO;
-import com.win.module.wms.convert.putawayRequest.PutawayRequestDetailConvert;
-import com.win.module.wms.service.putawayRequest.PutawayRequestDetailService;
-
 @Tag(name = "管理后台 - 上架申请子")
 @RestController
 @RequestMapping("/wms/putaway-request-detail")
@@ -75,15 +69,6 @@ public class PutawayRequestDetailController {
         return success(PutawayRequestDetailConvert.INSTANCE.convert(putawayRequestDetail));
     }
 
-    @GetMapping("/list")
-    @Operation(summary = "获得上架申请子列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('wms:putaway-request-detail:query')")
-    public CommonResult<List<PutawayRequestDetailRespVO>> getPutawayRequestDetailList(@RequestParam("ids") Collection<Long> ids) {
-        List<PutawayRequestDetailDO> list = putawayRequestDetailService.getPutawayRequestDetailList(ids);
-        return success(PutawayRequestDetailConvert.INSTANCE.convertList(list));
-    }
-
     @GetMapping("/page")
     @Operation(summary = "获得上架申请子分页")
     @PreAuthorize("@ss.hasPermission('wms:putaway-request-detail:query')")
@@ -91,6 +76,7 @@ public class PutawayRequestDetailController {
         PageResult<PutawayRequestDetailDO> pageResult = putawayRequestDetailService.getPutawayRequestDetailPage(pageVO);
         return success(PutawayRequestDetailConvert.INSTANCE.convertPage(pageResult));
     }
+
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得上架申请子信息分页")
     @PreAuthorize("@ss.hasPermission('wms:putaway-request-detail:query')")
@@ -104,21 +90,5 @@ public class PutawayRequestDetailController {
         }
         return success(result);
     }
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出上架申请子 Excel")
-    @PreAuthorize("@ss.hasPermission('wms:putaway-request-detail:export')")
-    @OperateLog(type = EXPORT)
-    public void exportPutawayRequestDetailExcel(@Valid PutawayRequestDetailExportReqVO exportReqVO,
-              HttpServletResponse response) throws IOException {
-        List<PutawayRequestDetailDO> list = putawayRequestDetailService.getPutawayRequestDetailList(exportReqVO);
-        // 导出 Excel
-        List<PutawayRequestDetailExcelVO> datas = PutawayRequestDetailConvert.INSTANCE.convertList02(list);
-        for(PutawayRequestDetailExcelVO vo : datas) {
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
-            //后端创建个字段作为前端展示的虚拟字段
-            vo.setCreator(user.getNickname());
-        }
-        ExcelUtils.write(response, "上架申请子.xls", "数据", PutawayRequestDetailExcelVO.class, datas);
-    }
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java

@@ -1,39 +1,44 @@
 package com.win.module.wms.controller.putawayRequest;
 
+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.ConvertUtil;
+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.putawayRequest.vo.*;
-import com.win.module.wms.enums.DictTypeConstants;
-import io.swagger.v3.oas.annotations.Parameters;
 import com.win.module.wms.convert.putawayRequest.PutawayRequestDetailConvert;
+import com.win.module.wms.convert.putawayRequest.PutawayRequestMainConvert;
 import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestDetailDO;
+import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestMainDO;
+import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.putawayRequest.PutawayRequestDetailService;
+import com.win.module.wms.service.putawayRequest.PutawayRequestMainService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+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 org.springframework.web.multipart.MultipartFile;
+
 import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
+import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
+import javax.validation.Valid;
-import io.swagger.v3.oas.annotations.tags.Tag;
+import java.io.IOException;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-import javax.validation.*;
-import javax.servlet.http.*;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.util.*;
+import java.util.ArrayList;
-import java.io.IOException;
+import java.util.HashMap;
-import com.win.framework.common.pojo.PageResult;
+import java.util.List;
-import com.win.framework.common.pojo.CommonResult;
+import java.util.Map;
+
 import static com.win.framework.common.pojo.CommonResult.success;
-import com.win.framework.excel.core.util.ExcelUtils;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import com.win.framework.operatelog.core.annotations.OperateLog;
-import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestMainDO;
-import com.win.module.wms.convert.putawayRequest.PutawayRequestMainConvert;
-import com.win.module.wms.service.putawayRequest.PutawayRequestMainService;
-import org.springframework.web.multipart.MultipartFile;
 
 @Tag(name = "管理后台 - 上架申请主")
 @RestController
@@ -94,14 +99,6 @@ public class PutawayRequestMainController {
         }
         return success(result);
     }
-    @GetMapping("/list")
-    @Operation(summary = "获得上架申请主列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('wms:putaway-request-main:query')")
-    public CommonResult<List<PutawayRequestMainRespVO>> getPutawayRequestMainList(@RequestParam("ids") Collection<Long> ids) {
-        List<PutawayRequestMainDO> list = putawayRequestMainService.getPutawayRequestMainList(ids);
-        return success(PutawayRequestMainConvert.INSTANCE.convertList(list));
-    }
 
     @GetMapping("/page")
     @Operation(summary = "获得上架申请主分页")
@@ -118,19 +115,50 @@ public class PutawayRequestMainController {
     public void exportPutawayRequestMainExcel(@Valid PutawayRequestMainExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<PutawayRequestMainDO> list = putawayRequestMainService.getPutawayRequestMainList(exportReqVO);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<PutawayRequestMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "上架申请主.xls", "上架申请数据", PutawayRequestMainExcelVO.class, resultList, mapDropDown);
+    }
+
+    @GetMapping("/export-excel-senior")
+    @Operation(summary = "导出上架申请主 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:putaway-request-main:export')")
+    @OperateLog(type = EXPORT)
+    public void exportPutawayRequestMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<PutawayRequestMainDO> list = putawayRequestMainService.getPutawayRequestMainList(conditions);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<PutawayRequestMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "上架申请主.xls", "上架申请数据", PutawayRequestMainExcelVO.class, resultList, mapDropDown);
+    }
+
+    private List<PutawayRequestMainExcelVO> getExcelVo(List<PutawayRequestMainDO> list, Map<Integer, String[]> mapDropDown) {
+        String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE);
+        mapDropDown.put(6, locationType);
+        String[] requestStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.REQUEST_STATUS);
+        mapDropDown.put(11, requestStatus);
+        String[] inspectType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INSPECT_TYPE);
+        mapDropDown.put(15, inspectType);
+        String[] nextAction = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.NEXT_ACTION);
+        mapDropDown.put(16, nextAction);
+        String[] sampleMethod = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SAMPLE_METHOD);
+        mapDropDown.put(17, sampleMethod);
+        String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
+        mapDropDown.put(18, uom);
+        String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
+        mapDropDown.put(28, inventoryStatus);
         // 导出 Excel
-        List<PutawayRequestMainExcelVO> datas = PutawayRequestMainConvert.INSTANCE.convertList02(list);
+        List<PutawayRequestMainExcelVO> resultList = new ArrayList<>();
-        for(PutawayRequestMainExcelVO vo : datas) {
+        for(PutawayRequestMainDO mainDO : list) {
+            List<PutawayRequestDetailDO> subList = putawayRequestDetailService.selectList(mainDO.getId());
+            for(PutawayRequestDetailDO detailDO : subList) {
+                PutawayRequestMainExcelVO vo = PutawayRequestMainConvert.INSTANCE.convert(mainDO, detailDO);
                 AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
                 //后端创建个字段作为前端展示的虚拟字段
                 vo.setCreator(user.getNickname());
+                resultList.add(vo);
             }
-        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        }
-        String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
+        return resultList;
-        mapDropDown.put(8, inventoryStatus);
-        String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
-        mapDropDown.put(10, uom);
-        ExcelUtils.write(response, "上架申请主.xls", "数据", PutawayRequestMainExcelVO.class, datas,mapDropDown);
     }
 
     @GetMapping("/get-import-template")
@@ -165,7 +193,6 @@ public class PutawayRequestMainController {
         return success(result);
     }
 
-
     @PostMapping("/import")
     @Operation(summary = "导入上架申请基本信息")
     @Parameters({

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestMainExcelVO.java

@@ -1,17 +1,13 @@
 package com.win.module.wms.controller.putawayRequest.vo;
 
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
-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 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;
 
 
 /**
@@ -29,7 +25,7 @@ public class PutawayRequestMainExcelVO {
     private String fromWarehouseCode;
 
     @ExcelProperty(value = "从库位类型范围", converter = DictConvert.class)
-    @DictFormat("location_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    @DictFormat(DictTypeConstants.LOCATION_TYPE)
     private String fromLocationTypes;
 
     @ExcelProperty("从库区代码范围")
@@ -44,13 +40,6 @@ public class PutawayRequestMainExcelVO {
     @ExcelProperty("备注")
     private String remark;
 
-    @ExcelProperty("创建时间")
-    @ColumnWidth(value = 16)
-    private LocalDateTime createTime;
-
-    @ExcelProperty("创建者用户名")
-    private String creator;
-
     @ExcelProperty("申请时间")
     private LocalDateTime requestTime;
 
@@ -61,20 +50,14 @@ public class PutawayRequestMainExcelVO {
     private String departmentCode;
 
     @ExcelProperty(value = "状态", converter = DictConvert.class)
-    @DictFormat("request_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    @DictFormat(DictTypeConstants.REQUEST_STATUS)
     private String status;
 
-    @ExcelProperty("最后更新时间")
-    private LocalDateTime updateTime;
-
-    @ExcelProperty("最后更新者用户名")
-    private String updater;
-
     @ExcelProperty("到仓库代码")
     private String toWarehouseCode;
 
     @ExcelProperty(value = "到库位类型范围", converter = DictConvert.class)
-    @DictFormat("location_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    @DictFormat(DictTypeConstants.LOCATION_TYPE)
     private String toLocationTypes;
 
     @ExcelProperty("到库区代码范围")
@@ -92,8 +75,66 @@ public class PutawayRequestMainExcelVO {
     @ExcelProperty("直接生成记录")
     private String directCreateRecord;
 
+    @ExcelProperty("包装号")
+    private String packingNumber;
+
+    @ExcelProperty("器具号")
+    private String containerNumber;
+
+    @ExcelProperty("批次")
+    private String batch;
+
+    @ExcelProperty(value = "库存状态", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.INVENTORY_STATUS)
+    private String inventoryStatus;
 
+    @ExcelProperty("订单号")
+    private String poNumber;
 
+    @ExcelProperty("订单行")
+    private String poLine;
 
+    @ExcelProperty("从库位代码")
+    private String fromLocationCode;
+
+    @ExcelProperty("物品代码")
+    private String itemCode;
+
+    @ExcelProperty("物品名称")
+    private String itemName;
+
+    @ExcelProperty("物品描述1")
+    private String itemDesc1;
+
+    @ExcelProperty("物品描述2")
+    private String itemDesc2;
+
+    @ExcelProperty("项目代码")
+    private String projectCode;
+
+    @ExcelProperty("数量")
+    private BigDecimal qty;
+
+    @ExcelProperty(value = "计量单位", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.UOM)
+    private String uom;
+
+    @ExcelProperty("从货主代码")
+    private String fromOwnerCode;
+
+    @ExcelProperty("到货主代码")
+    private String toOwnerCode;
+
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ExcelProperty("创建者用户名")
+    private String creator;
+
+    @ExcelProperty("最后更新时间")
+    private LocalDateTime updateTime;
+
+    @ExcelProperty("最后更新者用户名")
+    private String updater;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/putawayRequest/PutawayRequestMainConvert.java

@@ -1,16 +1,15 @@
 package com.win.module.wms.convert.putawayRequest;
 
-import java.util.*;
-
 import com.win.framework.common.pojo.PageResult;
-
 import com.win.module.wms.controller.putawayRequest.vo.*;
 import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestDetailDO;
+import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestMainDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Mappings;
 import org.mapstruct.factory.Mappers;
-import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestMainDO;
+
+import java.util.List;
 
 /**
  * 上架申请主 Convert
@@ -39,4 +38,13 @@ public interface PutawayRequestMainConvert {
             @Mapping(source = "createReqVO.number", target = "number"),
     })
     PutawayRequestImportErrorVO convert(PutawayRequestMainCreateReqVO createReqVO, PutawayRequestDetailDO detailDO);
+    @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"),
+    })
+    PutawayRequestMainExcelVO convert(PutawayRequestMainDO mainDO, PutawayRequestDetailDO detailDO);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestDetailMapper.java

@@ -1,17 +1,17 @@
 package com.win.module.wms.dal.mysql.putawayRequest;
 
-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.putawayRequest.vo.PutawayRequestDetailExportReqVO;
 import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 上架申请子 Mapper
  *
@@ -46,9 +46,11 @@ public interface PutawayRequestDetailMapper extends BaseMapperX<PutawayRequestDe
                 .eqIfPresent(PutawayRequestDetailDO::getToOwnerCode, reqVO.getToOwnerCode())
                 .orderByDesc(PutawayRequestDetailDO::getId));
     }
+
     default PageResult<PutawayRequestDetailDO> selectSenior(CustomConditions conditions) {
         return selectPage(conditions, QueryWrapperUtils.structure(conditions));
     }
+
     default List<PutawayRequestDetailDO> selectList(PutawayRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<PutawayRequestDetailDO>()
                 .eqIfPresent(PutawayRequestDetailDO::getMasterId, reqVO.getMasterId())
@@ -77,4 +79,9 @@ public interface PutawayRequestDetailMapper extends BaseMapperX<PutawayRequestDe
                 .orderByDesc(PutawayRequestDetailDO::getId));
     }
 
+    default List<PutawayRequestDetailDO> selectList(Long masterId) {
+        return selectList(new LambdaQueryWrapperX<PutawayRequestDetailDO>()
+                .eq(PutawayRequestDetailDO::getMasterId, masterId));
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestMainMapper.java

@@ -1,17 +1,17 @@
 package com.win.module.wms.dal.mysql.putawayRequest;
 
-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.putawayRequest.vo.PutawayRequestMainExportReqVO;
 import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestMainPageReqVO;
 import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 上架申请主 Mapper
  *
@@ -54,9 +54,11 @@ public interface PutawayRequestMainMapper extends BaseMapperX<PutawayRequestMain
                 .eqIfPresent(PutawayRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
                 .orderByDesc(PutawayRequestMainDO::getId));
     }
+
     default PageResult<PutawayRequestMainDO> selectSenior(CustomConditions conditions) {
         return selectPage(conditions, QueryWrapperUtils.structure(conditions));
     }
+
     default List<PutawayRequestMainDO> selectList(PutawayRequestMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<PutawayRequestMainDO>()
                 .eqIfPresent(PutawayRequestMainDO::getSupplierCode, reqVO.getSupplierCode())
@@ -92,7 +94,12 @@ public interface PutawayRequestMainMapper extends BaseMapperX<PutawayRequestMain
                 .orderByDesc(PutawayRequestMainDO::getId));
     }
 
-    default PutawayRequestMainDO selectSupplierCode(String supplierCode){
+    default List<PutawayRequestMainDO> selectSeniorList(CustomConditions conditions) {
-        return selectOne(PutawayRequestMainDO::getSupplierCode,supplierCode);
+        return selectList(QueryWrapperUtils.structure(conditions));
-    };
+    }
+
+    default PutawayRequestMainDO selectByNumber(String number) {
+        return selectOne(PutawayRequestMainDO::getNumber, number);
+    }
+
 }

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

@@ -7,7 +7,6 @@ import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO;
 
 import javax.validation.Valid;
 import java.math.BigDecimal;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 
@@ -48,14 +47,6 @@ public interface InspectRequestMainService {
      */
     InspectRequestMainDO getInspectRequestMain(Long id);
 
-    /**
-     * 获得检验申请主列表
-     *
-     * @param ids 编号
-     * @return 检验申请主列表
-     */
-    List<InspectRequestMainDO> getInspectRequestMainList(Collection<Long> ids);
-
     /**
      * 获得检验申请主分页
      *

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

@@ -61,7 +61,6 @@ import javax.annotation.Resource;
 import javax.validation.Validator;
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 
@@ -169,11 +168,6 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
         return inspectRequestMainMapper.selectById(id);
     }
 
-    @Override
-    public List<InspectRequestMainDO> getInspectRequestMainList(Collection<Long> ids) {
-        return inspectRequestMainMapper.selectBatchIds(ids);
-    }
-
     @Override
     public PageResult<InspectRequestMainDO> getInspectRequestMainPage(InspectRequestMainPageReqVO pageReqVO) {
         return inspectRequestMainMapper.selectPage(pageReqVO);
@@ -573,16 +567,12 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
      */
     private String validatorInspectRequestDetailImport(InspectRequestDetailDO detailDo, InspectRequestMainDO mainDo, BusinesstypeDO businesstypeDO) {
         StringBuilder message = new StringBuilder();
-        ItembasicDO itembasicDO = null;
         try {
-            itembasicDO = validatorItembasic(detailDo.getItemCode());
+            ItembasicDO itembasicDO = validatorItembasic(detailDo.getItemCode());
             detailDo.setItemDesc1(itembasicDO.getDesc1());
             detailDo.setItemDesc2(itembasicDO.getDesc2());
             detailDo.setItemName(itembasicDO.getName());
             detailDo.setProjectCode(itembasicDO.getProject());
-        } catch (Exception ex) {
-            message.append(ex.getMessage()).append(",");
-        }
             try {
                 this.ifUomSuccess(itembasicDO.getUom(), detailDo.getUom());
             } catch (Exception ex) {
@@ -593,6 +583,9 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
             }catch (Exception ex) {
                 message.append(ex.getMessage()).append(",");
             }
+        } catch (Exception ex) {
+            message.append(ex.getMessage()).append(",");
+        }
         try {
             this.validatorLocation(detailDo.getFromLocationCode());
         } catch (Exception ex) {

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

@@ -1,15 +1,15 @@
 package com.win.module.wms.service.putawayRequest;
 
-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.putawayRequest.vo.PutawayRequestDetailCreateReqVO;
 import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailExportReqVO;
 import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailPageReqVO;
 import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailUpdateReqVO;
 import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestDetailDO;
-import com.win.framework.common.pojo.PageResult;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 上架申请子 Service 接口
@@ -56,12 +56,12 @@ public interface PutawayRequestDetailService {
     PutawayRequestDetailDO getPutawayRequestDetail(Long id);
 
     /**
-     * 获得上架申请子列表
+     * 获得上架申请子
      *
-     * @param ids 编号
+     * @param masterId 父id
-     * @return 上架申请子列表
+     * @return 检验申请子列表
      */
-    List<PutawayRequestDetailDO> getPutawayRequestDetailList(Collection<Long> ids);
+    List<PutawayRequestDetailDO> selectList(Long masterId);
 
     /**
      * 获得上架申请子分页

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

@@ -1,20 +1,22 @@
 package com.win.module.wms.service.putawayRequest;
 
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailCreateReqVO;
 import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailExportReqVO;
 import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailPageReqVO;
 import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailUpdateReqVO;
-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.putawayRequest.PutawayRequestDetailDO;
-import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.convert.putawayRequest.PutawayRequestDetailConvert;
+import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestDetailDO;
 import com.win.module.wms.dal.mysql.putawayRequest.PutawayRequestDetailMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+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.PUTAWAY_REQUEST_DETAIL_NOT_EXISTS;
 
 /**
  * 上架申请子 Service 实现类
@@ -69,8 +71,8 @@ public class PutawayRequestDetailServiceImpl implements PutawayRequestDetailServ
     }
 
     @Override
-    public List<PutawayRequestDetailDO> getPutawayRequestDetailList(Collection<Long> ids) {
+    public List<PutawayRequestDetailDO> selectList(Long masterId) {
-        return putawayRequestDetailMapper.selectBatchIds(ids);
+        return putawayRequestDetailMapper.selectList(masterId);
     }
 
     @Override

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

@@ -1,10 +1,12 @@
 package com.win.module.wms.service.putawayRequest;
-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.putawayRequest.vo.*;
 import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestMainDO;
-import com.win.framework.common.pojo.PageResult;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 上架申请主 Service 接口
@@ -51,14 +53,6 @@ public interface PutawayRequestMainService {
      */
     PageResult<PutawayRequestMainDO> getPutawayRequestMainSenior(CustomConditions conditions);
 
-    /**
-     * 获得上架申请主列表
-     *
-     * @param ids 编号
-     * @return 上架申请主列表
-     */
-    List<PutawayRequestMainDO> getPutawayRequestMainList(Collection<Long> ids);
-
     /**
      * 获得上架申请主分页
      *
@@ -75,6 +69,14 @@ public interface PutawayRequestMainService {
      */
     List<PutawayRequestMainDO> getPutawayRequestMainList(PutawayRequestMainExportReqVO exportReqVO);
 
-    public List<PutawayRequestImportErrorVO>  importPutawayRequestList(List<PutawayRequestMainCreateReqVO> datas, Integer mode, boolean updatePart);
+    List<PutawayRequestImportErrorVO>  importPutawayRequestList(List<PutawayRequestMainCreateReqVO> datas, Integer mode, boolean updatePart);
+
+    /**
+     * 获得采购收货申请主列表, 用于 Excel 导出
+     *
+     * @param conditions 查询条件
+     * @return 采购收货申请主列表
+     */
+    List<PutawayRequestMainDO> getPutawayRequestMainList(CustomConditions conditions);
 
 }

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

@@ -2,6 +2,7 @@ package com.win.module.wms.service.putawayRequest;
 
 import cn.hutool.core.collection.CollUtil;
 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;
@@ -10,13 +11,16 @@ import com.win.module.system.api.serialnumber.SerialNumberApi;
 import com.win.module.system.enums.serialNumber.RuleCodeEnum;
 import com.win.module.wms.controller.putawayRequest.vo.*;
 import com.win.module.wms.convert.putawayRequest.PutawayRequestDetailConvert;
+import com.win.module.wms.convert.putawayRequest.PutawayRequestMainConvert;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.location.LocationDO;
 import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO;
 import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestDetailDO;
+import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestMainDO;
 import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
 import com.win.module.wms.dal.mysql.putawayRequest.PutawayRequestDetailMapper;
+import com.win.module.wms.dal.mysql.putawayRequest.PutawayRequestMainMapper;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.enums.request.RequestStatusEnum;
 import com.win.module.wms.service.customer.CustomerService;
@@ -26,20 +30,14 @@ import com.win.module.wms.service.purchase.PurchaseMainService;
 import com.win.module.wms.service.requestsetting.RequestsettingService;
 import com.win.module.wms.util.JobUtils;
 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.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
-
+import java.util.List;
-import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestMainDO;
-import com.win.framework.common.pojo.PageResult;
-
-import com.win.module.wms.convert.putawayRequest.PutawayRequestMainConvert;
-import com.win.module.wms.dal.mysql.putawayRequest.PutawayRequestMainMapper;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.win.module.wms.enums.ErrorCodeConstants.*;
@@ -131,10 +129,6 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
     public PageResult<PutawayRequestMainDO> getPutawayRequestMainSenior(CustomConditions conditions) {
         return putawayRequestMainMapper.selectSenior(conditions);
     }
-    @Override
-    public List<PutawayRequestMainDO> getPutawayRequestMainList(Collection<Long> ids) {
-        return putawayRequestMainMapper.selectBatchIds(ids);
-    }
 
     @Override
     public PageResult<PutawayRequestMainDO> getPutawayRequestMainPage(PutawayRequestMainPageReqVO pageReqVO) {
@@ -146,6 +140,11 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
         return putawayRequestMainMapper.selectList(exportReqVO);
     }
 
+    @Override
+    public List<PutawayRequestMainDO> getPutawayRequestMainList(CustomConditions conditions) {
+        return putawayRequestMainMapper.selectSeniorList(conditions);
+    }
+
     @Override
     @Transactional
     public List<PutawayRequestImportErrorVO> importPutawayRequestList(List<PutawayRequestMainCreateReqVO> datas, Integer mode, boolean updatePart) {
@@ -222,6 +221,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
         mainDo.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord());
         return mainDo;
     }
+
     //校验子表公共方法(适用于新增/修改)
     private void validatorDetailMethod(PutawayRequestDetailDO detailDo, PutawayRequestMainDO mainDo, BusinesstypeDO businesstypeDO) {
         ItembasicDO itembasicDO = validatorItembasic(detailDo.getItemCode());
@@ -250,8 +250,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
         StringBuilder message = new StringBuilder();
         if (businesstypeDO == null) {
             message.append("根据业务类型设置未查找到采购退货申请的相关业务类型");
-        }
+        } else {
-        else {
             mainDo.setBusinessType(businesstypeDO.getCode());
             mainDo.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
             mainDo.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
@@ -259,8 +258,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
         RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("PutawayRequest");
         if (requestsettingDO == null) {
             message.append("根据申请单设置未查找到采购退货申请的相关业务类型");
-        }
+        } else {
-        else {
             mainDo.setAutoAgree(requestsettingDO.getAutoAgree());
             mainDo.setAutoCommit(requestsettingDO.getAutoCommit());
             mainDo.setAutoExecute(requestsettingDO.getAutoExecute());
@@ -311,7 +309,6 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
         } catch (Exception ex) {
             message.append(ex.getMessage()).append(",");
         }
-
         try {
             validatorIfOutInventoryStatuses(detailDo.getInventoryStatus(), businesstypeDO);
         } catch (Exception ex) {
@@ -342,6 +339,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
             throw exception(ITEMBASIC_CODE_EXISTS, "提示单位" + uom + "错误，应该是" + itemUom);
         }
     }
+
     private ItembasicDO validatorItembasic(String itemCode) {
         return itembasicService.selectItembasic(itemCode);
     }
@@ -353,6 +351,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
     private LocationDO validatorLocation(String fromLocationCode) {
         return locationService.selectLocation(fromLocationCode);
     }
+
     private void validatorIfInType(String type, BusinesstypeDO businesstypeDO) {
         jobUtils.ifInType(type, businesstypeDO);
     }
@@ -364,6 +363,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
     private void validatorIfInToLocationType(String fromLocationCode, BusinesstypeDO businesstypeDO) {
         jobUtils.ifInType(fromLocationCode, businesstypeDO);
     }
+
     private void validatorManagementAccuracy(String itemCode, String packingNumber, String batch, String fromLocationCode, List<String> inventoryStatus) {
         jobUtils.selectlocationReturnManagementAccuracy(itemCode, packingNumber, batch, fromLocationCode, inventoryStatus);
     }