From 34e08619ee8fa88ea81b32b19a553743587f9244 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 29 三月 2022 10:37:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index cafda96..9336fd1 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -29,6 +29,19 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+ @RequestMapping(value = "/order/nav/list/auth")
+ @ManagerAuth
+ public R navList(@RequestParam(required = false) String orderNo){
+ EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ if (!Cools.isEmpty(orderNo)) {
+ wrapper.like("order_no", orderNo);
+ }
+ wrapper.le("settle", 2).eq("doc_type", 1).eq("status", 1);
+ wrapper.orderBy("create_time", false);
+ List<Order> orders = orderService.selectList(wrapper);
+ return R.ok().add(orders);
+ }
+
@RequestMapping(value = "/order/head/page/auth")
@ManagerAuth
public R head(@RequestParam(defaultValue = "1")Integer curr,
@@ -102,11 +115,13 @@
}
for (OrderDetl orderDetl : param.getOrderDetlList()) {
orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setCreateBy(getUserId());
orderDetl.setCreateTime(now);
orderDetl.setUpdateBy(getUserId());
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
@@ -122,32 +137,49 @@
if (order == null || order.getStatus() == 0) {
return R.error("璁㈠崟涓嶅瓨鍦�");
}
+ Date now = new Date();
+ Long userId = getUserId();
// 淇敼涓绘。
if (!param.getDocType().equals(order.getDocType())) {
order.setDocType(param.getDocType());
- order.setUpdateBy(getUserId());
- order.setUpdateTime(new Date());
+ order.setUpdateBy(userId);
+ order.setUpdateTime(now);
if (!orderService.updateById(order)) {
throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
}
}
// 淇敼鏄庣粏妗�
- Iterator<OrderDetl> iterator = param.getOrderDetlList().iterator();
- while (iterator.hasNext()) {
- OrderDetl orderDetl = iterator.next();
- OrderDetl detl = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ // 1.娓呯┖鏄庣粏妗�
+ if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
+ throw new CoolException("娓呯┖璁㈠崟鏄庣粏澶辫触");
+ }
+ // 2.閲嶇粍鏁版嵁
+ for (OrderDetl orderDetl : param.getOrderDetlList()) {
+ OrderDetl detl = orderDetlService.findByLook(orderDetls, order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
// 鏂板
if (detl == null) {
-
+ detl = orderDetl;
+ detl.setOrderId(order.getId());
+ detl.setOrderNo(order.getOrderNo());
+ detl.setCreateTime(now);
+ detl.setCreateBy(userId);
+ detl.setUpdateTime(now);
+ detl.setUpdateBy(userId);
+ detl.setStatus(1);
+ detl.setQty(0.0D);
// 淇敼
} else {
-
+ detl.setAnfme(orderDetl.getAnfme()); // 淇敼鏁伴噺
+ detl.setUpdateTime(now);
+ detl.setUpdateBy(userId);
+ }
+ // 鎸佷箙鍖�
+ if (!orderDetlService.insert(detl)) {
+ throw new CoolException("鏂板璁㈠崟鏄庣粏澶辫触");
}
}
-
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-
- return R.ok();
+ return R.ok("璁㈠崟淇敼鎴愬姛");
}
--
Gitblit v1.9.1