CoDelServiceImpl拆分

src/main/java/com/xujie/sys/modules/ecss/controller/CoDelController.java

@@ -4,6 +4,7 @@ import com.xujie.sys.common.utils.PageUtils;
 import com.xujie.sys.common.utils.R;
 import com.xujie.sys.modules.ecss.data.*;
 import com.xujie.sys.modules.ecss.entity.*;
+import com.xujie.sys.modules.ecss.service.CoDelExcelService;
 import com.xujie.sys.modules.ecss.service.CoDelService;
 import com.xujie.sys.modules.part.entity.PartInformationEntity;
 import com.xujie.sys.modules.part.entity.PartSubPropertiesValue;
@@ -26,6 +27,9 @@ public class CoDelController {
     @Autowired
     private CoDelService coDelService;
 
+    @Autowired
+    private CoDelExcelService coDelExcelService;
+
     @Autowired
     private PartInformationService partInformationService;
 
@@ -62,7 +66,7 @@ public class CoDelController {
 
     @PostMapping("/previewExcel")
     public R previewExcel(@RequestParam(value = "file") MultipartFile file, @ModelAttribute EcssCoDelNotifyHeaderData data){
-        Map<String, Object> result = coDelService.previewExcel(file, data);
+        Map<String, Object> result = coDelExcelService.previewExcel(file, data);
         return R.ok()
             .put("data", result.get("previewList"))
             .put("sheetErrors", result.get("sheetErrors"))
@@ -75,13 +79,13 @@ public class CoDelController {
                                        @ModelAttribute EcssCoDelNotifyHeaderData data,
                                        @RequestParam(value = "deletedInvoices", required = false) String deletedInvoices,
                                        HttpServletRequest request){
-        Map<String, List<String>> resultMap = coDelService.saveEcssCoDelNotifyByExcel(file, data, deletedInvoices, request);
+        Map<String, List<String>> resultMap = coDelExcelService.saveEcssCoDelNotifyByExcel(file, data, deletedInvoices, request);
         return R.ok().put("resultMap", resultMap);
     }
 
     @PostMapping("/modifyNotifyDetailByExcel")
     public R modifyNotifyDetailByExcel(@RequestParam(value = "file") MultipartFile file, @ModelAttribute EcssCoDelNotifyHeaderData data){
-        coDelService.modifyNotifyDetailByExcel(file, data);
+        coDelExcelService.modifyNotifyDetailByExcel(file, data);
         return R.ok();
     }
 
@@ -301,7 +305,7 @@ public class CoDelController {
     public R saveCoDelPalletDataByExcel(@RequestParam(value = "file") MultipartFile file,
                                        @RequestParam(value = "palletRecords", required = false) String palletRecords,
                                        @ModelAttribute EcssCoDelNotifyHeaderData data){
-        coDelService.saveCoDelPalletDataByExcel(file, data, palletRecords);
+        coDelExcelService.saveCoDelPalletDataByExcel(file, data, palletRecords);
         return R.ok();
     }
 
@@ -451,47 +455,47 @@ public class CoDelController {
 
     @PostMapping("/downloadDeclarationElements")
     public void downloadDeclarationElements(HttpServletResponse response, @RequestBody EcssDeclarationHeaderData data) {
-        coDelService.downloadDeclarationElements(response, data);
+        coDelExcelService.downloadDeclarationElements(response, data);
     }
 
     @PostMapping("/downloadDeclaration")
     public void downloadDeclaration(HttpServletResponse response, @RequestBody EcssDeclarationHeaderData data) {
-        coDelService.downloadDeclaration(response, data);
+        coDelExcelService.downloadDeclaration(response, data);
     }
 
     @PostMapping("/downloadInvoice")
     public void downloadInvoice(HttpServletResponse response, @RequestBody EcssDeclarationHeaderData data) {
-        coDelService.downloadInvoice(response, data);
+        coDelExcelService.downloadInvoice(response, data);
     }
 
     @PostMapping("/downloadPackingList")
     public void downloadPackingList(HttpServletResponse response, @RequestBody EcssDeclarationHeaderData data) {
-        coDelService.downloadPackingList(response, data);
+        coDelExcelService.downloadPackingList(response, data);
     }
 
     @PostMapping("/exportPackingTemplate")
     public void exportPackingTemplate(HttpServletResponse response, @RequestBody EcssCoDelNotifyHeaderData data) {
-        coDelService.exportPackingTemplate(response, data);
+        coDelExcelService.exportPackingTemplate(response, data);
     }
 
     @PostMapping("/downloadExportGoods")
     public void downloadExportGoods(HttpServletResponse response, @RequestBody EcssDeclarationHeaderData data) {
-        coDelService.downloadExportGoods(response, data);
+        coDelExcelService.downloadExportGoods(response, data);
     }
 
     @PostMapping("/downloadContract")
     public void downloadContract(HttpServletResponse response, @RequestBody EcssDeclarationHeaderData data) {
-        coDelService.downloadContract(response, data);
+        coDelExcelService.downloadContract(response, data);
     }
 
     @PostMapping("/downloadAll")
     public void downloadAll(HttpServletResponse response, @RequestBody EcssDeclarationHeaderData data) {
-        coDelService.downloadAll(response, data);
+        coDelExcelService.downloadAll(response, data);
     }
 
     @PostMapping("/downloadAllPdf")
     public void downloadAllPdf(HttpServletResponse response, @RequestBody EcssDeclarationHeaderData data) {
-        coDelService.downloadAllPdf(response, data);
+        coDelExcelService.downloadAllPdf(response, data);
     }
 
     @PostMapping("/saveOneClickPacking")
@@ -546,7 +550,7 @@ public class CoDelController {
 
     @PostMapping("/saveWalMartOrderByExcel")
     public R saveWalMartOrderByExcel(@RequestParam(value = "file") MultipartFile file, @ModelAttribute EcssWalMartOrder data){
-        String msg = coDelService.saveWalMartOrderByExcel(file, data);
+        String msg = coDelExcelService.saveWalMartOrderByExcel(file, data);
         return R.ok().put("errorMsg", msg);
     }
 
@@ -677,7 +681,7 @@ public class CoDelController {
             }
 
             boolean isPreviewOnly = "true".equalsIgnoreCase(previewOnly);
-            Map<String, Object> result = coDelService.importPartPackageProperties(file, buNo, username, isPreviewOnly);
+            Map<String, Object> result = coDelExcelService.importPartPackageProperties(file, buNo, username, isPreviewOnly);
 
             if (isPreviewOnly) {
                 // 预览模式：返回预览数据

src/main/java/com/xujie/sys/modules/ecss/service/CoDelExcelService.java

@@ -0,0 +1,50 @@
+package com.xujie.sys.modules.ecss.service;
+
+import com.xujie.sys.modules.ecss.data.*;
+import com.xujie.sys.modules.ecss.entity.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+public interface CoDelExcelService {
+
+
+    Map<String, Object> previewExcel(MultipartFile file, EcssCoDelNotifyHeaderData data);
+    Map<String, List<String>> saveEcssCoDelNotifyByExcel(MultipartFile file,  EcssCoDelNotifyHeaderData data, String deletedInvoices, HttpServletRequest request);
+    void saveCoDelPalletDataByExcel(MultipartFile file,  EcssCoDelNotifyHeaderData data, String palletRecords);
+
+    void downloadDeclarationElements(HttpServletResponse response, EcssDeclarationHeaderData data);
+
+    void downloadDeclaration(HttpServletResponse response, EcssDeclarationHeaderData data);
+
+    void downloadInvoice(HttpServletResponse response, EcssDeclarationHeaderData data);
+
+    void downloadPackingList(HttpServletResponse response, EcssDeclarationHeaderData data);
+
+    void exportPackingTemplate(HttpServletResponse response, EcssCoDelNotifyHeaderData data);
+
+    void downloadExportGoods(HttpServletResponse response, EcssDeclarationHeaderData data);
+
+    void downloadContract(HttpServletResponse response, EcssDeclarationHeaderData data);
+
+    void downloadAll(HttpServletResponse response, EcssDeclarationHeaderData data);
+
+    void downloadAllPdf(HttpServletResponse response, EcssDeclarationHeaderData data);
+
+    String saveWalMartOrderByExcel(MultipartFile file,  EcssWalMartOrder data);
+
+    void modifyNotifyDetailByExcel(MultipartFile file, EcssCoDelNotifyHeaderData inData);
+
+    /**
+     * @Description 导入物料包装属性（每卷数量、每箱卷数、每卷重量、箱重量、箱类型）
+     * @param file Excel文件
+     * @param buNo 业务单元编码
+     * @param username 用户名
+     * @param previewOnly 是否仅预览
+     * @return 预览数据或导入结果
+     */
+    Map<String, Object> importPartPackageProperties(MultipartFile file, String buNo, String username, boolean previewOnly);
+}

src/main/java/com/xujie/sys/modules/ecss/service/CoDelService.java

@@ -4,16 +4,9 @@ import com.xujie.sys.common.utils.PageUtils;
 import com.xujie.sys.modules.ecss.data.*;
 import com.xujie.sys.modules.ecss.entity.*;
 
-import com.xujie.sys.modules.part.entity.ComponentPartData;
 import com.xujie.sys.modules.part.entity.PartInformationEntity;
 import com.xujie.sys.modules.part.entity.PartSubPropertiesValue;
 import com.xujie.sys.modules.part.entity.PartSubPropertiesValueData;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -23,8 +16,6 @@ public interface CoDelService {
     PageUtils searchEcssCoDelNotifyHeaderForCK(EcssCoDelNotifyHeaderData data);
     PageUtils searchEcssCoDelNotifyHeaderForDanZheng(EcssCoDelNotifyHeaderData data);
     List<EcssCoDelNotifyDetailData> searchEcssCoDelNotifyDetail(EcssCoDelNotifyHeaderData data);
-    Map<String, Object> previewExcel(MultipartFile file, EcssCoDelNotifyHeaderData data);
-    Map<String, List<String>> saveEcssCoDelNotifyByExcel(MultipartFile file,  EcssCoDelNotifyHeaderData data, String deletedInvoices, HttpServletRequest request);
 
     void updateEcssDelHeader(EcssCoDelNotifyHeaderData data);
 
@@ -84,8 +75,6 @@ public interface CoDelService {
 
     //void deleteEmptyBoxAfterDetailDelete(EcssCoDelPalletData detailData);
 
-    void saveCoDelPalletDataByExcel(MultipartFile file,  EcssCoDelNotifyHeaderData data, String palletRecords);
-
     List<EcssCoDelPalletHeaderData> searchEcssCoDelPalletHeaderData(EcssCoDelNotifyHeaderData inData);
 
 
@@ -129,24 +118,6 @@ public interface CoDelService {
 
     List<Map> searchPackageList(EcssParamData data);
 
-    void downloadDeclarationElements(HttpServletResponse response, EcssDeclarationHeaderData data);
-
-    void downloadDeclaration(HttpServletResponse response, EcssDeclarationHeaderData data);
-
-    void downloadInvoice(HttpServletResponse response, EcssDeclarationHeaderData data);
-
-    void downloadPackingList(HttpServletResponse response, EcssDeclarationHeaderData data);
-
-    void exportPackingTemplate(HttpServletResponse response, EcssCoDelNotifyHeaderData data);
-
-    void downloadExportGoods(HttpServletResponse response, EcssDeclarationHeaderData data);
-
-    void downloadContract(HttpServletResponse response, EcssDeclarationHeaderData data);
-
-    void downloadAll(HttpServletResponse response, EcssDeclarationHeaderData data);
-
-    void downloadAllPdf(HttpServletResponse response, EcssDeclarationHeaderData data);
-
     List<Map> getNotifyPartDetail(EcssDeclarationHeaderData inData);
 
     void saveOneClickPacking(EcssCoDelPalletHeaderData inData);
@@ -165,8 +136,6 @@ public interface CoDelService {
 
     PageUtils searchWalMartOrderData(EcssWalMartOrder data);
 
-    String saveWalMartOrderByExcel(MultipartFile file,  EcssWalMartOrder data);
-
     void saveWalMartOrderData(EcssWalMartOrder data);
 
     void deleteWalMartOrder(EcssWalMartOrder data);
@@ -175,10 +144,8 @@ public interface CoDelService {
 
     PageUtils queryPartListAll(PartInformationEntity data);
 
-    void modifyNotifyDetailByExcel(MultipartFile file, EcssCoDelNotifyHeaderData inData);
-
     List<Map<String, Object>> getCustomerTemplateList(Map<String, Object> params);
-    
+
     /**
      * @Description 根据site、buNo、partNo获取物料包装属性（每卷数量、每箱卷数、箱重量）
      * @param site 站点
@@ -188,13 +155,4 @@ public interface CoDelService {
      */
     Map<String, Object> getPartPackageProperties(String site, String buNo, String partNo);
 
-    /**
-     * @Description 导入物料包装属性（每卷数量、每箱卷数、每卷重量、箱重量、箱类型）
-     * @param file Excel文件
-     * @param buNo 业务单元编码
-     * @param username 用户名
-     * @param previewOnly 是否仅预览
-     * @return 预览数据或导入结果
-     */
-    Map<String, Object> importPartPackageProperties(MultipartFile file, String buNo, String username, boolean previewOnly);
 }