From 34b7f095d02c7e5ac85e76b6edab784e83ea78f3 Mon Sep 17 00:00:00 2001 From: guoyujie <guoyujie@ng.com> Date: 星期二, 25 三月 2025 08:26:54 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override --- north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java index 5f5595a..6958c49 100644 --- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java +++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java @@ -1189,6 +1189,7 @@ newOrderDetail.setLandingSequence(flowCardNo); orderDetailList.add(newOrderDetail); orderDetail.setQuantity(orderDetail.getQuantity() - shelfQuantity); + orderDetail.setBaiscQuantity(String.valueOf(Integer.valueOf(orderDetail.getBaiscQuantity())-shelfQuantity)); flowCardNo += 1; shelfQuantity = shelfQuantity - shelfQuantity; } else { @@ -1199,6 +1200,7 @@ newOrderDetail.setOrderNumber(orderDetail.getOrderNumber()); newOrderDetail.setShape(orderDetail.getShape()); newOrderDetail.setLandingSequence(flowCardNo); + newOrderDetail.setBaiscQuantity(String.valueOf(orderDetail.getBaiscQuantity())); orderDetailList.add(newOrderDetail); //褰撳墠鏋跺瓙鍓╀綑鏁伴噺 shelfQuantity = shelfQuantity - Math.toIntExact(orderDetail.getQuantity()); -- Gitblit v1.8.0