diff --git a/Pilot_KD_Parino/QPHY_AutoWrireRecord/HeXiaoJiLuSave.cs b/Pilot_KD_Parino/QPHY_AutoWrireRecord/HeXiaoJiLuSave.cs index 9c9016a..03d3c46 100644 --- a/Pilot_KD_Parino/QPHY_AutoWrireRecord/HeXiaoJiLuSave.cs +++ b/Pilot_KD_Parino/QPHY_AutoWrireRecord/HeXiaoJiLuSave.cs @@ -47,7 +47,7 @@ namespace Pilot_KD_Parino.QPHY_AutoWrireRecord var data = DBServiceHelper.ExecuteDynamicObject(this.Context, sql); var one1 = (from q in data join b in list1 on q["FBILLNO"].ToString() equals b["FBILLNO2"].ToString() - where decimal.Parse(b["FALLAMOUNT22"]?.ToString()) != decimal.Parse(q["F_AMOUNT"]?.ToString()) + where decimal.Parse(b["FALLAMOUNT22"]?.ToString()) > decimal.Parse(q["F_AMOUNT"]?.ToString()) select q["FBILLNO"]).ToList(); if (one1.Count > 0) { @@ -62,7 +62,7 @@ namespace Pilot_KD_Parino.QPHY_AutoWrireRecord one1 = (from q in data join b in list2 on q["FBILLNO"].ToString() equals b["FBILLNO3"].ToString() - where decimal.Parse(b["FALLAMOUNT33"]?.ToString()) != decimal.Parse(q["F_AMOUNT"]?.ToString()) + where decimal.Parse(b["FALLAMOUNT33"]?.ToString()) > decimal.Parse(q["F_AMOUNT"]?.ToString()) select q["FBILLNO"]).ToList(); if (one1.Count > 0) { diff --git a/更新核销金额.sql b/更新核销金额.sql index 0063ede..86568be 100644 --- a/更新核销金额.sql +++ b/更新核销金额.sql @@ -14,9 +14,6 @@ BEGIN UPDATE T_AutoWrireRecordEntry SET FALLAMOUNT2=FALLAMOUNT22 WHERE fid=@fid -UPDATE T_AutoWrireRecord SET F_YeWuDate=b.FDATE3 -FROM T_AutoWrireRecordEntry2 b -WHERE T_AutoWrireRecord.FID=@fid AND F_YeWuDate IS NULL AND b.FID=T_AutoWrireRecord.FID UPDATE T_AutoWrireRecordEntry2 SET FALLAMOUNT3=FALLAMOUNT33,FCONTRACTNUMBER2=(SELECT STRING_AGG(FCONTRACTNUMBER,',') FROM T_AutoWrireRecordEntry WHERE fid= T_AutoWrireRecordEntry2.FID) WHERE fid=@fid @@ -32,9 +29,19 @@ LEFT JOIN T_AutoWrireRecordEntry2 b ON a.FBILLNO=b.FBILLNO3 WHERE b.fid=@fid IF(@custID1 !=@cusId2 ) +begin UPDATE T_AutoWrireRecord SET F_KUAKEHU='' WHERE FID=@fid + update T_AutoWrireRecord SET F_YeWuDate=FCreateDate + WHERE T_AutoWrireRecord.FID=@fid AND F_YeWuDate IS NULL + end ELSE - UPDATE T_AutoWrireRecord SET F_KUAKEHU='' WHERE FID=@fid +begin + UPDATE T_AutoWrireRecord SET F_KUAKEHU='' WHERE FID=@fid + + UPDATE T_AutoWrireRecord SET F_YeWuDate=b.FDATE3 + FROM T_AutoWrireRecordEntry2 b + WHERE T_AutoWrireRecord.FID=@fid AND F_YeWuDate IS NULL AND b.FID=T_AutoWrireRecord.FID + UPDATE C SET F_Amount =c.F_Amount+ISNULL( d.,0) FROM T_AutoWrireRecord A INNER JOIN T_AutoWrireRecordEntry B ON A.FID = B.FID @@ -47,7 +54,7 @@ ELSE GROUP BY B.FBILLNO2 ) d ON d.FBILLNO2 =b.FBILLNO2 WHERE a.FID =@FID ; - + end --޸Ӧյۼƺ UPDATE C SET F_Amount =c.F_Amount+ISNULL( d.,0)