Merge branch 'master' of http://8.130.121.29:3000/yuyubo/Pilot_KD_Parino_yuyubo

Pilot_KD_Parino/QPHY_AutoWrire/Bill5.cs

@@ -491,8 +491,28 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire
                     List<string> deleteFBIllNOList = new List<string>();
                     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)
                                 return;
                             var temp11 = temp111.FBIllNO;
@@ -520,6 +540,7 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire
                                 receiveItemTemp.FDAMOUNT = receiveItemTemp.FDAMOUNT - receiveItemTemp.BenCi;
                                 //receiveItemTemp.FYAMOUNT = receiveItemTemp.FYAMOUNT + receiveItemTemp.BenCi;
                             }
+                        }
 
                     });
                 }
@@ -528,7 +549,30 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire
                     List<string> deleteFBIllNOList = new List<string>();
                     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)
                                 return;
                             var temp11 = temp111.UFbillNo;
@@ -556,7 +600,7 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire
 
                                 shouKuanDetail.Add(receiveItemTemp.FBIllNO + "," + item.FBIllNO, item.BenCi);
                             }
-
+                        }
                     });
                 }
 
@@ -610,6 +654,7 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire
                 else
                 {
                     List<string> deleteFBIllNOList = new List<string>();
+
                     saleList22.ForEach(t =>
                     {
                         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"))
             {
                 // 弹出确认框
-                View.ShowMessage("确定要生成核销记录单吗？2", MessageBoxOptions.YesNo, result =>
+                View.ShowMessage("确定要生成核销记录单吗？3", MessageBoxOptions.YesNo, result =>
                 {
                     if (result == MessageBoxResult.Yes)
                     {

发货通知单的核销记录审核.sql

@@ -6,13 +6,14 @@ ALTER proc UpdateSalOrderAmount2
 as   
 begin   
 
- DECLARE @F_Amount DECIMAL(18,2)=0,@FBILLNO NVARCHAR(50),@saleOrgId INT,@F_Papercontract NVARCHAR(2000)
+ DECLARE @F_Amount DECIMAL(18,2)=0,@FBILLNO NVARCHAR(50),@saleOrgId INT,@F_Papercontract NVARCHAR(2000),@yewu DATETIME
 
    SELECT @F_Amount=ISNULL(SUM(CONVERT(decimal(18,2), FALLAMOUNT2)),0), @FBILLNO=FBILLNO2  FROM VRYF_t_Cust100015 A   
   INNER JOIN  VRYF_t_Cust_Entry100024 B ON A.FID = B.FID   
   WHERE  a.FID =@FID
   GROUP BY   FBILLNO2
 
+
  SELECT @saleOrgId= a.FSALEORGID,@F_Papercontract=F_Papercontract  FROM T_SAL_DELIVERYNOTICE a 
  WHERE a.FBILLNO=@FBILLNO
 
@@ -26,11 +27,15 @@ begin
 
  --<EFBFBD>޸<EFBFBD><EFBFBD>տ<EFBFBD>ۼƺ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
  
-   SELECT @F_Amount=ISNULL(SUM(CONVERT(decimal(18,2), FALLAMOUNT3)),0), @FBILLNO=FBILLNO3  FROM VRYF_t_Cust100015 A   
+   SELECT @F_Amount=ISNULL(SUM(CONVERT(decimal(18,2), FALLAMOUNT3)),0), @FBILLNO=FBILLNO3,@yewu=MAX(FDate3)  FROM VRYF_t_Cust100015 A   
   INNER JOIN  VRYF_t_Cust_Entry100025 B ON A.FID = B.FID   
   WHERE  a.FID =@FID
     GROUP BY   FBILLNO3
 
+	 
+ UPDATE VRYF_t_Cust100015 SET F_YeWuDate=@yewu
+WHERE FID=@fid AND F_YeWuDate IS NULL
+
   UPDATE T_AR_RECEIVEBILL SET F_Amount=ISNULL(F_Amount,0)+@F_Amount ,F_contractnumber=@F_Papercontract   
    WHERE FBILLNO =@FBILLNO  ;