jms：模版导入接口修改接收主表id

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/HYCKTemplateImportController.java

@@ -34,8 +34,8 @@ public class HYCKTemplateImportController {
 	 */
 	@PostMapping("/importOne")
 	@RepeatSubmit
-	public R<Bills> importHYCK(@RequestParam("file") MultipartFile file) throws Exception {
-		return templateImportService.importOne(file);
+	public R<Bills> importHYCK(@RequestParam("file") MultipartFile file,@RequestParam("billId") Long billId) throws Exception {
+		return templateImportService.importOne(file,billId);
 	}
 
 	/**
@@ -43,8 +43,8 @@ public class HYCKTemplateImportController {
 	 */
 	@PostMapping("/importPilBooking")
 	@RepeatSubmit
-	public R<Bills> importPilBooking(@RequestParam("file") MultipartFile file) throws Exception {
-		return templateImportService.importPilBooking(file);
+	public R<Bills> importPilBooking(@RequestParam("file") MultipartFile file,@RequestParam("billId") Long billId) throws Exception {
+		return templateImportService.importPilBooking(file,billId);
 	}
 
 	/**
@@ -52,21 +52,21 @@ public class HYCKTemplateImportController {
 	 */
 	@PostMapping("/importPilCutOffOrders")
 	@RepeatSubmit
-	public R<Bills> importPilCutOffOrders(@RequestParam("file") MultipartFile file) throws Exception {
-		return templateImportService.importPilCutOffOrders(file);
+	public R<Bills> importPilCutOffOrders(@RequestParam("file") MultipartFile file,@RequestParam("billId") Long billId) throws Exception {
+		return templateImportService.importPilCutOffOrders(file,billId);
 	}
 
 	@PostMapping("/importHisenseBill")
 	@RepeatSubmit
-	public R<Bills> importHisenseBill(@RequestParam("file") MultipartFile file) throws Exception {
-		return templateImportService.importHisenseBill(file);
+	public R<Bills> importHisenseBill(@RequestParam("file") MultipartFile file,@RequestParam("billId") Long billId) throws Exception {
+		return templateImportService.importHisenseBill(file,billId);
 	}
 	/**
 	 * 海运出口模版导入(海信组)
 	 */
 	@PostMapping("/importHisense")
-	public R<List<Containers>> importHisense(@RequestParam("file") MultipartFile file) throws Exception {
-		return templateImportService.importHisense(file);
+	public R<List<Containers>> importHisense(@RequestParam("file") MultipartFile file,@RequestParam("billId") Long billId) throws Exception {
+		return templateImportService.importHisense(file,billId);
 	}
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/ITemplateImportService.java

@@ -33,13 +33,13 @@ import java.util.List;
 public interface ITemplateImportService {
 
 
-	R<Bills> importOne(MultipartFile file)throws Exception;
+	R<Bills> importOne(MultipartFile file,Long billId)throws Exception;
 
-	R<Bills> importPilBooking(MultipartFile file)throws Exception ;
+	R<Bills> importPilBooking(MultipartFile file,Long billId)throws Exception ;
 
-	R<Bills> importPilCutOffOrders(MultipartFile file)throws Exception ;
+	R<Bills> importPilCutOffOrders(MultipartFile file,Long billId)throws Exception ;
 
-	R<Bills> importHisenseBill(MultipartFile file)throws Exception ;
+	R<Bills> importHisenseBill(MultipartFile file,Long billId)throws Exception ;
 
-	R<List<Containers>> importHisense(MultipartFile file)throws Exception ;
+	R<List<Containers>> importHisense(MultipartFile file,Long billId)throws Exception ;
 }