From ec37ee18e2467fbde0eeb1539dcdb846f48ad59f Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 03 七月 2025 09:14:37 +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/sd/OrderController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 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 9e0475e..08abee7 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
@@ -42,6 +42,15 @@
throw new ServiceException(Constants.Code_500,Constants.Code_msg);
}
}
+ @ApiOperation("鍏朵粬绯荤粺浼犺緭璁㈠崟淇濆瓨")
+ @PostMapping("/saveOtherSystemOrder")
+ public Result saveOtherSystemOrder(@RequestBody Map<String, Object> orderMap) throws Exception {
+ if(orderService.saveOrder(orderMap)) {
+ return Result.seccess(true);
+ }else{
+ throw new ServiceException(Constants.Code_500,Constants.Code_msg);
+ }
+ }
@ApiOperation("璁㈠崟琛ㄥご淇濆瓨")
@PostMapping("/saveOrderTitle")
@@ -63,8 +72,8 @@
@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 Order order) {
- return Result.seccess(orderService.getOrderList(pageNum, pageSize, selectDate, order,orderType));
+ 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));
}
@ApiOperation("鍒犻櫎璁㈠崟")
@SaCheckPermission("selectOrder.delete")
@@ -132,12 +141,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));
}
@@ -224,5 +235,35 @@
return Result.seccess(orderService.updateOrderPrintNumber(orderId));
}
+ @ApiOperation("淇敼璁㈠崟鍙�")
+ @SaCheckPermission("createOrder.amountReset")
+ @PostMapping("/updateOrderId")
+ public Result updateOrderId(@RequestBody Map<String,Object> map) {
+ return Result.seccess(orderService.updateOrderId(map));
+ }
+
+ @ApiOperation("璁㈠崟鍙嶅鏄惁瀛樺湪鎵嬪姩澶у皬鐗�")
+ @PostMapping("/selectDifferentSize/{orderId}")
+ public Result selectDifferentSize(@PathVariable String orderId) {
+ return Result.seccess(orderService.selectDifferentSize(orderId));
+ }
+
+ @ApiOperation("閫�鍥炴祦绋�")
+ @PostMapping("/processBack/{orderId}/{status}")
+ public Result processBack(@PathVariable String orderId,@PathVariable Integer status) {
+ return Result.seccess(orderService.processBack(orderId,status));
+ }
+
+ @ApiOperation("鎵嬫満鎵爜鐜荤拑淇℃伅")
+ @PostMapping("/scannerGlassInfo/{projectNo}")
+ public Result scannerGlassInfo(@PathVariable String projectNo) {
+ return Result.seccess(orderService.scannerGlassInfo(projectNo));
+ }
+
+ @PostMapping("/test")
+ public Result scannerGlassInfo() {
+ return Result.seccess(null);
+ }
+
}
--
Gitblit v1.8.0