diff --git a/uapbd/src/private/nc/bs/uapbd/task/InvoiceTaskPlugin.java b/uapbd/src/private/nc/bs/uapbd/task/InvoiceTaskPlugin.java index ee6729d0..e50ed52b 100644 --- a/uapbd/src/private/nc/bs/uapbd/task/InvoiceTaskPlugin.java +++ b/uapbd/src/private/nc/bs/uapbd/task/InvoiceTaskPlugin.java @@ -31,7 +31,7 @@ public class InvoiceTaskPlugin implements IBackgroundWorkPlugin{ " left join sscivm_ivapplog on sscivm_ivapplog.fphm = sscivm_invoice.fphm " + " where " + " sscivm_invoice_relation.billtype = '32' " + - " and (so_saleinvoice.vdef20 <> 'Y' OR so_saleinvoice.vdef13 IS NULL OR so_saleinvoice.vdef13='~' ) " + + " and (so_saleinvoice.vdef20 <> 'Y' OR so_saleinvoice.vdef13 <> sscivm_invoice.fphm)" + " and sscivm_invoice.dr = 0 " + " and sscivm_ivapplog.kpzt = 2 "; // + " so_saleinvoice.vbillcode = 'SI2024070400000738' "; @@ -76,10 +76,9 @@ public class InvoiceTaskPlugin implements IBackgroundWorkPlugin{ // Logger.error("---sirSqlExecute------"+sirSql); //ERP销售发票回传,根据销售发票id,回写发票号和单据编号 // String sSaleSql = "UPDATE so_saleinvoice set vdef20 = 'Y' , vdef13 = '" + fphm + "', vbillcode = '" + fphm +"' where csaleinvoiceid = '" + csaleinvoiceid + "'"; -// String sSaleSql = "UPDATE so_saleinvoice set vdef20 = 'Y' , vdef13 = '" + fphm + "' where csaleinvoiceid = '" + csaleinvoiceid + "'"; - -// dao.executeUpdate(sSaleSql); -// Logger.error("---sSaleSqlExecute------"+sSaleSql); + String sSaleSql = "UPDATE so_saleinvoice set vdef20 = 'Y' , vdef13 = '" + fphm + "' where csaleinvoiceid = '" + csaleinvoiceid + "'"; + dao.executeUpdate(sSaleSql); + Logger.error("---sSaleSqlExecute------"+sSaleSql); //根据销售发票id 回写下游应收单表头发票号 String recBillSql = "MERGE INTO ar_recbill a USING (select DISTINCT pk_recbill,top_billid,top_billtype from ar_recitem) b ON ( a.pk_recbill = b.pk_recbill AND b.top_billid = '" + csaleinvoiceid + "' AND b.top_billtype = '32' ) \n" + "WHEN MATCHED THEN\n" +