From 9b362b55344d0c854355eb2db1de84219b53a77e Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 29 十二月 2025 16:35:48 +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/sd/DeliveryService.java | 3 +++
1 files changed, 3 insertions(+), 0 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 3e6dd5a..25dd224 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
@@ -570,12 +570,15 @@
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());
}
--
Gitblit v1.8.0