diff --git a/Pilot_KD_Parino/QPHY_AutoWrire/Bill5.cs b/Pilot_KD_Parino/QPHY_AutoWrire/Bill5.cs index cca1190..4a7f3b0 100644 --- a/Pilot_KD_Parino/QPHY_AutoWrire/Bill5.cs +++ b/Pilot_KD_Parino/QPHY_AutoWrire/Bill5.cs @@ -444,6 +444,7 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire //Logger.Error("", "442"+ sdsad, new Exception()); ReceiveBILLLIST2 = FEntity2.Select(item => new CombinaClass { + FSKBIllNO = "", FBIllNO = item["FBILLNO2"]?.ToString(), FDate = item["FDate2"]?.ToString(), FALLAMOUNT = Convert.ToDouble(item["F_MBBA_Decimal_imu"]), @@ -548,6 +549,7 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire receiveItemTemp.FISHX = "已核销配对"; receiveItemTemp.BenCi = temp111.FDAMOUNT; receiveItemTemp.FDAMOUNT = receiveItemTemp.FDAMOUNT - receiveItemTemp.BenCi; + receiveItemTemp.FSKBIllNO = item.FBIllNO; //receiveItemTemp.FYAMOUNT = receiveItemTemp.FYAMOUNT + receiveItemTemp.BenCi; } } @@ -615,7 +617,7 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire receiveItemTemp.FDAMOUNT = receiveItemTemp.FDAMOUNT - receiveItemTemp.BenCi; //receiveItemTemp.FYAMOUNT = receiveItemTemp.FYAMOUNT + receiveItemTemp.BenCi; receiveItemTemp.FWeiYi = "是"; - + receiveItemTemp.FSKBIllNO = item.FBIllNO; shouKuanDetail.Add(receiveItemTemp.FBIllNO + "," + item.FBIllNO, item.BenCi); } } @@ -980,44 +982,54 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire var tempList2 = SaleBILLLISNew2.Where(h => strings.Contains(h.FCONTRACTNUMBER)).ToList(); var Rowindex = this.View.Model.GetEntryRowCount("FEntity2"); + int addrow = 0; + for (int i = 0; i < tempList2.Count; i++) { + //if (tempList2[i].FBIllNO == "SEOUT25060319") + // this.View.ShowMessage("SEOUT25060319"); double benci = 0; if (shouKuanDetail.ContainsKey(item.FBIllNO + "," + tempList2[i].FBIllNO)) { benci = shouKuanDetail[item.FBIllNO + "," + tempList2[i].FBIllNO]; - } - this.View.Model.SetValue("FPARENTROWID", FROWID, item.FRow); - if(benci==0) + } + if (benci == 0) + { continue; + this.View.ShowMessage("错啦"); + } + + + this.View.Model.SetValue("FPARENTROWID", FROWID, item.FRow); this.View.Model.CreateNewEntryRow("FEntity2"); - 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); + this.View.Model.SetValue("FROWID", Guid.NewGuid().ToString(), Rowindex + addrow ); + this.View.Model.SetValue("FPARENTROWID", FROWID, Rowindex + addrow ); + this.View.Model.SetValue("FBILLNO2", tempList2[i].FBIllNO, Rowindex + addrow); if (DateTime.TryParseExact(tempList2[i].FDate, dateFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime parsedDate)) { - this.View.Model.SetValue("FDate2", tempList2[i].FDate, Rowindex + i); + this.View.Model.SetValue("FDate2", tempList2[i].FDate, Rowindex + addrow ); } else { - this.View.Model.SetValue("FDate2", DateTime.Now.AddDays(-1 * Convert.ToInt32(tempList2[i].FDate)).ToString("yyyy-MM-dd"), Rowindex + i); + this.View.Model.SetValue("FDate2", DateTime.Now.AddDays(-1 * Convert.ToInt32(tempList2[i].FDate)).ToString("yyyy-MM-dd"), Rowindex + addrow ); } - this.View.Model.SetValue("F_MBBA_Decimal_imu", tempList2[i].FALLAMOUNT+ tempList2[i].FYunZaFei_YuanBi * tempList2[i].FHuiLv, 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("F_MBBA_Decimal_imu", tempList2[i].FALLAMOUNT+ tempList2[i].FYunZaFei_YuanBi * tempList2[i].FHuiLv, Rowindex + addrow ); + this.View.Model.SetValue("FClient2", tempList2[i].FClient, Rowindex + addrow ); + this.View.Model.SetValue("F_RowNew", 2, Rowindex + addrow ); this.View.Model.SetValue("FCreated2", tempList2[i].FCreated, 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); + this.View.Model.SetValue("FCONTRACTNUMBER2", tempList2[i].FCONTRACTNUMBER, Rowindex + addrow ); + this.View.Model.SetValue("FSalesman2", tempList2[i].FSalesman, Rowindex + addrow ); + this.View.Model.SetValue("F_MBBA_Decimal_qtr", tempList2[i].FDAMOUNT, Rowindex + addrow ); + this.View.Model.SetValue("F_PendingAmount", tempList2[i].FDAMOUNT, Rowindex + addrow ); + this.View.Model.SetValue("F_BenCi", benci, Rowindex + addrow ); + this.View.Model.SetValue("F_MBBA_Decimal_3iy", tempList2[i].FYAMOUNT, Rowindex + addrow ); + this.View.Model.SetValue("F_ISHX", false, Rowindex + addrow ); - this.View.Model.SetValue("FBiBie2", tempList2[i].FBiBie, Rowindex + i); - this.View.Model.SetValue("FHuiLv2", tempList2[i].FHuiLv, Rowindex + i); - this.View.Model.SetValue("FShouKuanJinE_YuanBi", tempList2[i].FALLAMOUNTY + tempList2[i].FYunZaFei_YuanBi, Rowindex + i); + this.View.Model.SetValue("FBiBie2", tempList2[i].FBiBie, Rowindex + addrow ); + this.View.Model.SetValue("FHuiLv2", tempList2[i].FHuiLv, Rowindex + addrow ); + this.View.Model.SetValue("FShouKuanJinE_YuanBi", tempList2[i].FALLAMOUNTY + tempList2[i].FYunZaFei_YuanBi, Rowindex + addrow ); //Logger.Error("", "956", new Exception()); + addrow++; }