Revert "DLL引用"

This reverts commit 3f13d055029838580d6bb091b6abe4d906b08e74.

DK.Client/PMModule/F_PM_0107.cs

@@ -7,14 +7,17 @@
  *      作者            日期                版本            修改内容
  *      王鑫          2015/09/15            1.00            新建
  *******************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Windows.Forms;
 using Dongke.IBOSS.PRD.Basics.BaseResources;
+using Dongke.IBOSS.PRD.Basics.DockPanel;
 using Dongke.IBOSS.PRD.Client.CommonModule;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.WCF.Proxys;
+using Dongke.IBOSS.PRD.WCF.Proxys.PCModuleService;
 using Dongke.WinForm.Controls;
-using System;
-using System.Data;
-using System.Windows.Forms;
 
 namespace Dongke.IBOSS.PRD.Client.PMModule
 {

DK.Client/PMModule/PMModule.csproj

@@ -93,7 +93,7 @@
     </Reference>
     <Reference Include="WFControls, Version=1.0.0.31289, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DK.Basics\WFControls\bin\x86\Release\WFControls.dll</HintPath>
+      <HintPath>..\..\DK.Basics\WFControls\bin\x86\Debug\WFControls.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

DK.Client/ReportModule/R01/M04/F_RPT_01040501.cs

@@ -8,22 +8,24 @@
  *      王鑫            2015/11/12          1.00            新建
  *******************************************************************************/
 
-using Dongke.IBOSS.PRD.Basics.BaseControls;
-using Dongke.IBOSS.PRD.Basics.BaseResources;
-using Dongke.IBOSS.PRD.Basics.Library;
-using Dongke.IBOSS.PRD.Client.CommonModule;
-using Dongke.IBOSS.PRD.WCF.DataModels;
-using Dongke.IBOSS.PRD.WCF.Proxys;
 using System;
 using System.Data;
 using System.Windows.Forms;
 
+using Dongke.IBOSS.PRD.Basics.BaseResources;
+using Dongke.IBOSS.PRD.Basics.BaseControls;
+using Dongke.IBOSS.PRD.Client.CommonModule;
+using Dongke.IBOSS.PRD.Basics.Library;
+using Dongke.IBOSS.PRD.WCF.Proxys;
+using Dongke.IBOSS.PRD.Client.DataModels;
+using Dongke.IBOSS.PRD.WCF.DataModels;
+
 namespace Dongke.IBOSS.PRD.Client.ReportModule
 {
-	/// <summary>
-	/// 单值名
-	/// </summary>
-	public partial class F_RPT_01040501 : FormBase
+    /// <summary>
+    /// 单值名
+    /// </summary>
+    public partial class F_RPT_01040501 : FormBase
     {
         #region 成员变量
 

DK.Client/ReportModule/R03/M01/F_RPT_030117.cs

@@ -8,6 +8,10 @@
  *      付斌            2015/08/08         1.00            新建
  *******************************************************************************/
 
+using System;
+using System.Data;
+using System.Windows.Forms;
+
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DockPanel;
 using Dongke.IBOSS.PRD.Basics.Library;
@@ -17,9 +21,6 @@ using Dongke.IBOSS.PRD.Client.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels.PMModule;
 using Dongke.IBOSS.PRD.WCF.Proxys;
-using System;
-using System.Data;
-using System.Windows.Forms;
 
 namespace Dongke.IBOSS.PRD.Client.ReportModule
 {

DK.Client/ReportModule/R04/M01/F_RPT_04011201.cs

@@ -8,21 +8,24 @@
  *      陈晓野          2018/05/28          1.00            新建
  *******************************************************************************/
 
-using Dongke.IBOSS.PRD.Basics.BaseControls;
-using Dongke.IBOSS.PRD.Basics.BaseResources;
-using Dongke.IBOSS.PRD.Client.CommonModule;
-using Dongke.IBOSS.PRD.WCF.DataModels;
-using Dongke.IBOSS.PRD.WCF.Proxys;
 using System;
 using System.Data;
 using System.Windows.Forms;
 
+using Dongke.IBOSS.PRD.Basics.BaseResources;
+using Dongke.IBOSS.PRD.Basics.BaseControls;
+using Dongke.IBOSS.PRD.Client.CommonModule;
+using Dongke.IBOSS.PRD.Basics.Library;
+using Dongke.IBOSS.PRD.WCF.Proxys;
+using Dongke.IBOSS.PRD.Client.DataModels;
+using Dongke.IBOSS.PRD.WCF.DataModels;
+
 namespace Dongke.IBOSS.PRD.Client.ReportModule
 {
-	/// <summary>
-	/// 成检产品预算分析表-设置
-	/// </summary>
-	public partial class F_RPT_04011201 : FormBase
+    /// <summary>
+    /// 成检产品预算分析表-设置
+    /// </summary>
+    public partial class F_RPT_04011201 : FormBase
     {
         #region 成员变量
 

DK.Client/ReportModule/ReportModule.csproj

@@ -80,7 +80,7 @@
     </Reference>
     <Reference Include="Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DK.Basics\Library\bin\x86\Release\Library.dll</HintPath>
+      <HintPath>..\..\DK.Basics\Library\bin\x86\Debug\Library.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

DK.Client/SystemModule/F_MST_0503.cs

@@ -8,22 +8,22 @@
  *      陈晓野          2017/07/11          1.00            新建
  *******************************************************************************/
 
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Windows.Forms;
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Client.CommonModule;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.WCF.Proxys;
 using Dongke.WinForm.Controls;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Windows.Forms;
 
 namespace Dongke.IBOSS.PRD.Client.SystemModule
 {
-	/// <summary>
-	/// 配置或撤销产品工序配置
-	/// </summary>
-	public partial class F_MST_0503 : FormBase
+    /// <summary>
+    /// 配置或撤销产品工序配置
+    /// </summary>
+    public partial class F_MST_0503 : FormBase
     {
         #region 成员变量
         // 1:配置到工序；2:从工序撤销

DK.Client/SystemModule/SystemModule.csproj

@@ -434,7 +434,7 @@
     </Reference>
     <Reference Include="WFControls, Version=1.0.0.17746, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DK.Basics\WFControls\bin\x86\Release\WFControls.dll</HintPath>
+      <HintPath>..\..\DK.Basics\WFControls\obj\x86\Debug\WFControls.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

IBOSS.PRD.Public/F_P_000021.Designer.cs

@@ -1,6 +1,6 @@
 namespace Dongke.IBOSS.PRD.Client.Public
 {
-	partial class F_P_000021
+    partial class F_P_000021
     {
         /// <summary>
         /// Required designer variable.

IBOSS.PRD.Public/IBOSS.PRD.Public.csproj

@@ -160,6 +160,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\DLL\Utilities.dll</HintPath>
     </Reference>
+    <Reference Include="WFControls, Version=1.0.0.16141, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\DK.Basics\WFControls\bin\x86\Debug\WFControls.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\DK.Basics\BaseControls\BaseControls.csproj">
@@ -178,10 +182,6 @@
       <Project>{922d0f0f-01c2-4fa5-a4ad-00064232f455}</Project>
       <Name>Library</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DK.Basics\WFControls\WFControls.csproj">
-      <Project>{34c3d971-de12-44ea-9943-581c24860a84}</Project>
-      <Name>WFControls</Name>
-    </ProjectReference>
     <ProjectReference Include="..\DK.Client\Client.Controls\Client.Controls.csproj">
       <Project>{ae533029-79c3-4053-ba9c-ad5a0b4fbbf7}</Project>
       <Name>Client.Controls</Name>

IBOSS.PRD/F_SYS_0202.cs

@@ -8,6 +8,13 @@
  *      张国印          2014/08/27          1.00            新建
  *******************************************************************************/
 
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Windows.Forms;
+using Curtain.Helpers;
 using Dongke.IBOSS.PRD.Basics.BaseControls;
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DockPanel;
@@ -16,20 +23,16 @@ using Dongke.IBOSS.PRD.Client.CommonModule;
 using Dongke.IBOSS.PRD.Client.Controls;
 using Dongke.IBOSS.PRD.Client.DataModels;
 using Dongke.IBOSS.PRD.Client.HRModule;
+using Dongke.IBOSS.PRD.Client.PAMModule;
 using Dongke.IBOSS.PRD.Client.PCModule;
 using Dongke.IBOSS.PRD.Client.PMModule;
 //using Dongke.IBOSS.PRD.Client.PPModule;
 using Dongke.IBOSS.PRD.Client.ReportModule;
+using Dongke.IBOSS.PRD.Client.SAPDataModule;
 using Dongke.IBOSS.PRD.Client.SystemModule;
 using Dongke.IBOSS.PRD.Client.TATModule;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.WCF.Proxys;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Reflection;
-using System.Windows.Forms;
 
 namespace Dongke.IBOSS.PRD.Client
 {
@@ -476,36 +479,36 @@ namespace Dongke.IBOSS.PRD.Client
 
 								#region 策略管理-工资管理策略
 
-								//case "020201":
-								//	//策略管理-工资管理策略-工资方案参数设定
-								//	this.ShowInDockPanel(F_PAM_0101.Instance);
-								//	break;
-								//case "020202":
-								//	//策略管理-工资管理策略-工种工资方案
-								//	this.ShowInDockPanel(F_PAM_0102.Instance);
-								//	break;
-								//case "020203":
-								//	//策略管理-工资管理策略-工价分类
-								//	this.ShowDialogForm(F_PAM_0202.Instance);
-								//	break;
-								//case "020204":
-								//	//策略管理-工资管理策略-产品工价分类
-								//	this.ShowInDockPanel(F_PAM_0201.Instance);
-								//	//this.ShowInDockPanel(F_PAM_0601.Instance);
-								//	break;
-								//case "020205":
-								//	//策略管理-工资管理策略-计件工资策略
-								//	this.ShowInDockPanel(F_PAM_0301.Instance);
-
-								//	break;
-								//case "020206":
-								//	//策略管理-工资管理策略-品质考核策略
-								//	this.ShowInDockPanel(F_PAM_0401.Instance);
-								//	break;
-								//case "020207":
-								//	//策略管理-工资管理策略-工资结算
-								//	this.ShowInDockPanel(F_PAM_0601.Instance);
-								//	break;
+								case "020201":
+									//策略管理-工资管理策略-工资方案参数设定
+									this.ShowInDockPanel(F_PAM_0101.Instance);
+									break;
+								case "020202":
+									//策略管理-工资管理策略-工种工资方案
+									this.ShowInDockPanel(F_PAM_0102.Instance);
+									break;
+								case "020203":
+									//策略管理-工资管理策略-工价分类
+									this.ShowDialogForm(F_PAM_0202.Instance);
+									break;
+								case "020204":
+									//策略管理-工资管理策略-产品工价分类
+									this.ShowInDockPanel(F_PAM_0201.Instance);
+									//this.ShowInDockPanel(F_PAM_0601.Instance);
+									break;
+								case "020205":
+									//策略管理-工资管理策略-计件工资策略
+									this.ShowInDockPanel(F_PAM_0301.Instance);
+
+									break;
+								case "020206":
+									//策略管理-工资管理策略-品质考核策略
+									this.ShowInDockPanel(F_PAM_0401.Instance);
+									break;
+								case "020207":
+									//策略管理-工资管理策略-工资结算
+									this.ShowInDockPanel(F_PAM_0601.Instance);
+									break;
 								#endregion
 
 								#endregion
@@ -591,14 +594,14 @@ namespace Dongke.IBOSS.PRD.Client
 									//人力资源-行政管理-员工考勤
 									this.ShowInDockPanel(F_HR_1001.Instance);
 									break;
-								//case "030303":
-								//	//人力资源-行政管理-行政考核
-								//	this.ShowInDockPanel(F_PAM_0501.Instance);
-								//	break;
-								//case "030304":
-								//	//人力资源-行政管理-行政考核审核
-								//	this.ShowInDockPanel(F_PAM_0503.Instance);
-								//	break;
+								case "030303":
+									//人力资源-行政管理-行政考核
+									this.ShowInDockPanel(F_PAM_0501.Instance);
+									break;
+								case "030304":
+									//人力资源-行政管理-行政考核审核
+									this.ShowInDockPanel(F_PAM_0503.Instance);
+									break;
 								#endregion
 
 								#region 人力资源-奖惩管理
@@ -624,28 +627,28 @@ namespace Dongke.IBOSS.PRD.Client
 								#endregion
 
 								#region 人力资源-工资管理
-								//case "0305":
-								//	//人力资源-工资管理
-								//	break;
-								//case "030501":
-								//	//人力资源-工资管理-工资结算
-								//	this.ShowInDockPanel(F_HR_1201.Instance);
-								//	break;
-								//case "030502":
-								//	//人力资源-工资管理-工资审批
-								//	break;
-								//case "030503":
-								//	//人力资源-工资管理-工资结算
-								//	this.ShowInDockPanel(F_PAM_0601.Instance);
-								//	break;
-								//case "030504":
-								//	//人力资源-工资管理-工资调整
-								//	this.ShowInDockPanel(F_PAM_0603.Instance);
-								//	break;
-								//case "030505":
-								//	//人力资源-工资管理-工资审批
-								//	this.ShowInDockPanel(F_PAM_0604.Instance);
-								//	break;
+								case "0305":
+									//人力资源-工资管理
+									break;
+								case "030501":
+									//人力资源-工资管理-工资结算
+									this.ShowInDockPanel(F_HR_1201.Instance);
+									break;
+								case "030502":
+									//人力资源-工资管理-工资审批
+									break;
+								case "030503":
+									//人力资源-工资管理-工资结算
+									this.ShowInDockPanel(F_PAM_0601.Instance);
+									break;
+								case "030504":
+									//人力资源-工资管理-工资调整
+									this.ShowInDockPanel(F_PAM_0603.Instance);
+									break;
+								case "030505":
+									//人力资源-工资管理-工资审批
+									this.ShowInDockPanel(F_PAM_0604.Instance);
+									break;
 								#endregion
 
 								#endregion
@@ -1161,15 +1164,15 @@ namespace Dongke.IBOSS.PRD.Client
                                 #endregion
 
                                 #region SAP
-                                //case "SAP0101":
-                                //    this.ShowInDockPanel(F_SAP_HEGII_0101.Instance);
-                                //    break;
-                                //case "SAP0102":
-                                //    this.ShowInDockPanel(F_SAP_HEGII_0102.Instance);
-                                //    break;
-                                //case "SAP0103":
-                                //    this.ShowInDockPanel(F_SAP_HEGII_0103.Instance);
-                                //    break;
+                                case "SAP0101":
+                                    this.ShowInDockPanel(F_SAP_HEGII_0101.Instance);
+                                    break;
+                                case "SAP0102":
+                                    this.ShowInDockPanel(F_SAP_HEGII_0102.Instance);
+                                    break;
+                                case "SAP0103":
+                                    this.ShowInDockPanel(F_SAP_HEGII_0103.Instance);
+                                    break;
                                 #endregion
 
                                 #region 生产计划 xuwei 20190827 add