From c4b9a339caff12e95f61c3d5dc950aafcc8c566c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 06 六月 2025 16:03:40 +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 | 147 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 141 insertions(+), 6 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 4c03747..cb85036 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
@@ -4,6 +4,7 @@
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.dto.sd.OrderDTO;
+import com.example.erp.dto.sd.OrderDetailProductDTO;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
@@ -41,11 +42,38 @@
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")
+ @SaCheckPermission("createOrder.add")
+ public Result saveOrderTitle(@RequestBody Map<String, Object> orderMap) throws Exception {
+ if(orderService.saveOrderTitle(orderMap)) {
+ return Result.seccess(true);
+ }else{
+ throw new ServiceException(Constants.Code_500,Constants.Code_msg);
+ }
+ }
+
+ @ApiOperation("閲嶅璁㈠崟鏌ヨ")
+ @SaCheckPermission("createOrder.search")
+ @PostMapping("/selectOrder")
+ public Result selectOrder(@RequestBody Map<String, Object> orderMap) throws Exception {
+ return Result.seccess(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 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")
@@ -62,22 +90,39 @@
}
@ApiOperation("鏍规嵁id鑾峰彇璁㈠崟淇℃伅")
- @SaCheckPermission("selectOrder.edit")
@PostMapping("/getOrderById/{id}")
public Result getOrderById(@PathVariable String id) {
return Result.seccess(orderService.getOrderById(id));
}
+
+ @ApiOperation("鏍规嵁id鑾峰彇璁㈠崟鏄庣粏淇℃伅")
+ @SaCheckPermission("selectOrder.search")
+ @PostMapping("/getOrderDetailById/{id}")
+ public Result getOrderDetailById(@PathVariable String id) {
+ return Result.seccess(orderService.getOrderDetailById(id));
+ }
+
+
+
+
@ApiOperation("鏌ヨ璁㈠崟宸ヨ壓")
@SaCheckPermission("updateOrderCraft.search")
@PostMapping("/getOrderCraftById/{id}")
public Result getOrderCraftById(@PathVariable String id) {
return Result.seccess(orderService.getOrderCraftById(id));
}
+
+ @PostMapping("/getOrderCraftDetailById/{id}")
+ public Result getOrderCraftDetailById(@PathVariable String id) {
+ return Result.seccess(orderService.getOrderCraftDetailById(id));
+ }
@ApiOperation("瀹℃牳璁㈠崟")
@SaCheckPermission("createOrder.review")
- @PostMapping("/reviewOrderById/{id}/{status}")
- public Result reviewOrderById(@PathVariable String id,@PathVariable Integer status) {
- return Result.seccess(orderService.reviewOrderById(id,status));
+ @PostMapping("/reviewOrderById/{id}/{status}/{userId}/{userName}")
+ public Result reviewOrderById(@PathVariable String id,
+ @PathVariable Integer status
+ ,@PathVariable String userId,@PathVariable String userName) {
+ return Result.seccess(orderService.reviewOrderById(id,status,userId,userName));
}
@ApiOperation("瀹℃牳宸ヨ壓")
@@ -115,6 +160,18 @@
return Result.seccess(orderService.getOrderProductSummary(pageNum,pageSize,selectDate,orderDetail));
}
+
+ @SaCheckPermission("orderReport.search")
+ @ApiOperation("鏌ヨ璁㈠崟鎬绘姤琛�")
+ @PostMapping("/getOrderSummaryReport/{pageNum}/{pageSize}/{selectDate}")
+ public Result getOrderSummaryReport(@PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
+ @PathVariable List<String> selectDate,
+ @RequestBody Order order) {
+ return Result.seccess(orderService.getOrderSummaryReport(pageNum,pageSize,selectDate,order));
+
+ }
+
@ApiOperation("璁㈠崟鎶ヨ〃瀵煎嚭")
@PostMapping("/exportOrderReport")
public void exportOrderReport(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
@@ -129,4 +186,82 @@
//鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
DownExcel.download(response, OrderDTO.class, orderService.exportOrderProductSummary(dates),"orderReport");
}
+
+ @ApiOperation("璁㈠崟鎬绘姤琛ㄥ鍑�")
+ @PostMapping("/exportOrderSummary")
+ public void exportOrderSummary(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, Order.class, orderService.exportOrderSummary(dates),"orderReport");
+ }
+
+
+ @ApiOperation("璁㈠崟灏忕墖鏍囩")
+ @PostMapping("/getOrderProductDetailTag/{orderId}")
+ public Result getOrderProductDetailTag(@PathVariable String orderId) {
+ return Result.seccess(orderService.getOrderProductDetailTag(orderId));
+ }
+
+ @ApiOperation("璁㈠崟鍔犲伐鍗曟墦鍗�-鎴愬搧")
+ @GetMapping ("/printOrderProductDetail/{orderId}")
+ public Result printOrderProductDetail(@PathVariable String orderId) {
+
+ return Result.seccess(orderService.printOrderProductDetail(orderId));
+ }
+
+ @ApiOperation("璁㈠崟鍔犲伐鍗曟墦鍗�-灏忕墖鏄庣粏")
+ @GetMapping ("/printOrderProductGlassDetail/{orderId}")
+ public Result printOrderProductGlassDetail(@PathVariable String orderId) {
+ return Result.seccess(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));
+ }
+ @ApiOperation("璁㈠崟鍔犲伐鍗曟墦鍗�-鎴愬搧2")
+ @GetMapping ("/printOrderProductDetail/{orderId}/{selectedValues}")
+ public Result printOrderProductDetail(@PathVariable String orderId,@PathVariable List<String> selectedValues) {
+
+ return Result.seccess(orderService.printOrderProductDetails(orderId,selectedValues));
+ }
+
+ @ApiOperation("璁㈠崟鎵撳嵃璁℃暟")
+ @PostMapping ("/updateOrderPrintNumber/{orderId}")
+ public Result updateOrderPrintNumber(@PathVariable String orderId) {
+
+ 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