From ae5fd37fc3cfdf60ad385211460e9d39ee53e5ba Mon Sep 17 00:00:00 2001 From: xj qian <qianxj15@sina.com> Date: 星期四, 14 十一月 2024 15:31:50 +0800 Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj --- jrj/project/business/VATNotify/VATInvoiceNew.cpp | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jrj/project/business/VATNotify/VATInvoiceNew.cpp b/jrj/project/business/VATNotify/VATInvoiceNew.cpp index 8ad5141..91fef26 100644 --- a/jrj/project/business/VATNotify/VATInvoiceNew.cpp +++ b/jrj/project/business/VATNotify/VATInvoiceNew.cpp @@ -392,9 +392,9 @@ end if if ls_comName <> '产品部' then - this.setitem(row,'billamt',dec(this.Describe(L"evaluate('notifybuyamt - if(isnull(kkamt),0,kkamt) + if(isnull(dkamt),0,dkamt)',L"+xstring(row)+L")L"))) + this.setitem(row,'billamt',dec(this.Describe(L"evaluate('notifybuyamt - if(isnull(kkamt),0,kkamt) + if(isnull(dkamt),0,dkamt)',L"+xstring(row)+L")"))) else - this.setitem(row,'billamt',dec(this.Describe(L"evaluate('prd_nbuyamt - if(isnull(kkamt),0,kkamt) + if(isnull(dkamt),0,dkamt)',L"+xstring(row)+L")L"))) + this.setitem(row,'billamt',dec(this.Describe(L"evaluate('prd_nbuyamt - if(isnull(kkamt),0,kkamt) + if(isnull(dkamt),0,dkamt)',L"+xstring(row)+L")"))) end if ll_decrate = this.getitemdecimal(row,'retax') -- Gitblit v1.9.3