From d8c9b9afb41c368a08d7e05d0f624c98bf72042a Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 06 六月 2025 11:18:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 164 +++++++++++++++++++++++++++---------------------------
1 files changed, 82 insertions(+), 82 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 4a2cf14..27468b6 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -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());
@@ -207,11 +207,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)) {
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
- }
+// 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());
@@ -230,79 +230,79 @@
return R.ok("璁㈠崟淇敼鎴愬姛");
}
- @PostMapping(value = "/order/wrk/trace/auth")
- @ManagerAuth
- public R orderWrkTrace(@RequestParam("orderId") Long orderId) {
- Order order = orderService.selectById(orderId);
- if (null == order) {
- return R.error("鍗曟嵁涓嶅瓨鍦�");
- }
- // 鏁伴噺缁熻
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(orderId);
- double totalQty = 0;
- double wrkQty = 0;
- double lackQty = 0;
- double endQty = 0;
- for (OrderDetl orderDetl : orderDetls) {
- totalQty = totalQty + orderDetl.getAnfme();
- wrkQty = wrkQty + orderDetl.getWorkQty();
- endQty = endQty + orderDetl.getQty();
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
- if (issued > 0.0) {
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null);
- for (LocDetl locDetl : locDetls) {
- if (issued > 0) {
- issued = issued - locDetl.getAnfme();
- } else {
- break;
- }
- }
- }
- if (issued > 0.0) {
- lackQty = lackQty + issued;
- }
- }
- // 浠诲姟杩芥函
- List<WrkTraceVo> wrkTraceVos = new ArrayList<>();
- List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNoGroupByMatnrOfSum(order.getOrderNo());
- for (WrkDetl wrkDetl : wrkDetls) {
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
- if (wrkMast == null) {
- WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
- if (wrkMastLog.getIoType()==103){
- wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()).eq("io_type",53));
- }
- if (wrkMastLog != null) {
- wrkMast = new WrkMast();
- BeanUtils.copyProperties(wrkMastLog, wrkMast);
- } else {
- continue;
- }
- }
- boolean exist = false;
- for (WrkTraceVo vo : wrkTraceVos) {
- if (vo.getWrkNo().equals(wrkMast.getWrkNo()) && vo.getIoTimeStr().equals(DateUtils.convert(wrkMast.getIoTime()))) {
- vo.getWrkDetls().add(wrkDetl);
- exist = true;
- }
- }
- if (!exist) {
- WrkTraceVo vo = new WrkTraceVo(wrkMast.getWrkNo(), DateUtils.convert(wrkMast.getIoTime()), wrkMast, wrkDetl);
- wrkTraceVos.add(vo);
- }
- }
- if (!Cools.isEmpty(wrkTraceVos) && wrkTraceVos.size() > 1) {
- wrkTraceVos.sort((o1, o2) -> (int) (o2.getWrkMast().getIoTime().getTime() - o1.getWrkMast().getIoTime().getTime()));
- }
- return R.ok().add(Cools
- .add("list", wrkTraceVos)
- .add("orderNo", order.getOrderNo())
- .add("totalQty", totalQty)
- .add("wrkQty", wrkQty+endQty)
- .add("lackQty", lackQty)
- .add("endQty",endQty)
- );
- }
+// @PostMapping(value = "/order/wrk/trace/auth")
+// @ManagerAuth
+// public R orderWrkTrace(@RequestParam("orderId") Long orderId) {
+// Order order = orderService.selectById(orderId);
+// if (null == order) {
+// return R.error("鍗曟嵁涓嶅瓨鍦�");
+// }
+// // 鏁伴噺缁熻
+// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(orderId);
+// double totalQty = 0;
+// double wrkQty = 0;
+// double lackQty = 0;
+// double endQty = 0;
+// for (OrderDetl orderDetl : orderDetls) {
+// totalQty = totalQty + orderDetl.getAnfme();
+// wrkQty = wrkQty + orderDetl.getWorkQty();
+// endQty = endQty + orderDetl.getQty();
+// double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+// if (issued > 0.0) {
+// List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null);
+// for (LocDetl locDetl : locDetls) {
+// if (issued > 0) {
+// issued = issued - locDetl.getAnfme();
+// } else {
+// break;
+// }
+// }
+// }
+// if (issued > 0.0) {
+// lackQty = lackQty + issued;
+// }
+// }
+// // 浠诲姟杩芥函
+// List<WrkTraceVo> wrkTraceVos = new ArrayList<>();
+// List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNoGroupByMatnrOfSum(order.getOrderNo());
+// for (WrkDetl wrkDetl : wrkDetls) {
+// WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
+// if (wrkMast == null) {
+// WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
+// if (wrkMastLog.getIoType()==103){
+// wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()).eq("io_type",53));
+// }
+// if (wrkMastLog != null) {
+// wrkMast = new WrkMast();
+// BeanUtils.copyProperties(wrkMastLog, wrkMast);
+// } else {
+// continue;
+// }
+// }
+// boolean exist = false;
+// for (WrkTraceVo vo : wrkTraceVos) {
+// if (vo.getWrkNo().equals(wrkMast.getWrkNo()) && vo.getIoTimeStr().equals(DateUtils.convert(wrkMast.getIoTime()))) {
+// vo.getWrkDetls().add(wrkDetl);
+// exist = true;
+// }
+// }
+// if (!exist) {
+// WrkTraceVo vo = new WrkTraceVo(wrkMast.getWrkNo(), DateUtils.convert(wrkMast.getIoTime()), wrkMast, wrkDetl);
+// wrkTraceVos.add(vo);
+// }
+// }
+// if (!Cools.isEmpty(wrkTraceVos) && wrkTraceVos.size() > 1) {
+// wrkTraceVos.sort((o1, o2) -> (int) (o2.getWrkMast().getIoTime().getTime() - o1.getWrkMast().getIoTime().getTime()));
+// }
+// return R.ok().add(Cools
+// .add("list", wrkTraceVos)
+// .add("orderNo", order.getOrderNo())
+// .add("totalQty", totalQty)
+// .add("wrkQty", wrkQty+endQty)
+// .add("lackQty", lackQty)
+// .add("endQty",endQty)
+// );
+// }
// ------------------------------------------------------------------------------------------------
--
Gitblit v1.9.1