From 9fefa2da59e6affea94eee07b57dcf3e23887b0c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 30 三月 2022 09:52:18 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderDetlMapper.xml | 7 +++++++
src/main/java/com/zy/asrs/controller/OrderController.java | 2 ++
src/main/java/com/zy/asrs/service/OrderDetlService.java | 2 ++
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 2 ++
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 5 +++++
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 1 +
6 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 36f1efd..57d3894 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -236,6 +236,7 @@
@RequestMapping(value = "/order/delete/auth")
@ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
+ @Transactional
public R delete(@RequestParam Long orderId){
Order order = orderService.selectById(orderId);
if (order != null) {
@@ -244,6 +245,7 @@
if (!orderService.updateById(order)) {
throw new CoolException("鍒犻櫎璁㈠崟澶辫触");
}
+ orderDetlService.modifyStatus(orderId, 0);
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 63f768b..48f77c7 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -45,6 +45,7 @@
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
wrapper.orderBy("create_time", false);
}
+ wrapper.eq("status", 0);
return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index 800d20f..083dd39 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -22,4 +22,6 @@
int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+ int modifyStatus(@Param("orderId") Long orderId, @Param("status")Integer status);
+
}
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index 8080b2d..1855d2d 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -19,4 +19,6 @@
boolean decrease(String orderNo, String matnr, String batch, Double qty);
+ boolean modifyStatus(Long orderId, Integer status);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index 6981a2d..5a3dc21 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -50,4 +50,9 @@
return this.baseMapper.decrease(orderNo, matnr, batch, qty) > 0;
}
+ @Override
+ public boolean modifyStatus(Long orderId, Integer status) {
+ return this.baseMapper.modifyStatus(orderId, status) > 0;
+ }
+
}
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 063098f..76086db 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -100,4 +100,11 @@
</choose>
</update>
+ <update id="modifyStatus">
+ update man_order_detl
+ set status = #{status}
+ where 1=1
+ and order_id = #{orderId}
+ </update>
+
</mapper>
--
Gitblit v1.9.1