diff --git a/Pilot_KD_Parino/QPHY_AutoWrire/Bill5.cs b/Pilot_KD_Parino/QPHY_AutoWrire/Bill5.cs index 2b89d1f..538dc01 100644 --- a/Pilot_KD_Parino/QPHY_AutoWrire/Bill5.cs +++ b/Pilot_KD_Parino/QPHY_AutoWrire/Bill5.cs @@ -916,29 +916,28 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire if(benci==0) continue; this.View.Model.CreateNewEntryRow("FEntity2"); - this.View.Model.SetValue("FROWID", Guid.NewGuid().ToString(), Rowindex ); - this.View.Model.SetValue("FPARENTROWID", FROWID, Rowindex ); - this.View.Model.SetValue("FBILLNO2", tempList2[i].FBIllNO, Rowindex ); + this.View.Model.SetValue("FROWID", Guid.NewGuid().ToString(), Rowindex + i ); + this.View.Model.SetValue("FPARENTROWID", FROWID, Rowindex + i); + this.View.Model.SetValue("FBILLNO2", tempList2[i].FBIllNO, Rowindex + i); if (DateTime.TryParseExact(tempList2[i].FDate, dateFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime parsedDate)) { - this.View.Model.SetValue("FDate2", tempList2[i].FDate, Rowindex ); + this.View.Model.SetValue("FDate2", tempList2[i].FDate, Rowindex + i); } else { - this.View.Model.SetValue("FDate2", DateTime.Now.AddDays(-1 * Convert.ToInt32(tempList2[i].FDate)).ToString("yyyy-MM-dd"), Rowindex ); + this.View.Model.SetValue("FDate2", DateTime.Now.AddDays(-1 * Convert.ToInt32(tempList2[i].FDate)).ToString("yyyy-MM-dd"), Rowindex + i); } - this.View.Model.SetValue("F_MBBA_Decimal_imu", tempList2[i].FALLAMOUNT, Rowindex ); - this.View.Model.SetValue("FClient2", tempList2[i].FClient, Rowindex ); - this.View.Model.SetValue("F_RowNew", 2, Rowindex ); + this.View.Model.SetValue("F_MBBA_Decimal_imu", tempList2[i].FALLAMOUNT, Rowindex + i); + this.View.Model.SetValue("FClient2", tempList2[i].FClient, Rowindex + i); + this.View.Model.SetValue("F_RowNew", 2, Rowindex + i); this.View.Model.SetValue("FCreated2", tempList2[i].FCreated, Rowindex ); - this.View.Model.SetValue("FCONTRACTNUMBER2", tempList2[i].FCONTRACTNUMBER, Rowindex ); - this.View.Model.SetValue("FSalesman2", tempList2[i].FSalesman, Rowindex ); - this.View.Model.SetValue("F_MBBA_Decimal_qtr", tempList2[i].FDAMOUNT, Rowindex ); - this.View.Model.SetValue("F_PendingAmount", tempList2[i].FDAMOUNT, Rowindex ); - this.View.Model.SetValue("F_BenCi", benci, Rowindex ); - this.View.Model.SetValue("F_MBBA_Decimal_3iy", tempList2[i].FYAMOUNT, Rowindex ); - this.View.Model.SetValue("F_ISHX", false, Rowindex ); - + this.View.Model.SetValue("FCONTRACTNUMBER2", tempList2[i].FCONTRACTNUMBER, Rowindex + i); + this.View.Model.SetValue("FSalesman2", tempList2[i].FSalesman, Rowindex + i); + this.View.Model.SetValue("F_MBBA_Decimal_qtr", tempList2[i].FDAMOUNT, Rowindex + i); + this.View.Model.SetValue("F_PendingAmount", tempList2[i].FDAMOUNT, Rowindex + i); + this.View.Model.SetValue("F_BenCi", benci, Rowindex + i); + this.View.Model.SetValue("F_MBBA_Decimal_3iy", tempList2[i].FYAMOUNT, Rowindex + i ); + this.View.Model.SetValue("F_ISHX", false, Rowindex + i); } diff --git a/Pilot_KD_Parino/SQL/SqlManage_yuyubo.cs b/Pilot_KD_Parino/SQL/SqlManage_yuyubo.cs index f9f5479..77732cb 100644 --- a/Pilot_KD_Parino/SQL/SqlManage_yuyubo.cs +++ b/Pilot_KD_Parino/SQL/SqlManage_yuyubo.cs @@ -116,7 +116,7 @@ GROUP BY F_PaperNumber, FSALEORGID AND A.FDOCUMENTSTATUS = 'C' AND ISNULL(A.F_CONTRACTNUMBER,'')!='' AND (A.F_AMOUNT < C.FBILLALLAMOUNT_LC or A.F_AMOUNT IS NULL) {where} - ) A ORDER BY A.FCUSTID,a.FID desc "); + ) A ORDER BY A.FCUSTID,a.FDATE "); return DBServiceHelper.ExecuteDynamicObject(ctx, sql.ToString(), null, null, CommandType.Text, null); }