From 00a6376e31fea643df9394a90aaf71b8369fd01f Mon Sep 17 00:00:00 2001 From: Junjie <xjj@123> Date: 星期日, 15 六月 2025 16:37:09 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OrderController.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java index 2404729..1bac075 100644 --- a/src/main/java/com/zy/asrs/controller/OrderController.java +++ b/src/main/java/com/zy/asrs/controller/OrderController.java @@ -11,6 +11,7 @@ import com.zy.asrs.entity.param.OrderDomainParam; import com.zy.asrs.entity.result.WrkTraceVo; import com.zy.asrs.service.*; +import com.zy.asrs.utils.MathUtils; import com.zy.common.model.DetlDto; import com.zy.common.web.BaseController; import org.springframework.beans.BeanUtils; @@ -133,7 +134,7 @@ null, // 瀹㈡埛缂栧彿 null, // 瀹㈡埛 null, // 鑱旂郴鏂瑰紡 - null, // 鎿嶄綔浜哄憳 + getUser().getUsername(), // 鎿嶄綔浜哄憳 null, // 鍚堣閲戦 null, // 浼樻儬鐜� null, // 浼樻儬閲戦 @@ -168,7 +169,7 @@ if (DetlDto.has(list, dto)) { OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3()); - item.setAnfme(item.getAnfme() + orderDetl.getAnfme()); + item.setAnfme(MathUtils.add(item.getAnfme(), orderDetl.getAnfme())); item.setStandby1(param.getDefNumber()); if (!orderDetlService.updateById(item)) { throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗eけ璐�"); @@ -232,7 +233,7 @@ OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(), param.getItemId(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3()); - item.setAnfme(item.getAnfme() + orderDetl.getAnfme()); + item.setAnfme(MathUtils.add(item.getAnfme() , orderDetl.getAnfme())); if (!orderDetlService.updateById(item)) { throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗eけ璐�"); } @@ -272,7 +273,7 @@ totalQty = totalQty + orderDetl.getAnfme(); wrkQty = wrkQty + orderDetl.getWorkQty(); endQty = endQty + orderDetl.getQty(); - double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D); + double issued = Optional.of(MathUtils.subtract(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) { -- Gitblit v1.9.1