From a00a32e331bbf32ebaf6850150977204d9de381a Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期一, 04 八月 2025 14:44:52 +0800
Subject: [PATCH] 修改每次修变量，由0.1改为1
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
index bb36e27..e87d781 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
@@ -545,8 +545,17 @@
orderId=detail.getOrderDetail().getOrderId();
Map<String, Object> itemmap = new HashMap<>();
- List<Map<String, Object>> deliveryDetailList2 = deliveryDetailMapper.getSelectDeliveryDetailPrinting(detail.getDeliveryId(),
- detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());
+ List<Map<String, Object>> deliveryDetailList2;
+ if(state==3){
+ deliveryDetailList2=deliveryDetailMapper.getSelectDeliveryPrintingMoneySpecifications(detail.getDeliveryId(),
+ detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());
+ }else if(state==4){
+ deliveryDetailList2=deliveryDetailMapper.getSelectDeliveryPrintingNoMoneySpecifications(detail.getDeliveryId(),
+ detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());
+ }else{
+ deliveryDetailList2 = deliveryDetailMapper.getSelectDeliveryDetailPrinting(detail.getDeliveryId(),
+ detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());
+ }
for (Map<String, Object> stringObjectMap : deliveryDetailList2) {
if(stringObjectMap.get("other_columns")!=null){
--
Gitblit v1.8.0