222

Pilot_KD_Parino/Common/CombinaClass.cs

@@ -186,5 +186,19 @@ namespace Pilot_KD_Parino.Common
         /// </summary>
         public string FPARENTROWID { get; set; }
 
+        /// <summary>
+        /// 是否P类合同
+        /// </summary>
+        public string F_Ordercategory2 { get; set; }
+
+        /// <summary>
+        /// 合同类型
+        /// </summary>
+        public string F_Ordercategory { get; set; }
+
+        /// <summary>
+        /// 累计开票金额
+        /// </summary>
+        public decimal FInvoiceAmount { get; set; }
     }
 }

Pilot_KD_Parino/Common/CommonHelper.cs

@@ -1360,6 +1360,7 @@ namespace Pilot_KD_Parino.Common
                 billView.Model.SetValue("FBILLNO2", DATA1[i].FBIllNO, Rowindex);
                 billView.Model.SetValue("FDate2", DATA1[i].FDate, Rowindex);
                 billView.Model.SetValue("FALLAMOUNT2", amount2, Rowindex);
+                billView.Model.SetValue("FALLAMOUNT22", amount2, Rowindex);
                 billView.Model.SetValue("FCONTRACTNUMBER", DATA1[i].FCONTRACTNUMBER, Rowindex);
                 billView.Model.SetValue("FClient", DATA1[i].FClient, Rowindex);
                 billView.Model.SetValue("FCreated", DATA1[i].FCreated, Rowindex);
@@ -1382,6 +1383,7 @@ namespace Pilot_KD_Parino.Common
             billView.Model.SetValue("FBILLNO3", DATA2.FBIllNO, Rowindex2);
             billView.Model.SetValue("FDate3", DATA2.FDate, Rowindex2);
             billView.Model.SetValue("FALLAMOUNT3", amount1, Rowindex2);
+            billView.Model.SetValue("FALLAMOUNT33", amount1, Rowindex2);
             billView.Model.SetValue("FClient2", DATA2.FClient, Rowindex2);
             billView.Model.SetValue("FRemark", DATA2.FRemark, Rowindex2);
             billView.Model.SetValue("FCreated2", DATA2.FCreated, Rowindex2);
@@ -1427,6 +1429,7 @@ namespace Pilot_KD_Parino.Common
             billView.Model.SetValue("FBILLNO2", DATA1.FBIllNO, Rowindex);
             billView.Model.SetValue("FDate2", DATA1.FDate, Rowindex);
             billView.Model.SetValue("FALLAMOUNT2", DATA1.FALLAMOUNT, Rowindex);
+            //billView.Model.SetValue("FALLAMOUNT22", DATA1.FALLAMOUNT, Rowindex);
             billView.Model.SetValue("FCONTRACTNUMBER", DATA1.FCONTRACTNUMBER, Rowindex);
             billView.Model.SetValue("FClient", DATA1.FClient, Rowindex);
             billView.Model.SetValue("FCreated", DATA1.FCreated, Rowindex);
@@ -1444,6 +1447,7 @@ namespace Pilot_KD_Parino.Common
                 billView.Model.SetValue("FBILLNO3", DATA2[i].FBIllNO, Rowindex2);
                 billView.Model.SetValue("FDate3", DATA2[i].FDate, Rowindex2);
                 billView.Model.SetValue("FALLAMOUNT3", DATA2[i].FALLAMOUNT, Rowindex2);
+                //billView.Model.SetValue("FALLAMOUNT33", DATA2[i].FALLAMOUNT, Rowindex2);
                 billView.Model.SetValue("FClient2", DATA2[i].FClient, Rowindex2);
                 billView.Model.SetValue("FCONTRACTNUMBER2", DATA2[i].FCONTRACTNUMBER, Rowindex2);
                 billView.Model.SetValue("FRemark", DATA2[i].FRemark, Rowindex2);

Pilot_KD_Parino/QPHY_AutoWrire/Bill5.cs

@@ -80,6 +80,9 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire
                 FIs30 = Convert.ToBoolean(item["FIs30"]),
                 FType = Convert.ToString(item["FType"]),
                 BenCi = Convert.ToDouble(item["BenCi"]),
+                F_Ordercategory2 = Convert.ToString(item["F_Ordercategory2"]),
+                F_Ordercategory = Convert.ToString(item["F_Ordercategory"]),
+                FInvoiceAmount = Convert.ToDecimal(item["FInvoiceAmount"]),
             }).ToList();
 
         
@@ -129,6 +132,12 @@ namespace Pilot_KD_Parino.QPHY_AutoWrire
                 this.View.Model.SetValue("FCreated", SaleBILLLIS2[i].FCreated, i);
                 //销售员
                 this.View.Model.SetValue("FSalesman", SaleBILLLIS2[i].FSalesman, i);
+                //合同类型、累计开票金额
+                this.View.Model.SetValue("F_Ordercategory2", SaleBILLLIS2[i].F_Ordercategory2, i);
+                this.View.Model.SetValue("F_Ordercategory", SaleBILLLIS2[i].F_Ordercategory, i);
+                this.View.Model.SetValue("FInvoiceAmount", SaleBILLLIS2[i].FInvoiceAmount, i);
+
+
             }
 
             this.View.UpdateView("FEntity");

Pilot_KD_Parino/SQL/SqlManage_yuyubo.cs

@@ -237,7 +237,10 @@ namespace Pilot_KD_Parino.SQL
 	             C.FSETTLECURRID as 'FCurr',
                  case when  DATEDIFF(MONTH, A.FDATE, GETDATE())<3 then 'True' else 'False' end as 'FIs30'   ,
                  '销售订单' as 'FTYPE',
-                  0.00 AS BenCi
+                  0.00 AS BenCi,
+                 CASE WHEN A.F_Ordercategory ='670cca03263357' THEN 'P类合同' else '非P类合同' end  as F_Ordercategory2,
+                A.F_Ordercategory AS F_Ordercategory,
+              0.00 as FInvoiceAmount
                  FROM T_SAL_ORDER A
                  INNER JOIN T_SAL_ORDERFIN C ON C.FID =A.FID  
                  WHERE