From de08d4876092d361009aa467ef4d2a77068fbcaa Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 14:08:31 +0800
Subject: [PATCH] 一键入库相同订单序号，不同流程卡被过滤。无法入库问题
---
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 162 +++++++++++++++++++++++++++---------------------------
1 files changed, 81 insertions(+), 81 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 bdeadde..7c40dc3 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
@@ -764,93 +764,93 @@
Order order = orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",orderId));
if(order.getWarehousing()!=2){
List<OrderDetail> orderDetailList=finishedGoodsInventoryMapper.getSelectOrderDetail(orderId);
- for (OrderDetail orderDetail:orderDetailList){
- FlowCard flowCard =flowCardMapper.selectOne(
+ for (OrderDetail orderDetail:orderDetailList) {
+ List<FlowCard> flowCards = flowCardMapper.selectList(
new LambdaQueryWrapper<FlowCard>()
- .eq(FlowCard::getOrderId, orderDetail.getOrderId())
- .eq(FlowCard::getOrderNumber, orderDetail.getOrderNumber())
- .groupBy(FlowCard::getOrderId,FlowCard::getOrderNumber));
- FinishedGoodsInventory finishedGoodsInventory = finishedGoodsInventoryMapper.findOrderNumberd(orderDetail.getOrderId(),orderDetail.getOrderNumber());
+ .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 {
- 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();
+ // 璁＄畻鍓╀綑鏁伴噺
+ long quantity;
+ if (flowCard != null) {
+ quantity = flowCard.getQuantity() - flowCard.getReceivedQuantity();
+ } else {
+ quantity = orderDetail.getQuantity() - orderDetail.getWarehouseNum();
}
- }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();
+ 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);
}
}
-
- // 鏇存柊璁㈠崟鏄庣粏
- 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