From bcc0a07b6fce94602160dbf707c2d758ae1a37d9 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 23 十一月 2024 10:09:14 +0800
Subject: [PATCH] java 修复库位利用率计算精度问题
---
src/main/java/com/zy/asrs/controller/OrderController.java | 256 +++++++++++++++++++++++++-------------------------
1 files changed, 128 insertions(+), 128 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 695f9c8..6e8131f 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,7 +154,7 @@
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 item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getAnfme());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -175,134 +175,134 @@
}
}
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)) {
- OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
- 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("璁㈠崟淇敼鎴愬姛");
- }
+// @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("璁㈠崟淇敼鎴愬姛");
+// }
- @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