From 6b6f3fbd333894209e0df1822ff89881aa4319fe Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 29 八月 2025 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
index f048d79..e623272 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
@@ -1,6 +1,7 @@
package com.example.erp.controller.sd;
import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.alibaba.fastjson.JSONObject;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.dto.sd.OrderDTO;
@@ -11,6 +12,7 @@
import com.example.erp.exception.ServiceException;
import com.example.erp.service.sd.OrderService;
import com.example.erp.tools.DownExcel;
+import com.fasterxml.jackson.core.JsonProcessingException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -141,12 +143,14 @@
@SaCheckPermission("orderReport.search")
@ApiOperation("鏌ヨ璁㈠崟鎶ヨ〃")
- @PostMapping("/getOrderReport/{pageNum}/{pageSize}/{selectDate}")
+ @PostMapping("/getOrderReport/{pageNum}/{pageSize}/{selectDate}/{model}/{scope}")
public Result getOrderReport(@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
@PathVariable List<String> selectDate,
+ @PathVariable Integer model,//0:绮剧‘鏌ユ壘锛�1锛氭ā绯婃煡璇�
+ @PathVariable Integer scope,//妯＄硦鑼冨洿
@RequestBody OrderDetail orderDetail) {
- return Result.seccess(orderService.getOrderReport(pageNum,pageSize,selectDate,orderDetail));
+ return Result.seccess(orderService.getOrderReport(pageNum,pageSize,selectDate,orderDetail,model,scope));
}
@@ -255,15 +259,28 @@
@ApiOperation("鎵嬫満鎵爜鐜荤拑淇℃伅")
@PostMapping("/scannerGlassInfo/{projectNo}")
public Result scannerGlassInfo(@PathVariable String projectNo) {
- System.out.println("123123");
return Result.seccess(orderService.scannerGlassInfo(projectNo));
}
@PostMapping("/test")
public Result scannerGlassInfo() {
- System.out.println("123123");
return Result.seccess(null);
}
+ @PostMapping("/upload-dxf")
+ public Result uploadDxf(@RequestBody Map<String,Object> object) {
+ return Result.seccess(orderService.uploadDxf(object));
+ }
+
+ @PostMapping("/selectUploadDxf")
+ public Result selectUploadDxf(@RequestBody Map<String,Object> object) {
+ return Result.seccess(orderService.selectUploadDxf(object));
+ }
+
+ @PostMapping("/updateOrderFile")
+ public Result updateOrderFile(@RequestBody JSONObject map) throws JsonProcessingException {
+ return Result.seccess(orderService.updateOrderFile(map));
+ }
+
}
--
Gitblit v1.8.0