From 2e1553e8a7120c2d38d69a8f400dcca2557b09fb Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 26 十二月 2025 15:59:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 225 +++++++++++++++++++++++++++++---------------
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetNotMoney.vue | 0
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue | 16 +-
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetMoney.vue | 4
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetTwoColumnNotMoney.vue | 0
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetTwoColumn.vue | 4
6 files changed, 160 insertions(+), 89 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetMoney.vue
similarity index 98%
rename from north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
rename to north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetMoney.vue
index 1276555..c13e8ee 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetMoney.vue
@@ -260,7 +260,7 @@
</tr>
<tr class="day-in">
<td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6" colspan="4">
- <div style="display: flex;font-size: 10px;text-align: center;">
+ <div style="display: flex;font-size: 14px;text-align: center;">
<span style="width: 25%;font-weight: bold;font-size: 12px">鍔犲伐璐圭敤</span>
<span style="width: 25%;font-weight: bold;font-size: 12px">鍗曚环</span>
<span style="width: 25%;font-weight: bold;font-size: 12px">鏁伴噺</span>
@@ -271,7 +271,7 @@
</tr>
<tr class="day-in">
<td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6;" colspan="4" >
- <div style="display: flex;font-size: 10px;text-align: center" v-for="(item, index2) in itme1.otherMoney1" :key="index2">
+ <div style="display: flex;font-size: 14px;text-align: center" v-for="(item, index2) in itme1.otherMoney1" :key="index2">
<span style="width: 25%">{{item.DeliveryDetailOtherMoney.alias}}</span>
<span style="width: 25%">{{item.DeliveryDetailOtherMoney.price}}</span>
<span style="width: 25%">{{item.DeliveryDetailOtherMoney.count}}</span>
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetNotMoney.vue
similarity index 100%
rename from north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
rename to north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetNotMoney.vue
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet3.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetTwoColumn.vue
similarity index 98%
rename from north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet3.vue
rename to north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetTwoColumn.vue
index 61707e9..75b108b 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet3.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetTwoColumn.vue
@@ -283,7 +283,7 @@
</tr>
<tr class="day-in">
<td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6" colspan="7">
- <div style="display: flex;font-size: 10px;text-align: center;">
+ <div style="display: flex;font-size: 14px;text-align: center;">
<span style="width: 25%;font-weight: bold;font-size: 12px">鍔犲伐璐圭敤</span>
<span style="width: 25%;font-weight: bold;font-size: 12px">鍗曚环</span>
<span style="width: 25%;font-weight: bold;font-size: 12px">鏁伴噺</span>
@@ -294,7 +294,7 @@
</tr>
<tr class="day-in">
<td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6;" colspan="7" >
- <div style="display: flex;font-size: 10px;text-align: center" v-for="(item, index2) in itme1.otherMoney1" :key="index2">
+ <div style="display: flex;font-size: 14px;text-align: center" v-for="(item, index2) in itme1.otherMoney1" :key="index2">
<span style="width: 25%">{{item.DeliveryDetailOtherMoney.alias}}</span>
<span style="width: 25%">{{item.DeliveryDetailOtherMoney.price}}</span>
<span style="width: 25%">{{item.DeliveryDetailOtherMoney.count}}</span>
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet4.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetTwoColumnNotMoney.vue
similarity index 100%
rename from north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet4.vue
rename to north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetTwoColumnNotMoney.vue
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
index 7710720..7fa7ebf 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
@@ -11,15 +11,15 @@
import DeliveryPrinting from "@/views/sd/delivery/DeliveryPrinting.vue";
import footSum from "@/hook/footSum"
import {CircleCheck, Download, Printer} from "@element-plus/icons-vue/global";
-import PrintSheet1 from "@/components/sd/delivery/PrintSheet1.vue";
-import PrintSheet2 from "@/components/sd/delivery/PrintSheet2.vue";
+import PrintSheetMoney from "@/components/sd/delivery/PrintSheetMoney.vue";
+import PrintSheetNotMoney from "@/components/sd/delivery/PrintSheetNotMoney.vue";
import PrintSheetLuoyang from "@/components/sd/delivery/PrintSheetLuoyang.vue";
import PrintSheetLuoyangDetails from "@/components/sd/delivery/PrintSheetLuoyangDetails.vue";
import useOrderInfoStore from "@/stores/sd/order/orderInfo";
import { saveAs } from "file-saver"
import companyInfo from "@/stores/sd/companyInfo";
-import PrintSheet3 from "@/components/sd/delivery/PrintSheet3.vue";
-import PrintSheet4 from "@/components/sd/delivery/PrintSheet4.vue";
+import PrintSheetTwoColumn from "@/components/sd/delivery/PrintSheetTwoColumn.vue";
+import PrintSheetTwoColumnNotMoney from "@/components/sd/delivery/PrintSheetTwoColumnNotMoney.vue";
import {addListener} from "@/hook/mouseMove";
import {copyTableCellValue} from "@/hook/copyTableCellValue";
@@ -787,14 +787,14 @@
/>
</el-select>
</template>
- <print-sheet1 id="child" v-if="sheetIndex===1" :deliveryId="flowData.delivery" />
- <print-sheet2 id="child" v-if="sheetIndex===2" :deliveryId="flowData.delivery" />
+ <print-sheet-money id="child" v-if="sheetIndex===1" :deliveryId="flowData.delivery" />
+ <print-sheet-not-money id="child" v-if="sheetIndex===2" :deliveryId="flowData.delivery" />
<print-sheet-luoyang id="child" v-if="sheetIndex===3" :deliveryId="flowData.delivery" :type="1" :optionVal='optionVal'/>
<print-sheet-luoyang id="child" v-if="sheetIndex===4" :deliveryId="flowData.delivery" :type="2" :optionVal='optionVal'/>
<print-sheet-luoyang-details id="child" v-if="sheetIndex===5" :deliveryId="flowData.delivery" :type="3" :optionVal='optionVal'/>
<print-sheet-luoyang-details id="child" v-if="sheetIndex===6" :deliveryId="flowData.delivery" :type="4" :optionVal='optionVal'/>
- <print-sheet3 id="child" v-if="sheetIndex===7" :deliveryId="flowData.delivery" />
- <print-sheet4 id="child" v-if="sheetIndex===8" :deliveryId="flowData.delivery" />
+ <print-sheet-two-column id="child" v-if="sheetIndex===7" :deliveryId="flowData.delivery" />
+ <print-sheet-two-column-not-money id="child" v-if="sheetIndex===8" :deliveryId="flowData.delivery" />
</el-dialog>
</div>
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..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
@@ -764,91 +764,162 @@
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));
+ if (flowCards.isEmpty()) {
+ FinishedGoodsInventory finishedGoodsInventory = finishedGoodsInventoryMapper.findOrderNumberd(orderDetail.getOrderId(), orderDetail.getOrderNumber());
+ // 璁＄畻鍓╀綑鏁伴噺
+ long quantity;
+ 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 = "";
+ finishedOperateLogMapper.insertOrderFinishedOperateLog(orderDetail, userName, oddNumber, processId);
+ finishedGoodsInventoryMapper.updateOrderNumberConut(orderDetail.getOrderId(), orderDetail.getOrderNumber(), orderDetail.getQuantity());
- // 璁＄畻鍓╀綑鏁伴噺
- long quantity;
- if (flowCard != null) {
- quantity = flowCard.getQuantity() - flowCard.getReceivedQuantity();
- } else {
- quantity = orderDetail.getQuantity() - orderDetail.getWarehouseNum();
- }
- if (quantity <= 0) continue ;
+ }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();
+ }
- int calculateType=order.getCalculateType();
- double deliveryDetailMoney = 0.0;
- double deliveryDetailArea = 0.0;
+ if (quantity <= 0) continue;
- 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();
+ int calculateType = order.getCalculateType();
+ double deliveryDetailMoney = 0.0;
+ double deliveryDetailArea = 0.0;
- }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();
+ 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);
+ }
}
- }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);
}
}
--
Gitblit v1.8.0