From 6965db086df978e46e0a1bd7227b981ad48a9b1c Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 20 二月 2024 16:19:52 +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/DeliveryController.java | 68 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java
new file mode 100644
index 0000000..0e88e0c
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java
@@ -0,0 +1,68 @@
+package com.example.erp.controller.sd;
+
+
+import com.example.erp.common.Constants;
+import com.example.erp.common.Result;
+import com.example.erp.entity.mm.FinishedGoodsInventory;
+import com.example.erp.entity.sd.Delivery;
+import com.example.erp.entity.sd.DeliveryDetail;
+import com.example.erp.entity.sd.Order;
+import com.example.erp.entity.sd.OrderDetail;
+import com.example.erp.exception.ServiceException;
+import com.example.erp.service.sd.DeliveryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@RestController
+@RequestMapping("/Delivery")
+public class DeliveryController {
+ @Autowired
+ DeliveryService deliveryService;
+
+
+ /*鍙戣揣璁㈠崟鏌ヨ*/
+ @PostMapping("/getseletShippingOrder/{pageNum}/{pageSize}")
+ public Result getseletShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody Delivery delivery){
+ return Result.seccess(deliveryService.getseletShippingOrder(pageNum,pageSize,delivery));
+ }
+
+ /*鍙戣揣璁㈠崟鏄庣粏鏌ヨ*/
+ @PostMapping("/getseletShippingOrderDetail/{pageNum}/{pageSize}")
+ public Result getseletShippingOrderDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
+ System.out.println(orderDetail.getDeliveryDetail().getDeliveryId());
+ return Result.seccess(deliveryService.getseletShippingOrderDetail(pageNum,pageSize,orderDetail));
+ }
+
+ /*搴撳瓨鍙彂璐ц鍗曟煡璇�*/
+ @PostMapping("/getSelectOrderInventory/{pageNum}/{pageSize}")
+ public Result getSelectOrderInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody Order order){
+ return Result.seccess(deliveryService.getSelectOrderInventory(pageNum,pageSize,order));
+ }
+
+ /*鍙戣揣璁㈠崟鏄庣粏鏌ヨ*/
+ @PostMapping("/getseletShippingOrderDetails/{pageNum}/{pageSize}")
+ public Result getseletShippingOrderDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
+ System.out.println(orderDetail);
+ return Result.seccess(deliveryService.getseletShippingOrderDetails(pageNum,pageSize,orderDetail));
+ }
+
+ @PostMapping("/insertDelivery")
+ public Result insertDelivery( @RequestBody Map<String,Object> object){
+ System.out.println(object);
+ if(deliveryService.insertDelivery(object)){
+ return Result.seccess();
+
+ }else {
+ throw new ServiceException(Constants.Code_500,"鍙戣揣澶辫触");
+
+ }
+ }
+
+
+
+
+
+
+}
--
Gitblit v1.8.0