From b7e182815b09fbba8cb450ead0031fae820cad14 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 23 五月 2024 08:32:53 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
index 9be9808..d95100b 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
@@ -1,21 +1,27 @@
package com.example.erp.controller.pp;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.pp.DamageDetails;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.Report;
+import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.ReportService;
import com.example.erp.service.pp.WorkOrderService;
+import com.example.erp.tools.DownExcel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.sql.Date;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -31,12 +37,14 @@
//娴佺▼鍗¤繘搴�
@ApiOperation("娴佺▼鍗¤繘搴�")
+ @SaCheckPermission("ProcessCardProgress.search")
@PostMapping ("/processCardProgress/{orderId}")
public Result processCardProgress(@PathVariable String orderId, @RequestBody List<Integer> columns){
return Result.seccess(reportService.processCardProgressSv(orderId,columns));
}
@ApiOperation("璺ㄥ伐搴忔鐮�")
+ @SaCheckPermission("CrossProcessBreaking.search")
@PostMapping("/crossProcessBreaking/{pageNum}/{pageSize}/{selectDate}")
public Result getOrderReport(@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
@@ -47,6 +55,7 @@
}
@ApiOperation("鍦ㄥ埗鍝佹姤琛�")
+ @SaCheckPermission("WorkInProgress.search")
@PostMapping("/workInProgress/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}")
public Result workInProgress(
@PathVariable Date selectTime1,
@@ -60,6 +69,7 @@
}
@ApiOperation("宸ュ簭寰呭畬鎴愭姤琛�")
+ @SaCheckPermission("ProcessToBeCompleted.search")
@PostMapping("/selectProcessToBeCompleted/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}")
public Result selectProcessToBeCompleted(
@PathVariable Date selectTime1,
@@ -73,6 +83,7 @@
}
@ApiOperation("娆＄牬鏄庣粏鎶ヨ〃")
+ @SaCheckPermission("DamageReport.search")
@PostMapping("/damageReport/{selectTime1}/{selectTime2}")
public Result damageReport(
@PathVariable Date selectTime1,
@@ -82,6 +93,7 @@
}
@ApiOperation("鍒嗘灦鏄庣粏鎶ヨ〃")
+ @SaCheckPermission("SplittingDetailsOutside.search")
@PostMapping("/splittingDetailsOutside/{orderId}")
public Result splittingDetailsOutside(
@PathVariable String orderId,
@@ -91,6 +103,7 @@
}
@ApiOperation("鍝佽川鎶ヨ〃")
+ @SaCheckPermission("QualityReport.search")
@PostMapping("/qualityReport/{selectTime1}/{selectTime2}")
public Result qualityReport(
@PathVariable Date selectTime1,
@@ -101,6 +114,7 @@
}
@ApiOperation("鎴愬搧鐜囨姤琛�")
+ @SaCheckPermission("Yield.search")
@PostMapping("/yield/{selectTime1}/{selectTime2}/{selectProcesses}")
public Result yield(
@PathVariable Date selectTime1,
@@ -112,12 +126,14 @@
}
@ApiOperation("鐢熶骇鍙戣揣杩涘害")
+ @SaCheckPermission("ProductionSchedule.search")
@PostMapping ("/productionSchedule/{orderId}")
public Result productionSchedule(@PathVariable String orderId, @RequestBody List<Integer> columns){
return Result.seccess(reportService.productionScheduleSv(orderId,columns));
}
@ApiOperation("浠诲姟瀹屾垚鎯呭喌姹囨�昏繘搴�")
+ @SaCheckPermission("TaskCompletionStatus.search")
@PostMapping ("/taskCompletionStatus/{selectTime1}/{selectTime2}")
public Result taskCompletionStatus(@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@@ -126,6 +142,7 @@
}
@ApiOperation("璁㈠崟璁″垝鍒嗚В")
+ @SaCheckPermission("OrderPlanDecomposition.search")
@PostMapping ("/orderPlanDecomposition/{selectTime1}/{selectTime2}")
public Result orderPlanDecomposition(@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@@ -134,10 +151,18 @@
}
@ApiOperation("鍘熺墖棰嗘枡")
+ @SaCheckPermission("RawMaterialRequisition.search")
@PostMapping ("/rawMaterialRequisition/{selectTime1}/{selectTime2}")
public Result rawMaterialRequisition(@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@RequestBody Report report){
return Result.seccess(reportService.rawMaterialRequisitionSv(selectTime1,selectTime2,report));
}
+ @ApiOperation("璺ㄥ伐搴忔鐮存姤琛ㄥ鍑�")
+ @PostMapping("/exportCrossProcessBreaking")
+ public void exportCrossProcessBreaking(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, DamageDetails.class, reportService.exportCrossProcessBreakingSv(dates),"CrossProcessBreaking");
+ }
}
--
Gitblit v1.8.0