Pilot_KD_Parino/Pilot_KD_Parino.csproj

@@ -32,87 +32,75 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="AForge.Video">
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\AForge.Video.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\AForge.Video.dll</HintPath>
     </Reference>
     <Reference Include="AForge.Video.DirectShow">
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\AForge.Video.DirectShow.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\AForge.Video.DirectShow.dll</HintPath>
     </Reference>
     <Reference Include="Antlr3.Runtime, Version=3.4.1.9004, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\Antlr3.Runtime.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\Antlr3.Runtime.dll</HintPath>
     </Reference>
     <Reference Include="Aspose.Cells">
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\Aspose.Cells.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\Aspose.Cells.dll</HintPath>
-    </Reference>
-    <Reference Include="BouncyCastle.Crypto">
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\Castle.Core.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\Castle.Core.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.Data.v13.1, Version=13.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\DevExpress.Data.v13.1.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\DevExpress.Data.v13.1.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\DevExpress.Printing.v13.1.Core.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\DevExpress.Printing.v13.1.Core.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.Utils.v13.1, Version=13.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\DevExpress.Utils.v13.1.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\DevExpress.Utils.v13.1.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.XtraEditors.v13.1, Version=13.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\DevExpress.XtraEditors.v13.1.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\DevExpress.XtraEditors.v13.1.dll</HintPath>
     </Reference>
     <Reference Include="DocumentFormat.OpenXml">
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\DocumentFormat.OpenXml.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\DocumentFormat.OpenXml.dll</HintPath>
     </Reference>
     <Reference Include="DocumentFormat.OpenXml.Framework">
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\DocumentFormat.OpenXml.Framework.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\DocumentFormat.OpenXml.Framework.dll</HintPath>
     </Reference>
     <Reference Include="FarPoint.CalcEngine, Version=7.0.3502.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\FarPoint.CalcEngine.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\FarPoint.CalcEngine.dll</HintPath>
     </Reference>
     <Reference Include="FarPoint.Excel, Version=7.0.3502.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\FarPoint.Excel.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\FarPoint.Excel.dll</HintPath>
     </Reference>
     <Reference Include="FarPoint.Localization, Version=1.0.0.0, Culture=neutral, PublicKeyToken=327c3516b1b18457, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\FarPoint.Localization.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\FarPoint.Localization.dll</HintPath>
     </Reference>
     <Reference Include="FarPoint.PDF, Version=7.0.3502.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\FarPoint.PDF.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\FarPoint.PDF.dll</HintPath>
     </Reference>
     <Reference Include="FarPoint.PluginCalendar.WinForms, Version=7.0.3502.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\FarPoint.PluginCalendar.WinForms.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\FarPoint.PluginCalendar.WinForms.dll</HintPath>
     </Reference>
     <Reference Include="FarPoint.Win, Version=7.0.3502.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\FarPoint.Win.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\FarPoint.Win.dll</HintPath>
     </Reference>
     <Reference Include="FarPoint.Win.Chart, Version=7.0.3502.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\FarPoint.Win.Chart.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\FarPoint.Win.Chart.dll</HintPath>
     </Reference>
     <Reference Include="FarPoint.Win.Spread, Version=7.0.3502.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\FarPoint.Win.Spread.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\FarPoint.Win.Spread.dll</HintPath>
-    </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
-    <Reference Include="IronPython">
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\IronPython.dll</HintPath>
-    </Reference>
-    <Reference Include="JWT">
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\JWT.dll</HintPath>
     </Reference>
     <Reference Include="K3Cloud.WebApi.Client">
       <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\K3Cloud.WebApi.Client.dll</HintPath>
@@ -284,16 +272,16 @@
       <HintPath>..\packages\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NPOI">
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\NPOI.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\NPOI.dll</HintPath>
     </Reference>
     <Reference Include="NPOI.OOXML">
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\NPOI.OOXML.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\NPOI.OOXML.dll</HintPath>
     </Reference>
     <Reference Include="NPOI.OpenXml4Net">
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\NPOI.OpenXml4Net.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\NPOI.OpenXml4Net.dll</HintPath>
     </Reference>
     <Reference Include="NPOI.OpenXmlFormats">
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\NPOI.OpenXmlFormats.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\NPOI.OpenXmlFormats.dll</HintPath>
     </Reference>
     <Reference Include="Oracle.DataAccess, Version=4.112.4.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
@@ -315,10 +303,10 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="Xceed.Document.NET">
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\Xceed.Document.NET.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\Xceed.Document.NET.dll</HintPath>
     </Reference>
     <Reference Include="Xceed.Words.NET">
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\Xceed.Words.NET.dll</HintPath>
+      <HintPath>..\..\派诺(1)\派诺\git\6、程序\GZ_KD_Parino\bin\Debug\Xceed.Words.NET.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

Pilot_KD_Parino/Sal_Order/Bill.cs

@@ -16,12 +16,11 @@ using Kingdee.BOS.Orm.DataEntity;
 using System.Web;
 using Kingdee.BOS.App.Data;
 using Kingdee.BOS.Core.Deploy;
-using System.Data;
 
 namespace Pilot_KD_Parino.Sal_Order
 {
     [HotUpdate]
-    [Description("销售订单--查看业绩分摊单;修改下载Word文件")]
+    [Description("销售订单--查看业绩分摊单")]
     public class Bill : AbstractBillPlugIn
     {
         string currentRecId;
@@ -130,18 +129,7 @@ namespace Pilot_KD_Parino.Sal_Order
                 string sql = string.Format(@"/*dialect*/Select B.FBILLALLAMOUNT as 'FBILLALLAMOUNT' From T_SAL_ORDER A
                 JOIN T_SAL_ORDERFIN B on A.FID = B.FID Where A.FBILLNO = '{0}'", fBILLNO);
                 var sqlList = DBUtils.ExecuteDynamicObject(Context, sql);
-                decimal fAmount;
+                var fAmount = Convert.ToDecimal(sqlList[0]["FBILLALLAMOUNT"]);
-                if (sqlList.Count != 0)
-                {
-                    fAmount = Convert.ToDecimal(sqlList[0]["FBILLALLAMOUNT"]);
-                }
-                else
-                {
-                    sql = string.Format(@"/*dialect*/Select B.FBILLALLAMOUNT as 'FBILLALLAMOUNT' From T_SAL_XORDER A
-                    JOIN T_SAL_XORDERFIN B on A.FID = B.FID Where A.FBILLNO = '{0}'", fBILLNO);
-                    sqlList = DBUtils.ExecuteDynamicObject(Context, sql);
-                    fAmount = Convert.ToDecimal(sqlList[0]["FBILLALLAMOUNT"]);
-                }
 
                 if (fAmount >= 200000 && FOrdercategory == "P")
                 {
@@ -181,28 +169,8 @@ namespace Pilot_KD_Parino.Sal_Order
                     this.View.ShowErrMessage("找不到对应的word模板");
                     return;
                 }
-                var formId = this.View.Model.DataObject["FFormId"];
+                //获取内容
-                DataSet TempModelData = null;
+                var TempModelData = SQL.SqlManage.GetTempModelData(this.Context, Convert.ToString(this.View.Model.DataObject["Id"]), FOrdercategory);
-                if (formId.ToString() == "SAL_XORDER")
-                {
-                    sql = string.Format(@"SELECT FDOCUMENTSTATUS FROM T_SAL_XORDER WHERE FBILLNO = '{0}'", fBILLNO);
-                    sqlList = DBUtils.ExecuteDynamicObject(Context, sql);
-                    if (Convert.ToString(sqlList[0]["FDOCUMENTSTATUS"]) != "C")
-                    {
-                        this.View.ShowErrMessage("销售订单新变更单未审核，不能下载合同");
-                        return;
-                    }
-
-                    sql = string.Format(@"SELECT FID AS FID FROM T_SAL_ORDER WHERE FXPKID IN (SELECT FID FROM T_SAL_XORDER WHERE FBILLNO = '{0}')", fBILLNO);
-                    sqlList = DBUtils.ExecuteDynamicObject(Context, sql);
-                    //获取内容
-                    TempModelData = SQL.SqlManage.GetTempModelData(this.Context, Convert.ToString(sqlList[0]["FID"]), FOrdercategory);
-                }
-                else
-                {
-                    //获取内容
-                    TempModelData = SQL.SqlManage.GetTempModelData(this.Context, Convert.ToString(this.View.Model.DataObject["Id"]), FOrdercategory);
-                }
 
                 // 提取文件名
                 string fileProjectname = Path.GetFileName(FPath);