This commit is contained in:
2025-04-18 13:42:20 +08:00
parent 79715f0aa9
commit a611212c18
2 changed files with 229 additions and 62 deletions

View File

@@ -647,6 +647,45 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire
//});
////1个收款单对应多张销售订单
//SaleBILLLIS2Sa2 = SaleBILLLISNew.Where(t => t.FISHX != "已核销配对").OrderBy(t => t.FClient).ThenBy(t => t.FCONTRACTNUMBER).ThenBy(t => t.FDate).ToList();
//ReceiveBILLLIST = ReceiveBILLLIST2.Where(a => a.F_RowNew == 1 && a.FISHX != "已核销配对").OrderBy(t => t.FClient).ThenBy(t => t.FDate).ToList();
//ReceiveBILLLIST.ForEach(t =>
//{
// var tempList = SaleBILLLIS2Sa2.Where(h => h.FClient == t.FClient && t.FDAMOUNT >= h.FDAMOUNT && h.FISHX != "已核销配对").OrderBy(h => h.FBIllNO).ToList();
// List<double> sales1 = new List<double> { t.FDAMOUNT };
// var payments2 = tempList.Select(k => k.FDAMOUNT).ToList();
// var matches = CombinationGenerator_yuyubo.MatchSalesAndPayments(sales1, payments2);
// var FDAMOUNT = t.FDAMOUNT;
// if (matches.Count > 0)
// {
// var FDAMOUNTList = matches[0].FirstOrDefault();
// tempList = tempList.Where(h => FDAMOUNTList.Contains(h.FDAMOUNT)).OrderBy(h => h.FDate).ToList();
// var fbillNoList = tempList.Select(h => h.FBIllNO).ToList();
// var ReceiveBILLLTempList = SaleBILLLIS2Sa2.Where(h => fbillNoList.Contains(h.FBIllNO)).ToList();
// List<string> fString = new List<string>();
// ReceiveBILLLTempList.ForEach(item =>
// {
// //更新收款单数据
// if (FDAMOUNT > 0)
// {
// item.FSKBIllNO = t.FBIllNO;
// item.FISHX = "已核销配对";
// //item.FCONTRACTNUMBER = t.FCONTRACTNUMBER;
// fString.Add(item.FCONTRACTNUMBER);
// }
// });
// //更新销售订单数据
// t.FISHX = "已核销配对";
// string fCONTRACTNUMBER = string.Join(",", fString);
// //更新收款单数据
// t.FCONTRACTNUMBER = fCONTRACTNUMBER;
// }
//});
#endregion
#endregion
////删除数据
@@ -716,68 +755,8 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire
this.View.Model.SetValue("F_ISHX", false, Rowindex + i);
}
//GridSetRowBackcolor(this.View, "FEntity2", "#C6E0B4", item.FRow);
//if (strings.Count() == 1 && item.FWeiYi == "否")
//{
// for (int i = 0; i < SaleBILLLISNew2.Count; i++)
// {
// if (strings.Contains(SaleBILLLISNew2[i].FCONTRACTNUMBER))
// {
// var Rowindex = this.View.Model.GetEntryRowCount("FEntity2");
// this.View.Model.SetValue("FPARENTROWID", FROWID, item.FRow);
// this.View.Model.CreateNewEntryRow("FEntity2");
// this.View.Model.SetValue("FROWID", SequentialGuid.NewGuid().ToString(), Rowindex);
// this.View.Model.SetValue("FPARENTROWID", FROWID, Rowindex);
// this.View.Model.SetValue("FBILLNO2", SaleBILLLISNew2[i].FBIllNO, Rowindex);
// if (DateTime.TryParseExact(item?.FDate, dateFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime parsedDate))
// {
// this.View.Model.SetValue("FDate2", item?.FDate, Rowindex);
// }
// else
// {
// this.View.Model.SetValue("FDate2", DateTime.Now.AddDays(-1 * Convert.ToInt32(item?.FDate)).ToString("yyyy-MM-dd"), Rowindex);
// }
// this.View.Model.SetValue("F_MBBA_Decimal_imu", item.FDAMOUNT, Rowindex);
// this.View.Model.SetValue("FClient2", SaleBILLLISNew2[i].FClient, Rowindex);
// this.View.Model.SetValue("FCreated2", SaleBILLLISNew2[i].FCreated, Rowindex);
// this.View.Model.SetValue("FCONTRACTNUMBER2", SaleBILLLISNew2[i].FCONTRACTNUMBER, Rowindex);
// this.View.Model.SetValue("FSalesman2", SaleBILLLISNew2[i].FSalesman, Rowindex);
// this.View.Model.SetValue("F_MBBA_Decimal_qtr", SaleBILLLISNew2[i].FALLAMOUNT, Rowindex);
// this.View.UpdateView("FEntity2");
// }
// }
//}
//else
//{
// for (int i = 0; i < SaleBILLLISNew2.Count; i++)
// {
// if (strings.Contains(SaleBILLLISNew2[i].FCONTRACTNUMBER))
// {
// var Rowindex = this.View.Model.GetEntryRowCount("FEntity2");
// this.View.Model.SetValue("FPARENTROWID", FROWID, item.FRow);
// this.View.Model.CreateNewEntryRow("FEntity2");
// this.View.Model.SetValue("FROWID", SequentialGuid.NewGuid().ToString(), Rowindex);
// this.View.Model.SetValue("FPARENTROWID", FROWID, Rowindex);
// this.View.Model.SetValue("FBILLNO2", SaleBILLLISNew2[i].FBIllNO, Rowindex);
// if (DateTime.TryParseExact(item?.FDate, dateFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime parsedDate))
// {
// this.View.Model.SetValue("FDate2", item?.FDate, Rowindex);
// }
// else
// {
// this.View.Model.SetValue("FDate2", DateTime.Now.AddDays(-1 * Convert.ToInt32(item?.FDate)).ToString("yyyy-MM-dd"), Rowindex);
// }
// this.View.Model.SetValue("F_MBBA_Decimal_imu", SaleBILLLISNew2[i].FALLAMOUNT, Rowindex);
// this.View.Model.SetValue("FClient2", SaleBILLLISNew2[i].FClient, Rowindex);
// this.View.Model.SetValue("FCreated2", SaleBILLLISNew2[i].FCreated, Rowindex);
// this.View.Model.SetValue("FCONTRACTNUMBER2", SaleBILLLISNew2[i].FCONTRACTNUMBER, Rowindex);
// this.View.Model.SetValue("FSalesman2", SaleBILLLISNew2[i].FSalesman, Rowindex);
// this.View.Model.SetValue("F_MBBA_Decimal_qtr", SaleBILLLISNew2[i].FALLAMOUNT, Rowindex);
// this.View.UpdateView("FEntity2");
// }
// }
//}
this.Model.SetValue("FROWEXPANDTYPE", (int)ENUM_ROWTYPE.Expand, item.FRow);
}
}