From 1e56bd5cc3be7f7957788f2606c7f56cb4d27f50 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 01 十二月 2025 11:41:42 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 88 ++++++++++++++++++++++++++++++--------------
1 files changed, 60 insertions(+), 28 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 99cdc19..145d71e 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.*;
@@ -37,7 +39,7 @@
@SaCheckPermission("createOrder.add")
public Result saveOrder(@RequestBody Map<String, Object> orderMap) throws Exception {
if(orderService.saveOrder(orderMap)) {
- return Result.seccess(true);
+ return Result.success(true);
}else{
throw new ServiceException(Constants.Code_500,Constants.Code_msg);
}
@@ -46,7 +48,7 @@
@PostMapping("/saveOtherSystemOrder")
public Result saveOtherSystemOrder(@RequestBody Map<String, Object> orderMap) throws Exception {
if(orderService.saveOrder(orderMap)) {
- return Result.seccess(true);
+ return Result.success(true);
}else{
throw new ServiceException(Constants.Code_500,Constants.Code_msg);
}
@@ -57,7 +59,7 @@
@SaCheckPermission("createOrder.add")
public Result saveOrderTitle(@RequestBody Map<String, Object> orderMap) throws Exception {
if(orderService.saveOrderTitle(orderMap)) {
- return Result.seccess(true);
+ return Result.success(true);
}else{
throw new ServiceException(Constants.Code_500,Constants.Code_msg);
}
@@ -67,39 +69,39 @@
@SaCheckPermission("createOrder.search")
@PostMapping("/selectOrder")
public Result selectOrder(@RequestBody Map<String, Object> orderMap) throws Exception {
- return Result.seccess(orderService.selectOrder(orderMap));
+ return Result.success(orderService.selectOrder(orderMap));
}
@ApiOperation("璁㈠崟鍒嗛〉绛涢�夋煡璇�")
@SaCheckPermission("selectOrder.search")
@PostMapping("/getOrderList/{pageNum}/{pageSize}/{orderType}/{selectDate}")
public Result getOrderList(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable Integer orderType, @PathVariable List<String> selectDate, @RequestBody Map<String,Object> config) {
- return Result.seccess(orderService.getOrderList(pageNum, pageSize, selectDate, config,orderType));
+ return Result.success(orderService.getOrderList(pageNum, pageSize, selectDate, config,orderType));
}
@ApiOperation("鍒犻櫎璁㈠崟")
@SaCheckPermission("selectOrder.delete")
@PostMapping("/deleteOrder/{id}")
public Result deleteOrder(@PathVariable String id) {
- return Result.seccess(orderService.deleteOrder(id));
+ return Result.success(orderService.deleteOrder(id));
}
@ApiOperation("璁㈠崟浣滃簾")
@SaCheckPermission("createOrder.cancel")
@PostMapping("/cancelOrder/{id}")
public Result cancelOrder(@PathVariable String id) {
- return Result.seccess(orderService.cancelOrder(id));
+ return Result.success(orderService.cancelOrder(id));
}
@ApiOperation("鏍规嵁id鑾峰彇璁㈠崟淇℃伅")
@PostMapping("/getOrderById/{id}")
public Result getOrderById(@PathVariable String id) {
- return Result.seccess(orderService.getOrderById(id));
+ return Result.success(orderService.getOrderById(id));
}
@ApiOperation("鏍规嵁id鑾峰彇璁㈠崟鏄庣粏淇℃伅")
@SaCheckPermission("selectOrder.search")
@PostMapping("/getOrderDetailById/{id}")
public Result getOrderDetailById(@PathVariable String id) {
- return Result.seccess(orderService.getOrderDetailById(id));
+ return Result.success(orderService.getOrderDetailById(id));
}
@@ -109,12 +111,12 @@
@SaCheckPermission("updateOrderCraft.search")
@PostMapping("/getOrderCraftById/{id}")
public Result getOrderCraftById(@PathVariable String id) {
- return Result.seccess(orderService.getOrderCraftById(id));
+ return Result.success(orderService.getOrderCraftById(id));
}
@PostMapping("/getOrderCraftDetailById/{id}")
public Result getOrderCraftDetailById(@PathVariable String id) {
- return Result.seccess(orderService.getOrderCraftDetailById(id));
+ return Result.success(orderService.getOrderCraftDetailById(id));
}
@ApiOperation("瀹℃牳璁㈠崟")
@SaCheckPermission("createOrder.review")
@@ -122,31 +124,33 @@
public Result reviewOrderById(@PathVariable String id,
@PathVariable Integer status
,@PathVariable String userId,@PathVariable String userName) {
- return Result.seccess(orderService.reviewOrderById(id,status,userId,userName));
+ return Result.success(orderService.reviewOrderById(id,status,userId,userName));
}
@ApiOperation("瀹℃牳宸ヨ壓")
@SaCheckPermission("updateOrderCraft.review")
@PostMapping("/reviewProcessById/{id}/{status}")
public Result reviewProcessById(@PathVariable String id,@PathVariable Integer status,@RequestBody List<OrderGlassDetail> orderGlassDetails) {
- return Result.seccess(orderService.reviewProcessById(id,status,orderGlassDetails));
+ return Result.success(orderService.reviewProcessById(id,status,orderGlassDetails));
}
@ApiOperation("鏇存柊璁㈠崟閲戦鍗曚环")
@SaCheckPermission("createOrder.amountReset")
@PostMapping("/updateOrderMoney")
public Result updateOrderMoney(@RequestBody Map<String,Object> map) {
- return Result.seccess(orderService.updateOrderMoney(map));
+ return Result.success(orderService.updateOrderMoney(map));
}
@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.success(orderService.getOrderReport(pageNum,pageSize,selectDate,orderDetail,model,scope));
}
@@ -157,7 +161,7 @@
@PathVariable Integer pageSize,
@PathVariable List<String> selectDate,
@RequestBody OrderDetail orderDetail) {
- return Result.seccess(orderService.getOrderProductSummary(pageNum,pageSize,selectDate,orderDetail));
+ return Result.success(orderService.getOrderProductSummary(pageNum,pageSize,selectDate,orderDetail));
}
@@ -168,7 +172,7 @@
@PathVariable Integer pageSize,
@PathVariable List<String> selectDate,
@RequestBody Order order) {
- return Result.seccess(orderService.getOrderSummaryReport(pageNum,pageSize,selectDate,order));
+ return Result.success(orderService.getOrderSummaryReport(pageNum,pageSize,selectDate,order));
}
@@ -199,64 +203,92 @@
@ApiOperation("璁㈠崟灏忕墖鏍囩")
@PostMapping("/getOrderProductDetailTag/{orderId}")
public Result getOrderProductDetailTag(@PathVariable String orderId) {
- return Result.seccess(orderService.getOrderProductDetailTag(orderId));
+ return Result.success(orderService.getOrderProductDetailTag(orderId));
}
@ApiOperation("璁㈠崟鍔犲伐鍗曟墦鍗�-鎴愬搧")
@GetMapping ("/printOrderProductDetail/{orderId}")
public Result printOrderProductDetail(@PathVariable String orderId) {
- return Result.seccess(orderService.printOrderProductDetail(orderId));
+ return Result.success(orderService.printOrderProductDetail(orderId));
}
@ApiOperation("璁㈠崟鍔犲伐鍗曟墦鍗�-灏忕墖鏄庣粏")
@GetMapping ("/printOrderProductGlassDetail/{orderId}")
public Result printOrderProductGlassDetail(@PathVariable String orderId) {
- return Result.seccess(orderService.printOrderProductGlassDetail(orderId));
+ return Result.success(orderService.printOrderProductGlassDetail(orderId));
}
@ApiOperation("璁㈠崟鍔犲伐鍗曟墦鍗�-灏忕墖鏄庣粏1")
@PostMapping ("/printOrderProductGlassDetailMonolithic/{orderId}")
public Result printOrderProductGlassDetailMonolithic(@PathVariable String orderId,@RequestBody List<String> selectedValues) {
- return Result.seccess(orderService.printOrderProductGlassDetailMonolithic(orderId,selectedValues));
+ return Result.success(orderService.printOrderProductGlassDetailMonolithic(orderId,selectedValues));
}
@ApiOperation("璁㈠崟鍔犲伐鍗曟墦鍗�-鎴愬搧2")
@GetMapping ("/printOrderProductDetail/{orderId}/{selectedValues}")
public Result printOrderProductDetail(@PathVariable String orderId,@PathVariable List<String> selectedValues) {
- return Result.seccess(orderService.printOrderProductDetails(orderId,selectedValues));
+ return Result.success(orderService.printOrderProductDetails(orderId,selectedValues));
}
@ApiOperation("璁㈠崟鎵撳嵃璁℃暟")
@PostMapping ("/updateOrderPrintNumber/{orderId}")
public Result updateOrderPrintNumber(@PathVariable String orderId) {
- return Result.seccess(orderService.updateOrderPrintNumber(orderId));
+ return Result.success(orderService.updateOrderPrintNumber(orderId));
}
@ApiOperation("淇敼璁㈠崟鍙�")
@SaCheckPermission("createOrder.amountReset")
@PostMapping("/updateOrderId")
public Result updateOrderId(@RequestBody Map<String,Object> map) {
- return Result.seccess(orderService.updateOrderId(map));
+ return Result.success(orderService.updateOrderId(map));
}
@ApiOperation("璁㈠崟鍙嶅鏄惁瀛樺湪鎵嬪姩澶у皬鐗�")
@PostMapping("/selectDifferentSize/{orderId}")
public Result selectDifferentSize(@PathVariable String orderId) {
- return Result.seccess(orderService.selectDifferentSize(orderId));
+ return Result.success(orderService.selectDifferentSize(orderId));
}
@ApiOperation("閫�鍥炴祦绋�")
@PostMapping("/processBack/{orderId}/{status}")
public Result processBack(@PathVariable String orderId,@PathVariable Integer status) {
- return Result.seccess(orderService.processBack(orderId,status));
+ return Result.success(orderService.processBack(orderId,status));
}
@ApiOperation("鎵嬫満鎵爜鐜荤拑淇℃伅")
@PostMapping("/scannerGlassInfo/{projectNo}")
public Result scannerGlassInfo(@PathVariable String projectNo) {
- return Result.seccess(orderService.scannerGlassInfo(projectNo));
+ return Result.success(orderService.scannerGlassInfo(projectNo));
}
+ @PostMapping("/test")
+ public Result scannerGlassInfo() {
+ return Result.success(null);
+ }
+
+ @PostMapping("/upload-dxf")
+ public Result uploadDxf(@RequestBody Map<String,Object> object) {
+ return Result.success(orderService.uploadDxf(object));
+ }
+
+ @PostMapping("/selectUploadDxf")
+ public Result selectUploadDxf(@RequestBody Map<String,Object> object) {
+ return Result.success(orderService.selectUploadDxf(object));
+ }
+
+ @PostMapping("/updateOrderFile")
+ public Result updateOrderFile(@RequestBody JSONObject map) throws JsonProcessingException {
+ return Result.success(orderService.updateOrderFile(map));
+ }
+
+
+ @ApiOperation("鏌ヨ宸ヨ壓灞炴�ч厤缃�")
+ @PostMapping("/processAttributeConfig")
+ public Result processAttributeConfig() {
+ return Result.success(orderService.processAttributeConfig());
+ }
+
+
}
--
Gitblit v1.8.0