From 57975f00790aea9ffea369c0c68b55137bf4123e Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 19 六月 2025 09:03:36 +0800
Subject: [PATCH] #成品原材料放货区域划分
---
src/main/java/com/zy/asrs/controller/OrderController.java | 106 ++++++++++++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 6e8131f..27468b6 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -94,7 +94,7 @@
return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId)));
}
- /*@RequestMapping(value = "/order/form/add/auth")
+ @RequestMapping(value = "/order/form/add/auth")
@ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
@Transactional
public R formAdd(@RequestBody OrderDomainParam param){
@@ -154,11 +154,11 @@
for (OrderDetl orderDetl : param.getOrderDetlList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
if (DetlDto.has(list, dto)) {
- OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getAnfme());
- item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
- if (!orderDetlService.updateById(item)) {
+// OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getAnfme());
+// item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
+// if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
- }
+// }
} else {
list.add(dto);
orderDetl.setOrderId(order.getId());
@@ -175,60 +175,60 @@
}
}
return R.ok("璁㈠崟娣诲姞鎴愬姛");
- }*/
+ }
-// @RequestMapping(value = "/order/form/modify/auth")
-// @ManagerAuth(memo = "鎵嬪姩淇敼璁㈠崟")
-// @Transactional
-// public R formModify(@RequestBody OrderDomainParam param){
-// Order order = orderService.selectById(param.getOrderId());
-// 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(userId);
-// order.setUpdateTime(now);
-// if (!orderService.updateById(order)) {
-// throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
-// }
-// }
-// // 淇敼鏄庣粏妗�
-//// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-// // 1.娓呯┖鏄庣粏妗�
-// if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
-// throw new CoolException("娓呯┖璁㈠崟鏄庣粏澶辫触");
-// }
-// // 2.閲嶇粍鏁版嵁
-// List<DetlDto> list = new ArrayList<>();
-// for (OrderDetl orderDetl : param.getOrderDetlList()) {
-// DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
-// if (DetlDto.has(list, dto)) {
+ @RequestMapping(value = "/order/form/modify/auth")
+ @ManagerAuth(memo = "鎵嬪姩淇敼璁㈠崟")
+ @Transactional
+ public R formModify(@RequestBody OrderDomainParam param){
+ Order order = orderService.selectById(param.getOrderId());
+ 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(userId);
+ order.setUpdateTime(now);
+ if (!orderService.updateById(order)) {
+ throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
+ }
+ }
+ // 淇敼鏄庣粏妗�
+// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ // 1.娓呯┖鏄庣粏妗�
+ if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
+ throw new CoolException("娓呯┖璁㈠崟鏄庣粏澶辫触");
+ }
+ // 2.閲嶇粍鏁版嵁
+ List<DetlDto> list = new ArrayList<>();
+ for (OrderDetl orderDetl : param.getOrderDetlList()) {
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
+ if (DetlDto.has(list, dto)) {
// OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getAnfme());
// item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
// if (!orderDetlService.updateById(item)) {
// throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
// }
-// } else {
-// list.add(dto);
-// 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("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
-// }
-// }
-// }
-// return R.ok("璁㈠崟淇敼鎴愬姛");
-// }
+ } else {
+ list.add(dto);
+ 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("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ }
+ }
+ }
+ return R.ok("璁㈠崟淇敼鎴愬姛");
+ }
// @PostMapping(value = "/order/wrk/trace/auth")
// @ManagerAuth
--
Gitblit v1.9.1