发货单新增已开票金额错误修复2

src/apps/salogis/salogis.java

@@ -186,15 +186,32 @@ public class salogis extends PaoCust {
         super.check(ischeck);
 
         DBConnect dbConnect = new DBConnect();
-        Rows rows = dbConnect.runSqlQuery("select t.saorderdetailid,t.finvoiceamount-t.finvoiceamount2 as finvoiceamount  from (\n" +
-                "select t4.saorderdetailid,isnull(t4.finvoiceamount,0)as finvoiceamount,sum(isnull(t3.finvoiceamount,0))finvoiceamount2  from salogis t1\n" +
-                "inner join salogisdetail t2 on t1.salogisid=t2.fparentid\n" +
-                "inner join sainvoicedetail t3 on t2.fsourceid=t3.fparentid and t2.fsourceobject='SAINVOICE'\n" +
-                "inner join saorderdetail t4 on t3.fsourceid=t4.saorderdetailid\n" +
-                "where t1.salogisid='" + getUniqueIDValue() + "'\n" +
-                "group by t4.saorderdetailid,t4.finvoiceamount\n" +
-                ")t where t.finvoiceamount-t.finvoiceamount2>0");
+//        Rows rows = dbConnect.runSqlQuery("select t.saorderdetailid,t.finvoiceamount-t.finvoiceamount2 as finvoiceamount  from (\n" +
+//                "select t4.saorderdetailid,isnull(t4.finvoiceamount,0)as finvoiceamount,sum(isnull(t3.finvoiceamount,0))finvoiceamount2  from salogis t1\n" +
+//                "inner join salogisdetail t2 on t1.salogisid=t2.fparentid\n" +
+//                "inner join sainvoicedetail t3 on t2.fsourceid=t3.fparentid and t2.fsourceobject='SAINVOICE'\n" +
+//                "inner join saorderdetail t4 on t3.fsourceid=t4.saorderdetailid\n" +
+//                "where t1.salogisid='" + getUniqueIDValue() + "'\n" +
+//                "group by t4.saorderdetailid,t4.finvoiceamount\n" +
+//                ")t where t.finvoiceamount-t.finvoiceamount2>0");
 
+        Rows rows=dbConnect.runSqlQuery("\n" +
+                "select t.saorderdetailid,sum(t.finvoiceamount)-sum(t.finvoiceamount2) as finvoiceamount  from (\n" +
+                "\tselect t4.saorderdetailid,isnull(t4.finvoiceamount,0)as finvoiceamount,0 finvoiceamount2 from salogis t1\n" +
+                "\tinner join salogisdetail t2 on t1.salogisid=t2.fparentid\n" +
+                "\tinner join sainvoicedetail t3 on t2.fsourceid=t3.fparentid and t2.fsourceobject='SAINVOICE'\n" +
+                "\tinner join saorderdetail t4 on t3.fsourceid=t4.saorderdetailid\n" +
+                "\twhere t1.salogisid='"+getUniqueIDValue()+"'\n" +
+                "\tunion all\n" +
+                "\tselect t4.fsourceid,0 as finvoiceamount,isnull(t4.finvoiceamount,0) as finvoiceamount2 from salogis t1\n" +
+                "\tinner join salogisdetail t2 on t1.salogisid=t2.fparentid\n" +
+                "\tinner join sainvoicedetail t3 on t2.fsourceid=t3.fparentid and t2.fsourceobject='SAINVOICE'\n" +
+                "\tinner join sainvoicedetail t4 on t3.fsourceid=t4.fsourceid\n" +
+                "\twhere t1.salogisid='"+getUniqueIDValue()+"'\n" +
+                "\t\n" +
+                ")t \n" +
+                "group by t.saorderdetailid\n" +
+                "having sum(t.finvoiceamount)-sum(t.finvoiceamount2)>0");
         HashMap<Long, Double> finvoiceamountmap = new HashMap();//¿É·ÖÅ俪Ʊ½ð¶îmap
         for (Row row : rows) {
             finvoiceamountmap.put(row.getLong("saorderdetailid"), row.getDouble("finvoiceamount"));