From 4b6e6d95ae6fbbccc4351db366b99fa05288877f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 11 六月 2025 10:09:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index d6666bf..d769423 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -183,12 +183,18 @@
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
- public R navList(@RequestParam(required = false) String orderNo){
+ public R navList(@RequestParam(required = false) String orderNo
+ , @RequestParam(required = false) Integer settle) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
}
- wrapper.le("settle", 2).eq("status", 1);
+ if (!Cools.isEmpty(settle)) {
+ wrapper.eq("settle", settle);
+ }else {
+ wrapper.le("settle", 2);
+ }
+ wrapper.eq("status", 1);
wrapper.orderBy("create_time", false);
List<Order> orders = orderService.selectList(wrapper);
// 淇濈暀鍑哄簱鍗�
@@ -675,6 +681,42 @@
return R.ok();
}
+ @RequestMapping(value = "/order/report")
+ @ManagerAuth(memo = "涓婃姤")
+ public R report(@RequestParam String orderNo) {
+ Order order = orderService.selectByNo(orderNo);
+ if(Cools.isEmpty(order)){
+ return R.parse(BaseRes.EMPTY);
+ }
+ List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
+ if (Cools.isEmpty(orderDetls)) {
+ return R.parse(BaseRes.EMPTY);
+ }
+ int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no",order.getOrderNo()));
+ int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no",order.getOrderNo()));
+ if (wrkCount > 0 || pakinCount > 0) {
+ throw new CoolException("瀛樺湪浣滀笟涓暟鎹紝涓嶈兘瀹岀粨銆傝妫�鏌ュ叆搴撻�氱煡妗ｅ拰宸ヤ綔妗�");
+ }
+ Boolean boo=true;
+ for (OrderDetl orderDetl : orderDetls) {
+ if(!orderDetl.getQty().equals(orderDetl.getWorkQty())){
+ return R.error("浣滀笟鏁伴噺鍜屽畬鎴愭暟閲忎笉涓�鑷存棤娉曚笂鎶ョ墿鏂欑紪鍙凤細"+orderDetl.getMatnr());
+ }
+ if((Cools.isEmpty(orderDetl.getPrice())&&orderDetl.getQty()>0)||!orderDetl.getPrice().equals(orderDetl.getQty())){
+ boo=false;
+ }
+ if(Cools.isEmpty(orderDetl.getPrice())){
+ orderDetl.setPrice(0.0);
+ orderDetlService.updateById(orderDetl);
+ }
+ }
+ if(boo){
+ return R.error("娌℃湁闇�瑕佷笂浼犵殑鏁版嵁");
+ }
+ order.setMemo("0");//鐘舵�佽浆鎹㈡垚寮�濮嬩笅鎺�
+ orderService.updateById(order);
+ return R.ok();
+ }
}
--
Gitblit v1.9.1