From dbede726f480557f260d3ae41a405f5d5acb2d50 Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" Date: Wed, 2 Apr 2025 16:15:08 +0800 Subject: [PATCH] no message --- .../server/service/order/pojo/DefaultCustomsOrderManager.java | 2 +- .../classes/config/origen/delivery/modifyCustomsPayFeePage.xml | 2 +- .../classes/config/origen/delivery/modifyCustomsPayFeePage.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/dev/swms/server/service/order/pojo/DefaultCustomsOrderManager.java b/src/main/java/com/dev/swms/server/service/order/pojo/DefaultCustomsOrderManager.java index 1489417..9b69744 100644 --- a/src/main/java/com/dev/swms/server/service/order/pojo/DefaultCustomsOrderManager.java +++ b/src/main/java/com/dev/swms/server/service/order/pojo/DefaultCustomsOrderManager.java @@ -1244,7 +1244,7 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu public double getpayMoneyMap(Map map) { Long id=(Long) map.get("co.id"); CustomsOrder co=this.load(CustomsOrder.class, id); - Double qty= (Double) commonDao.findByQuery("select nvl(sum(fee.feeMenoy),0) from Fee fee where 1=1 and ((fee.orderId=:id and fee.billType='CUSTOMSORDER') or (fee.customsOrderId=:id and fee.billType='INVOICEBOX')) and fee.payOrReceive='应付' ", + Double qty= (Double) commonDao.findByQuery("select nvl(sum(fee.feeMenoy),0) from Fee fee where 1=1 and ((fee.orderId=:id and fee.billType='CUSTOMSORDER') or (fee.customsOrderId=:id and fee.billType='INVOICEBOX') or (fee.customsOrderId=:id and fee.billType='ASN') or (fee.customsOrderId=:id and fee.billType='PICKTICKET')) and fee.payOrReceive='应付' ", new String[] { "id"},new Object[] {id}).get(0); return qty; } diff --git a/src/webapp/WEB-INF/classes/config/origen/delivery/modifyCustomsPayFeePage.xml b/src/webapp/WEB-INF/classes/config/origen/delivery/modifyCustomsPayFeePage.xml index e492c70..b66bc69 100644 --- a/src/webapp/WEB-INF/classes/config/origen/delivery/modifyCustomsPayFeePage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/delivery/modifyCustomsPayFeePage.xml @@ -35,7 +35,7 @@ FROM Fee fee left join fee.feeName left join fee.billFee - WHERE 1=1 and ((fee.orderId={co.id} and fee.billType='CUSTOMSORDER') or (fee.customsOrderId={co.id} and fee.billType='INVOICEBOX')or (fee.customsOrderId={co.id} and fee.billType='ASN')) + WHERE 1=1 and ((fee.orderId={co.id} and fee.billType='CUSTOMSORDER') or (fee.customsOrderId={co.id} and fee.billType='INVOICEBOX')or (fee.customsOrderId={co.id} and fee.billType='ASN') or (fee.customsOrderId={co.id} and fee.billType='PICKTICKET')) and fee.payOrReceive='应付' ]]> diff --git a/target/jjwms/WEB-INF/classes/config/origen/delivery/modifyCustomsPayFeePage.xml b/target/jjwms/WEB-INF/classes/config/origen/delivery/modifyCustomsPayFeePage.xml index e492c70..b66bc69 100644 --- a/target/jjwms/WEB-INF/classes/config/origen/delivery/modifyCustomsPayFeePage.xml +++ b/target/jjwms/WEB-INF/classes/config/origen/delivery/modifyCustomsPayFeePage.xml @@ -35,7 +35,7 @@ FROM Fee fee left join fee.feeName left join fee.billFee - WHERE 1=1 and ((fee.orderId={co.id} and fee.billType='CUSTOMSORDER') or (fee.customsOrderId={co.id} and fee.billType='INVOICEBOX')or (fee.customsOrderId={co.id} and fee.billType='ASN')) + WHERE 1=1 and ((fee.orderId={co.id} and fee.billType='CUSTOMSORDER') or (fee.customsOrderId={co.id} and fee.billType='INVOICEBOX')or (fee.customsOrderId={co.id} and fee.billType='ASN') or (fee.customsOrderId={co.id} and fee.billType='PICKTICKET')) and fee.payOrReceive='应付' ]]>