From 400150d4499e3a27be10c7b5ca1f76b5ab37ccff Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 12 四月 2024 15:45:03 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 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
new file mode 100644
index 0000000..21f4e95
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
@@ -0,0 +1,48 @@
+package com.example.erp.controller.pp;
+
+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.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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.sql.Date;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@Api(value="鐢熶骇鎶ヨ〃controller",tags={"鐢熶骇鎶ヨ〃鎿嶄綔鎺ュ彛"})
+@RequestMapping("/report")
+public class ReportController {
+ private final ReportService reportService;
+
+ public ReportController(ReportService reportService) {
+ this.reportService = reportService;
+ }
+
+ //娴佺▼鍗¤繘搴�
+ @ApiOperation("娴佺▼鍗¤繘搴�")
+ @PostMapping ("/processCardProgress/{orderId}")
+ public Result processCardProgress(@PathVariable String orderId, @RequestBody List<Integer> columns){
+ return Result.seccess(reportService.processCardProgressSv(orderId,columns));
+ }
+
+ @ApiOperation("璺ㄥ伐搴忔鐮�")
+ @PostMapping("/crossProcessBreaking/{pageNum}/{pageSize}/{selectDate}")
+ public Result getOrderReport(@PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
+ @PathVariable List<String> selectDate,
+ @RequestBody DamageDetails damageDetails) {
+ return Result.seccess(reportService.crossProcessBreakingSv(pageNum,pageSize,selectDate,damageDetails));
+
+ }
+
+}
--
Gitblit v1.8.0