From df2f744922fe80745ee3696ac3cedf0d961e33f9 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Wed, 4 Nov 2020 09:54:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A8=8E=E6=8E=A7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InvoiceTJ/InvoiceGpsTJList.jsp | 1 + .../InvoiceTJ/InvoiceGpsTJListHasInvoiced.jsp | 1 + WebContent/WEB-INF/etc/jbo/jbo_calc.xml | 1 + src_cmb/com/tenwa/invoice/IAutokpDo.java | 29 ++++++++++++++++++- .../app/tenwa/calc/VI_LI_INVOICE_TJ_GPS.java | 4 +++ src_sql/view/vi_li_invoice_tj_gps.sql | 5 ++-- 6 files changed, 38 insertions(+), 3 deletions(-) diff --git a/WebContent/Tenwa/Core/InvoiceManager/InvoiceTJ/InvoiceGpsTJList.jsp b/WebContent/Tenwa/Core/InvoiceManager/InvoiceTJ/InvoiceGpsTJList.jsp index 0cd6e9090..ee94f10d4 100644 --- a/WebContent/Tenwa/Core/InvoiceManager/InvoiceTJ/InvoiceGpsTJList.jsp +++ b/WebContent/Tenwa/Core/InvoiceManager/InvoiceTJ/InvoiceGpsTJList.jsp @@ -2,6 +2,7 @@ <%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% ASObjectModel doTemp = new ASObjectModel("Invoice_TJ_Gps"); + doTemp.appendJboWhere("O.liti_id is null"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "1"; //只读模式 diff --git a/WebContent/Tenwa/Core/InvoiceManager/InvoiceTJ/InvoiceGpsTJListHasInvoiced.jsp b/WebContent/Tenwa/Core/InvoiceManager/InvoiceTJ/InvoiceGpsTJListHasInvoiced.jsp index be7d735e8..0d815c4d5 100644 --- a/WebContent/Tenwa/Core/InvoiceManager/InvoiceTJ/InvoiceGpsTJListHasInvoiced.jsp +++ b/WebContent/Tenwa/Core/InvoiceManager/InvoiceTJ/InvoiceGpsTJListHasInvoiced.jsp @@ -2,6 +2,7 @@ <%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% ASObjectModel doTemp = new ASObjectModel("Invoice_TJ_Gps"); + doTemp.appendJboWhere("O.liti_id is not null"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "1"; //只读模式 diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index ab5bd503e..31bb86cc7 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -4388,6 +4388,7 @@ + diff --git a/src_cmb/com/tenwa/invoice/IAutokpDo.java b/src_cmb/com/tenwa/invoice/IAutokpDo.java index 52605dce7..29502c815 100644 --- a/src_cmb/com/tenwa/invoice/IAutokpDo.java +++ b/src_cmb/com/tenwa/invoice/IAutokpDo.java @@ -129,7 +129,7 @@ public class IAutokpDo { IAutokpUtils.saveFile(responseParam, fpdm+"-"+fphm+"_rnt"); Map responseResult = IAutokpUtils.getResponseResult(responseParam); if("6011".equals(responseResult.get("fl"))){ - + invalidInvoice(); } } return null; @@ -299,8 +299,35 @@ public class IAutokpDo { } + } + public void invalidInvoice(){ + Transaction Sqlca = null; + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + String usql = "update li_invoice_tj_info O set O.status='N' where fpdm='"+fpdm+"' and fphm='"+fphm+"'"; + SqlObject sql; + try { + sql = new SqlObject(usql); + Sqlca.executeSQL(sql); + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } + public void redbackInvoice(Transaction Sqlca){ + String usql = "update li_invoice_tj_info O set O.status='R' where fpdm='"+fpdm+"' and fphm='"+fphm+"'"; + + try { + SqlObject sql = new SqlObject(usql); + Sqlca.executeSQL(sql); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } } diff --git a/src_jbo/jbo/app/tenwa/calc/VI_LI_INVOICE_TJ_GPS.java b/src_jbo/jbo/app/tenwa/calc/VI_LI_INVOICE_TJ_GPS.java index f3a147c05..8d599d518 100644 --- a/src_jbo/jbo/app/tenwa/calc/VI_LI_INVOICE_TJ_GPS.java +++ b/src_jbo/jbo/app/tenwa/calc/VI_LI_INVOICE_TJ_GPS.java @@ -85,4 +85,8 @@ public interface VI_LI_INVOICE_TJ_GPS{ * hztzdh STRING(20)
*/ public static final String hztzdh = "hztzdh"; + /** + * liti_id STRING(20)
+ */ + public static final String liti_id = "liti_id"; } \ No newline at end of file diff --git a/src_sql/view/vi_li_invoice_tj_gps.sql b/src_sql/view/vi_li_invoice_tj_gps.sql index bdbec1f24..8a99fcfd0 100644 --- a/src_sql/view/vi_li_invoice_tj_gps.sql +++ b/src_sql/view/vi_li_invoice_tj_gps.sql @@ -28,7 +28,8 @@ CREATE VIEW `vi_li_invoice_tj_gps` AS `liti`.`status` AS `invoice_status`, `liti`.`FPDM` AS `FPDM`, `liti`.`FPHM` AS `FPHM`, - liti.hztzdh AS hztzdh + liti.hztzdh AS hztzdh, + liti.mxxh AS mxxh FROM ( ( @@ -39,7 +40,7 @@ CREATE VIEW `vi_li_invoice_tj_gps` AS LEFT JOIN `lb_contract_info` `lci` ON ((`lfi`.`CONTRACT_ID` = `lci`.`ID`)) ) - LEFT JOIN li_invoice_tj_info liti ON liti.contract_no = lci.contract_no AND liti.plan_list='1' AND liti.tax_type='feetype24' + LEFT JOIN (SELECT li.id,li.contract_no,li.status,li.FPDM,li.FPHM,li.hztzdh,li.mxxh FROM li_invoice_tj_info li WHERE li.tax_type='feetype24' AND li.status='Y') liti ON liti.contract_no = lci.contract_no LEFT JOIN `lb_union_lessee` `lul` ON ((`lul`.`CONTRACT_ID` = `lci`.`ID`)) )