From b1b5cf4b00ddc12f624f299174a6366d2cdb2617 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 15:20:31 +0800
Subject: [PATCH] 提交相关代码
---
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 203 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 137 insertions(+), 66 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
index 7c40dc3..5cdac8c 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
@@ -770,87 +770,158 @@
.eq(FlowCard::getOrderId, orderDetail.getOrderId())
.eq(FlowCard::getOrderNumber, orderDetail.getOrderNumber())
.groupBy(FlowCard::getOrderId, FlowCard::getOrderNumber,FlowCard::getProcessId));
- FinishedGoodsInventory finishedGoodsInventory = finishedGoodsInventoryMapper.findOrderNumberd(orderDetail.getOrderId(), orderDetail.getOrderNumber());
- for (FlowCard flowCard:flowCards){
-
- // 璁＄畻鍓╀綑鏁伴噺
- long quantity;
- if (flowCard != null) {
- quantity = flowCard.getQuantity() - flowCard.getReceivedQuantity();
- } else {
+ if (flowCards.isEmpty()) {
+ FinishedGoodsInventory finishedGoodsInventory = finishedGoodsInventoryMapper.findOrderNumberd(orderDetail.getOrderId(), orderDetail.getOrderNumber());
+ // 璁＄畻鍓╀綑鏁伴噺
+ long quantity;
quantity = orderDetail.getQuantity() - orderDetail.getWarehouseNum();
- }
- if (quantity <= 0) continue;
+ if (quantity <= 0) continue;
- int calculateType = order.getCalculateType();
- double deliveryDetailMoney = 0.0;
- double deliveryDetailArea = 0.0;
+ int calculateType = order.getCalculateType();
+ double deliveryDetailMoney = 0.0;
+ double deliveryDetailArea = 0.0;
- BigDecimal getComputeArea = BigDecimal.valueOf(orderDetail.getComputeArea());
- BigDecimal getQuantity = BigDecimal.valueOf(quantity);
- BigDecimal getPrice = BigDecimal.valueOf(orderDetail.getPrice());
- BigDecimal getWidth = BigDecimal.valueOf(orderDetail.getWidth());
- BigDecimal getHeight = BigDecimal.valueOf(orderDetail.getHeight());
- BigDecimal singlePieceArea = getComputeArea.multiply(getQuantity).setScale(2, RoundingMode.HALF_UP)
- .multiply(getPrice).setScale(2, RoundingMode.HALF_UP);
- //鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
- if (calculateType == 1) {
- deliveryDetailMoney = singlePieceArea.doubleValue();
- deliveryDetailArea = getComputeArea.multiply(getQuantity).doubleValue();
-
- } else if (calculateType == 2) {
- //鍒ゆ柇瀹為檯鍗曠墖闈㈢Н璺熺粨绠楀崟鐗囬潰绉槸鍚︾浉绛� 缁撶畻鎬婚潰绉窡瀹為檯鎬婚潰绉槸鍚︾浉绛�
- if (Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea()) && Objects.equals(orderDetail.getGrossArea(), orderDetail.getComputeGrossArea())) {
- deliveryDetailMoney = getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP)
- .multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
- deliveryDetailArea = getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
- } else {
+ BigDecimal getComputeArea = BigDecimal.valueOf(orderDetail.getComputeArea());
+ BigDecimal getQuantity = BigDecimal.valueOf(quantity);
+ BigDecimal getPrice = BigDecimal.valueOf(orderDetail.getPrice());
+ BigDecimal getWidth = BigDecimal.valueOf(orderDetail.getWidth());
+ BigDecimal getHeight = BigDecimal.valueOf(orderDetail.getHeight());
+ BigDecimal singlePieceArea = getComputeArea.multiply(getQuantity).setScale(2, RoundingMode.HALF_UP)
+ .multiply(getPrice).setScale(2, RoundingMode.HALF_UP);
+ //鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
+ if (calculateType == 1) {
deliveryDetailMoney = singlePieceArea.doubleValue();
deliveryDetailArea = getComputeArea.multiply(getQuantity).doubleValue();
- }
- } else if (calculateType == 3) {
- deliveryDetailMoney = getQuantity.multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
- deliveryDetailArea = getComputeArea.multiply(getQuantity).doubleValue();
- } else if (calculateType == 4) {
- //鍒ゆ柇瀹為檯鍗曠墖闈㈢Н璺熺粨绠楀崟鐗囬潰绉槸鍚︾浉绛� 缁撶畻鎬婚潰绉窡瀹為檯鎬婚潰绉槸鍚︾浉绛�
- if (Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea()) && Objects.equals(orderDetail.getGrossArea(), orderDetail.getComputeGrossArea())) {
- deliveryDetailMoney = getWidth.multiply(getHeight).multiply(getQuantity).multiply(getPrice).
- divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
- deliveryDetailArea = getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
- } else {
- deliveryDetailMoney = getComputeArea.multiply(getQuantity).multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
+ } else if (calculateType == 2) {
+ //鍒ゆ柇瀹為檯鍗曠墖闈㈢Н璺熺粨绠楀崟鐗囬潰绉槸鍚︾浉绛� 缁撶畻鎬婚潰绉窡瀹為檯鎬婚潰绉槸鍚︾浉绛�
+ if (Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea()) && Objects.equals(orderDetail.getGrossArea(), orderDetail.getComputeGrossArea())) {
+ deliveryDetailMoney = getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP)
+ .multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
+ deliveryDetailArea = getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
+ } else {
+ deliveryDetailMoney = singlePieceArea.doubleValue();
+ deliveryDetailArea = getComputeArea.multiply(getQuantity).doubleValue();
+ }
+ } else if (calculateType == 3) {
+ deliveryDetailMoney = getQuantity.multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
deliveryDetailArea = getComputeArea.multiply(getQuantity).doubleValue();
+
+ } else if (calculateType == 4) {
+ //鍒ゆ柇瀹為檯鍗曠墖闈㈢Н璺熺粨绠楀崟鐗囬潰绉槸鍚︾浉绛� 缁撶畻鎬婚潰绉窡瀹為檯鎬婚潰绉槸鍚︾浉绛�
+ if (Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea()) && Objects.equals(orderDetail.getGrossArea(), orderDetail.getComputeGrossArea())) {
+ deliveryDetailMoney = getWidth.multiply(getHeight).multiply(getQuantity).multiply(getPrice).
+ divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
+ deliveryDetailArea = getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
+ } else {
+ deliveryDetailMoney = getComputeArea.multiply(getQuantity).multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
+ deliveryDetailArea = getComputeArea.multiply(getQuantity).doubleValue();
+ }
}
- }
- // 鏇存柊璁㈠崟鏄庣粏
- orderDetail.setQuantity(quantity);
- orderDetail.setGrossAmount(deliveryDetailMoney);
- orderDetail.setComputeGrossArea(deliveryDetailArea);
+ // 鏇存柊璁㈠崟鏄庣粏
+ orderDetail.setQuantity(quantity);
+ orderDetail.setGrossAmount(deliveryDetailMoney);
+ orderDetail.setComputeGrossArea(deliveryDetailArea);
- // 鏇存柊搴撳瓨
- if (finishedGoodsInventory != null) {
- finishedGoodsInventoryMapper.updateOrderInventory(orderDetail);
- } else {
- finishedGoodsInventoryMapper.insertOrderFinishedGoodsInventory(orderDetail);
- }
+ // 鏇存柊搴撳瓨
+ if (finishedGoodsInventory != null) {
+ finishedGoodsInventoryMapper.updateOrderInventory(orderDetail);
+ } else {
+ finishedGoodsInventoryMapper.insertOrderFinishedGoodsInventory(orderDetail);
+ }
- // 璁板綍鎿嶄綔鏃ュ織
- String processId = flowCard != null ? flowCard.getProcessId() : "";
- finishedOperateLogMapper.insertOrderFinishedOperateLog(orderDetail, userName, oddNumber, processId);
- finishedGoodsInventoryMapper.updateOrderNumberConut(orderDetail.getOrderId(), orderDetail.getOrderNumber(), orderDetail.getQuantity());
+ // 璁板綍鎿嶄綔鏃ュ織
+ String processId = "";
+ finishedOperateLogMapper.insertOrderFinishedOperateLog(orderDetail, userName, oddNumber, processId);
+ finishedGoodsInventoryMapper.updateOrderNumberConut(orderDetail.getOrderId(), orderDetail.getOrderNumber(), orderDetail.getQuantity());
- // 鏇存柊娴佺▼鍗�
- if (flowCard != null) {
- flowCard.setInventoryQuantity((int) quantity);
- Order order1 = new Order();
- order1.setOrderId(flowCard.getOrderId());
- flowCard.setOrder(order1);
- finishedGoodsInventoryMapper.updateflowcard(flowCard);
+
+
+ }else{
+ for (FlowCard flowCard:flowCards){
+ FinishedGoodsInventory finishedGoodsInventory = finishedGoodsInventoryMapper.findOrderNumberd(orderDetail.getOrderId(), orderDetail.getOrderNumber());
+ // 璁＄畻鍓╀綑鏁伴噺
+ long quantity;
+ if (flowCard != null) {
+ quantity = flowCard.getQuantity() - flowCard.getReceivedQuantity();
+ } else {
+ quantity = orderDetail.getQuantity() - orderDetail.getWarehouseNum();
+ }
+
+ if (quantity <= 0) continue;
+
+ int calculateType = order.getCalculateType();
+ double deliveryDetailMoney = 0.0;
+ double deliveryDetailArea = 0.0;
+
+ BigDecimal getComputeArea = BigDecimal.valueOf(orderDetail.getComputeArea());
+ BigDecimal getQuantity = BigDecimal.valueOf(quantity);
+ BigDecimal getPrice = BigDecimal.valueOf(orderDetail.getPrice());
+ BigDecimal getWidth = BigDecimal.valueOf(orderDetail.getWidth());
+ BigDecimal getHeight = BigDecimal.valueOf(orderDetail.getHeight());
+ BigDecimal singlePieceArea = getComputeArea.multiply(getQuantity).setScale(2, RoundingMode.HALF_UP)
+ .multiply(getPrice).setScale(2, RoundingMode.HALF_UP);
+ //鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
+ if (calculateType == 1) {
+ deliveryDetailMoney = singlePieceArea.doubleValue();
+ deliveryDetailArea = getComputeArea.multiply(getQuantity).doubleValue();
+
+ } else if (calculateType == 2) {
+ //鍒ゆ柇瀹為檯鍗曠墖闈㈢Н璺熺粨绠楀崟鐗囬潰绉槸鍚︾浉绛� 缁撶畻鎬婚潰绉窡瀹為檯鎬婚潰绉槸鍚︾浉绛�
+ if (Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea()) && Objects.equals(orderDetail.getGrossArea(), orderDetail.getComputeGrossArea())) {
+ deliveryDetailMoney = getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP)
+ .multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
+ deliveryDetailArea = getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
+ } else {
+ deliveryDetailMoney = singlePieceArea.doubleValue();
+ deliveryDetailArea = getComputeArea.multiply(getQuantity).doubleValue();
+ }
+ } else if (calculateType == 3) {
+ deliveryDetailMoney = getQuantity.multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
+ deliveryDetailArea = getComputeArea.multiply(getQuantity).doubleValue();
+
+ } else if (calculateType == 4) {
+ //鍒ゆ柇瀹為檯鍗曠墖闈㈢Н璺熺粨绠楀崟鐗囬潰绉槸鍚︾浉绛� 缁撶畻鎬婚潰绉窡瀹為檯鎬婚潰绉槸鍚︾浉绛�
+ if (Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea()) && Objects.equals(orderDetail.getGrossArea(), orderDetail.getComputeGrossArea())) {
+ deliveryDetailMoney = getWidth.multiply(getHeight).multiply(getQuantity).multiply(getPrice).
+ divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
+ deliveryDetailArea = getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
+ } else {
+ deliveryDetailMoney = getComputeArea.multiply(getQuantity).multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
+ deliveryDetailArea = getComputeArea.multiply(getQuantity).doubleValue();
+ }
+ }
+
+ // 鏇存柊璁㈠崟鏄庣粏
+ orderDetail.setQuantity(quantity);
+ orderDetail.setGrossAmount(deliveryDetailMoney);
+ orderDetail.setComputeGrossArea(deliveryDetailArea);
+
+ // 鏇存柊搴撳瓨
+ if (finishedGoodsInventory != null) {
+ finishedGoodsInventoryMapper.updateOrderInventory(orderDetail);
+ } else {
+ finishedGoodsInventoryMapper.insertOrderFinishedGoodsInventory(orderDetail);
+ }
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ String processId = flowCard != null ? flowCard.getProcessId() : "";
+ finishedOperateLogMapper.insertOrderFinishedOperateLog(orderDetail, userName, oddNumber, processId);
+ finishedGoodsInventoryMapper.updateOrderNumberConut(orderDetail.getOrderId(), orderDetail.getOrderNumber(), orderDetail.getQuantity());
+
+ // 鏇存柊娴佺▼鍗�
+ if (flowCard != null) {
+ flowCard.setInventoryQuantity((int) quantity);
+ Order order1 = new Order();
+ order1.setOrderId(flowCard.getOrderId());
+ flowCard.setOrder(order1);
+ finishedGoodsInventoryMapper.updateflowcard(flowCard);
+ }
}
}
+
}
finishedGoodsInventoryMapper.updateOrderWarehousingState(orderId,2);
}
--
Gitblit v1.8.0