This commit is contained in:
2025-07-23 20:03:30 +08:00
parent 3cb72b31ce
commit 2eec1afd87

View File

@@ -491,8 +491,28 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire
List<string> deleteFBIllNOList = new List<string>(); List<string> deleteFBIllNOList = new List<string>();
ReceiveList1.ForEach(t => ReceiveList1.ForEach(t =>
{ {
var tempList = oneToOneTemp.Where(h => h.UFbillNo == t && !deleteFBIllNOList.Contains(h.FBIllNO)).ToList();
if (tempList.Count > 0)
{
var FBIllNOList = tempList.Select(h => h.FBIllNO).ToList();
string fbillno = "";
if (tempList.Count > 1)
{
DateTime fdate = DateTime.Parse(ReceiveBILLLIST2.FirstOrDefault(h => h.FBIllNO == t).FDate);
DateTime begin = fdate.AddDays(-5).Date;
DateTime end = fdate.AddDays(6).Date;
var list = SaleBILLLIS.Where(h => DateTime.Parse(h.FDate) >= begin && DateTime.Parse(h.FDate) < end && FBIllNOList.Contains(h.FBIllNO)).OrderByDescending(h => h.FDate).ToList();
if (list.Count > 0)
{
fbillno = list.FirstOrDefault().FBIllNO;
}
}
else
{
fbillno= tempList.FirstOrDefault().FBIllNO;
}
var temp111 = oneToOneTemp.FirstOrDefault(h => h.UFbillNo == t && !deleteFBIllNOList.Contains(h.FBIllNO)); var temp111 = oneToOneTemp.FirstOrDefault(h => h.UFbillNo == t && h.FBIllNO== fbillno && !deleteFBIllNOList.Contains(h.FBIllNO));
if (temp111 == null) if (temp111 == null)
return; return;
var temp11 = temp111.FBIllNO; var temp11 = temp111.FBIllNO;
@@ -520,6 +540,7 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire
receiveItemTemp.FDAMOUNT = receiveItemTemp.FDAMOUNT - receiveItemTemp.BenCi; receiveItemTemp.FDAMOUNT = receiveItemTemp.FDAMOUNT - receiveItemTemp.BenCi;
//receiveItemTemp.FYAMOUNT = receiveItemTemp.FYAMOUNT + receiveItemTemp.BenCi; //receiveItemTemp.FYAMOUNT = receiveItemTemp.FYAMOUNT + receiveItemTemp.BenCi;
} }
}
}); });
} }
@@ -528,7 +549,30 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire
List<string> deleteFBIllNOList = new List<string>(); List<string> deleteFBIllNOList = new List<string>();
saleList1.ForEach(t => saleList1.ForEach(t =>
{ {
var temp111 = oneToOneTemp.Where(h => h.FBIllNO == t && !deleteFBIllNOList.Contains(h.UFbillNo)).OrderBy(h => h.UFbillNo).FirstOrDefault(); var tempList = oneToOneTemp.Where(h => h.UFbillNo == t && !deleteFBIllNOList.Contains(h.UFbillNo)).ToList();
if (tempList.Count > 0)
{
var FBIllNOList = tempList.Select(h => h.UFbillNo).ToList();
string fbillno = "";
if (tempList.Count > 1)
{
DateTime fdate = DateTime.Parse(SaleBILLLIS.FirstOrDefault(h => h.FBIllNO == t).FDate);
DateTime begin = fdate.AddDays(-5).Date;
DateTime end = fdate.AddDays(6).Date;
var list = ReceiveBILLLIST.Where(h => DateTime.Parse(h.FDate) >= begin && DateTime.Parse(h.FDate) < end && FBIllNOList.Contains(h.FBIllNO))
.OrderByDescending(h => h.FDate).ToList();
if (list.Count > 0)
{
fbillno = list.FirstOrDefault().FBIllNO;
}
}
else
{
fbillno = tempList.FirstOrDefault().FBIllNO;
}
var temp111 = oneToOneTemp.Where(h => h.FBIllNO == t && h.UFbillNo== fbillno && !deleteFBIllNOList.Contains(h.UFbillNo)).OrderByDescending(h => h.UFbillNo).FirstOrDefault();
if (temp111 == null) if (temp111 == null)
return; return;
var temp11 = temp111.UFbillNo; var temp11 = temp111.UFbillNo;
@@ -556,7 +600,7 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire
shouKuanDetail.Add(receiveItemTemp.FBIllNO + "," + item.FBIllNO, item.BenCi); shouKuanDetail.Add(receiveItemTemp.FBIllNO + "," + item.FBIllNO, item.BenCi);
} }
}
}); });
} }
@@ -610,6 +654,7 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire
else else
{ {
List<string> deleteFBIllNOList = new List<string>(); List<string> deleteFBIllNOList = new List<string>();
saleList22.ForEach(t => saleList22.ForEach(t =>
{ {
var temp111 = oneToOneTemp2.Where(h => h.FBIllNO == t && !deleteFBIllNOList.Contains(h.UFbillNo)).OrderBy(h => h.UFbillNo).FirstOrDefault(); var temp111 = oneToOneTemp2.Where(h => h.FBIllNO == t && !deleteFBIllNOList.Contains(h.UFbillNo)).OrderBy(h => h.UFbillNo).FirstOrDefault();
@@ -1003,7 +1048,7 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire
if (e.BarItemKey.ToString().Equals("MBBA_tbButton_5")) if (e.BarItemKey.ToString().Equals("MBBA_tbButton_5"))
{ {
// 弹出确认框 // 弹出确认框
View.ShowMessage("确定要生成核销记录单吗?2", MessageBoxOptions.YesNo, result => View.ShowMessage("确定要生成核销记录单吗?3", MessageBoxOptions.YesNo, result =>
{ {
if (result == MessageBoxResult.Yes) if (result == MessageBoxResult.Yes)
{ {