佰穗莱单据工具类封装、转换单/多类型单据方法封装

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/service/impl/BionutritionDocHeaderServiceImpl.java

@@ -54,22 +54,10 @@ public class BionutritionDocHeaderServiceImpl extends CrudServiceImpl<Bionutriti
     }
 
     /**
-     * 构建类型单据内容(单个)
-     * @param bionutritionDocHeaderDTO
+     * 构建类型单据内容(多个)
+     * @param docNoList
      * @return
      */
-    public BionutritionDocBaseDTO buildBionutritionDocBaseDTO(BionutritionDocHeaderDTO bionutritionDocHeaderDTO){
-        BionutritionDocHeaderBaseDTO bionutritionDocHeaderBaseDTO = BionutritionDocUtil.buildBionutritionDocHeaderDTO(bionutritionDocHeaderDTO);
-        List<BionutritionDocDetailsDTO> bionutritionDocDetailsDTOList = bionutritionDocDetailsService.getBionutritionDocDetailsDTOList(
-                bionutritionDocHeaderBaseDTO.getId());
-        List<BionutritionDocDetailsBaseDTO> bionutritionDocDetailsBaseDTOList = BionutritionDocUtil.buildBionutritionDocDetailsDTOList(
-                bionutritionDocHeaderDTO.getDocType(), bionutritionDocDetailsDTOList);
-        BionutritionDocBaseDTO bionutritionDocBaseDTO = new BionutritionDocBaseDTO();
-        bionutritionDocBaseDTO.setBionutritionDocHeaderBaseDTO(bionutritionDocHeaderBaseDTO);
-        bionutritionDocBaseDTO.setBionutritionDocDetailsBaseDTOList(bionutritionDocDetailsBaseDTOList);
-        return bionutritionDocBaseDTO;
-    }
-
     public List<BionutritionDocBaseDTO> buildBionutritionDocBaseDTOByDocNoList(List<String> docNoList){
         List<BionutritionDocHeaderDTO> bionutritionDocHeaderDTOList = getBionutritionDocHeaderDTOListByDocNo(docNoList);
         List<String> docTypeList = bionutritionDocHeaderDTOList.stream().map(item -> item.getDocType()).distinct().collect(Collectors.toList());
@@ -77,6 +65,11 @@ public class BionutritionDocHeaderServiceImpl extends CrudServiceImpl<Bionutriti
                 buildBionutritionDocDifferentTypeList(bionutritionDocHeaderDTOList) : buildBionutritionDocSameTypeList(bionutritionDocHeaderDTOList);
     }
 
+    /**
+     * 构建类型单据内容(多个)
+     * @param idList
+     * @return
+     */
     public List<BionutritionDocBaseDTO> buildBionutritionDocBaseDTOByIdList(List<String> idList){
         List<BionutritionDocHeaderDTO> bionutritionDocHeaderDTOList = getBionutritionDocHeaderDTOList(idList);
         List<String> docTypeList = bionutritionDocHeaderDTOList.stream().map(item -> item.getDocType()).distinct().collect(Collectors.toList());
@@ -84,12 +77,29 @@ public class BionutritionDocHeaderServiceImpl extends CrudServiceImpl<Bionutriti
                 buildBionutritionDocDifferentTypeList(bionutritionDocHeaderDTOList) : buildBionutritionDocSameTypeList(bionutritionDocHeaderDTOList);
     }
 
+    /**
+     * 构建类型单据内容(单个)
+     * @param bionutritionDocHeaderDTO
+     * @return
+     */
+    private BionutritionDocBaseDTO buildBionutritionDocBaseDTO(BionutritionDocHeaderDTO bionutritionDocHeaderDTO){
+        BionutritionDocHeaderBaseDTO bionutritionDocHeaderBaseDTO = BionutritionDocUtil.buildBionutritionDocHeaderDTO(bionutritionDocHeaderDTO);
+        List<BionutritionDocDetailsDTO> bionutritionDocDetailsDTOList = bionutritionDocDetailsService.getBionutritionDocDetailsDTOList(
+                bionutritionDocHeaderBaseDTO.getId());
+        List<BionutritionDocDetailsBaseDTO> bionutritionDocDetailsBaseDTOList = BionutritionDocUtil.buildBionutritionDocDetailsDTOList(
+                bionutritionDocHeaderDTO.getDocType(), bionutritionDocDetailsDTOList);
+        BionutritionDocBaseDTO bionutritionDocBaseDTO = new BionutritionDocBaseDTO();
+        bionutritionDocBaseDTO.setBionutritionDocHeaderBaseDTO(bionutritionDocHeaderBaseDTO);
+        bionutritionDocBaseDTO.setBionutritionDocDetailsBaseDTOList(bionutritionDocDetailsBaseDTOList);
+        return bionutritionDocBaseDTO;
+    }
+
     /**
      * 构建类型单据内容(多个 相同类型单据)
      * @param bionutritionDocHeaderDTOList
      * @return
      */
-    public List<BionutritionDocBaseDTO> buildBionutritionDocSameTypeList(List<BionutritionDocHeaderDTO> bionutritionDocHeaderDTOList){
+    private List<BionutritionDocBaseDTO> buildBionutritionDocSameTypeList(List<BionutritionDocHeaderDTO> bionutritionDocHeaderDTOList){
         List<BionutritionDocHeaderBaseDTO> bionutritionDocHeaderBaseDTOList = BionutritionDocUtil.buildBionutritionDocHeaderDTOList(bionutritionDocHeaderDTOList);
         List<BionutritionDocDetailsDTO> bionutritionDocDetailsDTOList = bionutritionDocDetailsService.getBionutritionDocDetailsDTOList(
                 bionutritionDocHeaderDTOList.stream().map(BionutritionDocHeaderDTO::getDocNo).collect(Collectors.toList()));
@@ -111,7 +121,7 @@ public class BionutritionDocHeaderServiceImpl extends CrudServiceImpl<Bionutriti
      * @param bionutritionDocHeaderDTOList
      * @return
      */
-    public List<BionutritionDocBaseDTO> buildBionutritionDocDifferentTypeList(List<BionutritionDocHeaderDTO> bionutritionDocHeaderDTOList){
+    private List<BionutritionDocBaseDTO> buildBionutritionDocDifferentTypeList(List<BionutritionDocHeaderDTO> bionutritionDocHeaderDTOList){
         Map<String, List<BionutritionDocHeaderBaseDTO>> bionutritionDocHeaderMap = BionutritionDocUtil.buildBionutritionDocHeaderDTOByDocTypeMap(bionutritionDocHeaderDTOList);
         List<BionutritionDocDetailsDTO> bionutritionDocDetailsDTOList = bionutritionDocDetailsService.getBionutritionDocDetailsDTOList(
                 bionutritionDocHeaderDTOList.stream().map(BionutritionDocHeaderDTO::getDocNo).collect(Collectors.toList()));