BPM整体同步

DK.Client/SAPDataModule/Hegii/F_SAP_HEGII_0109.resx

@@ -238,10 +238,10 @@
   <metadata name="CreateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="incident.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="documentno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="documentno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="incident.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="tsrToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

DK.Service/BPMDataService/BPMDataService.csproj

@@ -35,8 +35,12 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DLL\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="Oracle.ManagedDataAccess">
+      <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data.OracleClient" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Web.Extensions" />
@@ -45,6 +49,9 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="Utilities">
+      <HintPath>..\..\DLL\Utilities.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BPMDataLogic.cs" />
@@ -66,10 +73,26 @@
     <WCFMetadataStorage Include="Connected Services\BPMWebService\" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\DK.Basics\BaseResources\BaseResources.csproj">
+      <Project>{61710211-9B80-45C1-B338-FDF984C9AE43}</Project>
+      <Name>BaseResources</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\DK.Basics\DataAccess\DataAccess.csproj">
+      <Project>{d0492c0b-7b65-4d8f-8ea5-bc0570e19050}</Project>
+      <Name>DataAccess</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\DK.Basics\Library\Library.csproj">
       <Project>{922d0f0f-01c2-4fa5-a4ad-00064232f455}</Project>
       <Name>Library</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\WCF.Service\WCF.DataModels\WCF.DataModels.csproj">
+      <Project>{4c4bfbdc-125c-488a-8b35-5a0637478c66}</Project>
+      <Name>WCF.DataModels</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Service.DataModels\Service.DataModels.csproj">
+      <Project>{16c72702-c162-4cd3-9ccc-40b9d8491ccd}</Project>
+      <Name>Service.DataModels</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="Connected Services\BPMWebService\configuration91.svcinfo" />

DK.Service/SAPDataService/SAPHegiiDataService.csproj

@@ -128,18 +128,10 @@
       <Project>{4C4BFBDC-125C-488A-8B35-5A0637478C66}</Project>
       <Name>WCF.DataModels</Name>
     </ProjectReference>
-    <ProjectReference Include="..\BPMDataService\BPMDataService.csproj">
-      <Project>{E5E1F20D-62B9-452F-AF7F-096E94D584A6}</Project>
-      <Name>BPMDataService</Name>
-    </ProjectReference>
     <ProjectReference Include="..\ReportModuleLogic\ReportModuleLogic.csproj">
       <Project>{f6f0880d-be0d-4ce1-ba47-c554eb38559d}</Project>
       <Name>ReportModuleLogic</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Service.DataModels\Service.DataModels.csproj">
-      <Project>{16C72702-C162-4CD3-9CCC-40B9D8491CCD}</Project>
-      <Name>Service.DataModels</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="Service References\HGSAPDK_ZPPFM008\configuration91.svcinfo" />

WCF.Service/WCF.DataModels/PMModule/BPMDetailOneEntity.cs

@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright(c) 2014 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：BPMDetailOneEntity.cs
+ *		2.功能描述：BPMDetailOneEntity
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		陈冰				2014/09/19				1.00				新建
+ *******************************************************************************/
+using System;
+using System.Runtime.Serialization;
+
+namespace Dongke.IBOSS.PRD.WCF.DataModels
+{
+    [DataContract]
+    public class BPMDetailOneEntity
+    {
+        /// <summary>
+        /// 提交表单时间
+        /// </summary>
+        [DataMember]
+        public string REQUESTDATE { get; set; }
+
+        /// <summary>
+        /// 单据类型，（报废及回收，库存盘点 ）
+        /// </summary>
+        [DataMember]
+        public string DOCUMENTTYPE { get; set; }
+
+        /// <summary>
+        /// 公司代码
+        /// </summary>
+        [DataMember]
+        public string COMPANYNUMBER { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [DataMember]
+        public string REMARK { get; set; }
+
+        /// <summary>
+        /// 实际申请人工号
+        /// </summary>
+        [DataMember]
+        public string APPLICATEMPNO { get; set; }
+
+        /// <summary>
+        /// 实际申请人姓名
+        /// </summary>
+        [DataMember]
+        public string APPLICANTEMPNAME { get; set; }
+
+        /// <summary>
+        /// 记账日期
+        /// </summary>
+        [DataMember]
+        public string EFFECTIVEDATE { get; set; }
+    }
+}

WCF.Service/WCF.DataModels/PMModule/BPMDetailThreeEntity.cs

@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright(c) 2014 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：BPMDetailThreeEntity.cs
+ *		2.功能描述：BPMDetailThreeEntity
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		陈冰				2014/09/19				1.00				新建
+ *******************************************************************************/
+using System.Runtime.Serialization;
+
+namespace Dongke.IBOSS.PRD.WCF.DataModels
+{
+    [DataContract]
+    public class BPMDetailThreeEntity
+    {
+        /// <summary>
+        /// 行ID
+        /// </summary>
+        [DataMember]
+        public string ROWID { get; set; }
+
+        /// <summary>
+        /// 文件URL
+        /// </summary>
+        [DataMember]
+        public string FILEURL { get; set; }
+
+        /// <summary>
+        /// 文件名
+        /// </summary>
+        [DataMember]
+        public string FILENAME { get; set; }
+    }
+}

WCF.Service/WCF.DataModels/PMModule/BPMDetailTwoEntity.cs

@@ -0,0 +1,107 @@
+/*******************************************************************************
+ * Copyright(c) 2014 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：BPMDetailTwoEntity.cs
+ *		2.功能描述：BPMDetailTwoEntity
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		陈冰				2014/09/19				1.00				新建
+ *******************************************************************************/
+using System.Runtime.Serialization;
+
+namespace Dongke.IBOSS.PRD.WCF.DataModels
+{
+    [DataContract]
+    public class PROC_FINANCE_INVENTORYMATERIAL_SCRAP_AND_ADJUSTMENT_DT
+    {
+        /// <summary>
+        /// 行ID
+        /// </summary>
+        [DataMember]
+        public int ROWID { get; set; }
+
+        /// <summary>
+        /// 处理类型【712（盘盈）711（盘亏）551（报废）Z34（回收）】
+        /// </summary>
+        [DataMember]
+        public string PROCESSINGTYPE { get; set; }
+
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        [DataMember]
+        public string STDMODE { get; set; }
+
+        /// <summary>
+        /// 物料描述
+        /// </summary>
+        [DataMember]
+        public string PRODUCTNAME { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [DataMember]
+        public decimal QUANTITY { get; set; }
+
+        /// <summary>
+        /// 单位
+        /// </summary>
+        [DataMember]
+        public string UNIT { get; set; }
+
+        /// <summary>
+        /// 单位名称
+        /// </summary>
+        [DataMember]
+        public string UNITNAME { get; set; }
+
+        /// <summary>
+        /// 工厂
+        /// </summary>
+        [DataMember]
+        public string FACTORY { get; set; }
+
+        /// <summary>
+        /// 存放库位
+        /// </summary>
+        [DataMember]
+        public string STORAGELOCATION { get; set; }
+
+        /// <summary>
+        /// 销售和分销凭证号
+        /// </summary>
+        [DataMember]
+        public string SALENUMBER { get; set; }
+
+        /// <summary>
+        /// 销售和分销凭证的项目号
+        /// </summary>
+        [DataMember]
+        public string ITEMNUMBER { get; set; }
+
+        /// <summary>
+        /// 批次号
+        /// </summary>
+        [DataMember]
+        public string BATCHNUMBER { get; set; }
+
+        /// <summary>
+        /// 成本中心名称
+        /// </summary>
+        [DataMember]
+        public string COSTCENTERNAME { get; set; }
+
+        /// <summary>
+        /// 成本中心编码
+        /// </summary>
+        [DataMember]
+        public string COSTCENTER { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [DataMember]
+        public string REMARK { get; set; }
+    }
+}

WCF.Service/WCF.DataModels/PMModule/BPMEntity.cs

@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright(c) 2014 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：BPMEntity.cs
+ *		2.功能描述：BPMEntity
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		陈冰				2014/09/19				1.00				新建
+ *******************************************************************************/
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Dongke.IBOSS.PRD.WCF.DataModels
+{
+    [DataContract]
+    public class BPMEntity
+    {
+        /// <summary>
+        /// PROC_FINANCE_INVENTORYMATERIAL_SCRAP_AND_ADJUSTMENT
+        /// </summary>
+        [DataMember]
+        public BPMDetailOneEntity PROC_FINANCE_INVENTORYMATERIAL_SCRAP_AND_ADJUSTMENT { get; set; }
+
+        /// <summary>
+        /// PROC_FINANCE_INVENTORYMATERIAL_SCRAP_AND_ADJUSTMENT_DT
+        /// </summary>
+        [DataMember]
+        public List<PROC_FINANCE_INVENTORYMATERIAL_SCRAP_AND_ADJUSTMENT_DT> XXXXXXXXX { get; set; }
+
+        /// <summary>
+        /// PROC_FINANCE_INVENTORYMATERIAL_SCRAP_AND_ADJUSTMENT_ATTACT_DT
+        /// </summary>
+        [DataMember]
+        public BPMDetailThreeEntity PROC_FINANCE_INVENTORYMATERIAL_SCRAP_AND_ADJUSTMENT_ATTACT_DT { get; set; }
+    }
+}

WCF.Service/WCF.DataModels/WCF.DataModels.csproj

@@ -89,6 +89,10 @@
     <Compile Include="PDAModule\PDADefectData.cs" />
     <Compile Include="PDAModule\PDADefectDataDetail.cs" />
     <Compile Include="PDAModule\PDADefectEntity.cs" />
+    <Compile Include="PMModule\BPMDetailThreeEntity.cs" />
+    <Compile Include="PMModule\BPMDetailTwoEntity.cs" />
+    <Compile Include="PMModule\BPMDetailOneEntity.cs" />
+    <Compile Include="PMModule\BPMEntity.cs" />
     <Compile Include="PMModule\BGToSAPDetail.cs" />
     <Compile Include="PMModule\BGToSAP.cs" />
     <Compile Include="PMModule\BGYKToSAP.cs" />

WCF.Service/WCF.Services/SAPDataService.cs

@@ -3,6 +3,7 @@ using System;
 using System.ServiceModel;
 using System.ServiceModel.Activation;
 using Curtain.Core;
+using Dongke.IBOSS.PRD.Service.BPMDataService;
 using Dongke.IBOSS.PRD.Service.SAPHegiiDataService;
 using Dongke.IBOSS.PRD.Service.WMSDataService;
 using Dongke.IBOSS.PRD.WCF.Contracts;
@@ -33,6 +34,7 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                 #region Hegii
                 if ("Hegii" == cre.NameSpace)
                 {
+                    #region SAP相关
                     // 获取同步最后一次同步成功的日期
                     if ("GetLastDateByCode" == cre.Name)
                     {
@@ -42,7 +44,7 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                         return result;
                     }
                     // 获取成品交接同步数据
-                    if ("GetWorkData60" == cre.Name)
+                    else if ("GetWorkData60" == cre.Name)
                     {
                         DateTime date = (DateTime)cre.Request;
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
@@ -50,7 +52,7 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                         return result;
                     }
                     // 同步成品交接数据
-                    if ("SetWorkData60" == cre.Name)
+                    else if ("SetWorkData60" == cre.Name)
                     {
                         DateTime date = (DateTime)cre.Request;
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
@@ -58,29 +60,29 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                         return result;
                     }
                     // 查询同步日志
-                    if ("GetDataLog" == cre.Name)
+                    else if ("GetDataLog" == cre.Name)
                     {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
                             () => SAPDataLogic.GetDataLog(cre));
                         return result;
                     }
                     // 查询产量同步明细
-                    if ("GetWorkDataByDataLog" == cre.Name)
+                    else if ("GetWorkDataByDataLog" == cre.Name)
                     {
                         int logid = Convert.ToInt32(cre.Request);
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
                             () => SAPDataLogic.GetWorkDataByDataLog(logid));
                         return result;
-					}
-					// 查询
-					if ("GetWorkDataSPSumByDate" == cre.Name)
-					{
-						ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
-							() => SAPDataLogic.GetWorkDataSPSumByDate(cre));
-						return result;
-					}
-					// 查询成品条码同步明细
-					if ("GetFinishedProductByDataLog" == cre.Name)
+                    }
+                    // 查询
+                    else if ("GetWorkDataSPSumByDate" == cre.Name)
+                    {
+                        ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
+                            () => SAPDataLogic.GetWorkDataSPSumByDate(cre));
+                        return result;
+                    }
+                    // 查询成品条码同步明细
+                    else if ("GetFinishedProductByDataLog" == cre.Name)
                     {
                         int logid = Convert.ToInt32(cre.Request);
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
@@ -88,7 +90,7 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                         return result;
                     }
                     // 获取数据并同步产量数据
-                    if ("SetWorkData10_50" == cre.Name)
+                    else if ("SetWorkData10_50" == cre.Name)
                     {
                         DateTime date = (DateTime)cre.Request;
                         string datacode = cre.Properties["datacode"] + "";
@@ -97,7 +99,7 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                         return result;
                     }
                     // 同步产量数据
-                    if ("SyncSap" == cre.Name)
+                    else if ("SyncSap" == cre.Name)
                     {
                         DateTime date = (DateTime)cre.Request;
                         string datacode = cre.Properties["datacode"] + "";
@@ -107,21 +109,21 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                         return result;
                     }
                     // 同步成品条码明细数据
-                    if ("SetFP6001" == cre.Name)
-					{
-       //                 DateTime date = (DateTime)cre.Request;
-       //                 //if (date.Year < 2018)
-       //                 //{
-       //                 //    ServiceResultEntity result1 = ServiceInvoker.Invoke<ServiceResultEntity>(this,
-       //                 //        () => SAPDataLogic.SetFP6001_1(date, SUserInfo.UserID));
-       //                 //    return result1;
-       //                 //}
-       //                 ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
-							//() => SAPDataLogic.SetFP6001(date, SUserInfo.UserID));
-						return new ServiceResultEntity();
-					}
+                    else if ("SetFP6001" == cre.Name)
+                    {
+                        //                 DateTime date = (DateTime)cre.Request;
+                        //                 //if (date.Year < 2018)
+                        //                 //{
+                        //                 //    ServiceResultEntity result1 = ServiceInvoker.Invoke<ServiceResultEntity>(this,
+                        //                 //        () => SAPDataLogic.SetFP6001_1(date, SUserInfo.UserID));
+                        //                 //    return result1;
+                        //                 //}
+                        //                 ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
+                        //() => SAPDataLogic.SetFP6001(date, SUserInfo.UserID));
+                        return new ServiceResultEntity();
+                    }
                     // 同步成品条码明细数据
-                    if ("SetFP6002" == cre.Name)
+                    else if ("SetFP6002" == cre.Name)
                     {
                         //DateTime date = (DateTime)cre.Request;
                         //ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
@@ -129,36 +131,23 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                         return new ServiceResultEntity();
                     }
                     // 临时同步
-                    if ("SetFP60_T" == cre.Name)
+                    else if ("SetFP60_T" == cre.Name)
                     {
                         //DateTime date = DateTime.Now;//(DateTime)cre.Request;
                         //ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
                         //    () => SAPDataLogic.SetFP60_T(date, SUserInfo.UserID));
                         return new ServiceResultEntity();
                     }
-                    // 查询WMS同步日志
-                    if ("GetWMSDataLog" == cre.Name)
-                    {
-                        ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
-                            () => WMSDataLogic.GetWMSDataLog(cre, SUserInfo));
-                        return result;
-                    }
-                    // 同步WMS同步日志
-                    if ("SyncWMSDataLog" == cre.Name)
-                    {
-                        ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
-                            () => WMSDataLogic.SyncWMSDataLog(cre, SUserInfo));
-                        return result;
-                    }
+
                     //查询跨车间作业同步汇总
-                    if ("GetDataLog_kczzy" == cre.Name)
+                    else if ("GetDataLog_kczzy" == cre.Name)
                     {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
                             () => SAPDataLogic.GetDataLog_kczzy(cre));
                         return result;
                     }
                     // 查询跨车间作业同步明细
-                    if ("GetWorkData_kczzy" == cre.Name)
+                    else if ("GetWorkData_kczzy" == cre.Name)
                     {
                         //int logid = Convert.ToInt32(cre.Request);
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
@@ -166,141 +155,163 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                         return result;
                     }
                     // 查询报工移库日志
-                    if ("GetDataLog_BGYK" == cre.Name)
+                    else if ("GetDataLog_BGYK" == cre.Name)
                     {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
                             () => SAPDataLogic.GetDataLog_BGYK(cre));
                         return result;
                     }
                     // 查询报工移库日志明细
-                    if ("GetWorkData_BGYK" == cre.Name)
+                    else if ("GetWorkData_BGYK" == cre.Name)
                     {
                         //update xiacm 2022-10-21
-                       // int logid = Convert.ToInt32(cre.Request);
+                        // int logid = Convert.ToInt32(cre.Request);
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
                             () => SAPDataLogic.GetWorkData_BGYK(cre));
                         return result;
                     }
                     // 查询报工日志
-                    if ("GetDataLog_BG" == cre.Name)
+                    else if ("GetDataLog_BG" == cre.Name)
                     {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
                             () => SAPDataLogic.GetDataLog_BG(cre));
                         return result;
                     }
                     // 查询报工日志明细
-                    if ("GetWorkData_BG" == cre.Name)
+                    else if ("GetWorkData_BG" == cre.Name)
                     {
-                       // int logid = Convert.ToInt32(cre.Request);
+                        // int logid = Convert.ToInt32(cre.Request);
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
                             () => SAPDataLogic.GetWorkData_BG(cre));
                         return result;
                     }
                     // 查询报工汇总 add xiacm 2022-10-12
-                    if("GetDataLogTotal_BG" == cre.Name)
-					{
+                    else if ("GetDataLogTotal_BG" == cre.Name)
+                    {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
                            () => SAPDataLogic.GetDataLogTotal_BG(cre));
                         return result;
                     }
                     // 查询半成品库存 add xiacm 2022-11-09
-                    if("GetDataIVITotal_BC" == cre.Name)
-					{
+                    else if ("GetDataIVITotal_BC" == cre.Name)
+                    {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
                            () => SAPDataLogic.GetDataIVITotal_BC(cre));
                         return result;
                     }
+                    #endregion
+
+                    #region WMS相关
+                    // 查询WMS同步日志
+                    else if ("GetWMSDataLog" == cre.Name)
+                    {
+                        ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
+                            () => WMSDataLogic.GetWMSDataLog(cre, SUserInfo));
+                        return result;
+                    }
+                    // 同步WMS同步日志
+                    else if ("SyncWMSDataLog" == cre.Name)
+                    {
+                        ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
+                            () => WMSDataLogic.SyncWMSDataLog(cre, SUserInfo));
+                        return result;
+                    } 
+                    #endregion
+
+                    #region BPM相关
                     // 查询组件报损数据
-                    if("GetDataBARCODEIDNRKSCRAP" == cre.Name)
-					{
+                    else if ("GetDataBARCODEIDNRKSCRAP" == cre.Name)
+                    {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
-                           () => SAPDataLogic.GetDataBARCODEIDNRKSCRAP(cre, SUserInfo));
+                           () => BPMDataLogic.GetDataBARCODEIDNRKSCRAP(cre, SUserInfo));
                         return result;
                     }
                     // 确认组件报损
-                    if("SaveConfirmIdnrkScrap" ==cre.Name)
-					{
+                    else if ("SaveConfirmIdnrkScrap" == cre.Name)
+                    {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
-                           () => SAPDataLogic.SaveConfirmIdnrkScrap(cre, SUserInfo));
+                           () => BPMDataLogic.SaveConfirmIdnrkScrap(cre, SUserInfo));
                         return result;
                     }
                     // 撤销确认组件报损
-                    if("SaveUNConfirmIdnrkScrap" ==cre.Name)
-					{
+                    else if ("SaveUNConfirmIdnrkScrap" == cre.Name)
+                    {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
-                           () => SAPDataLogic.SaveUNConfirmIdnrkScrap(cre, SUserInfo));
+                           () => BPMDataLogic.SaveUNConfirmIdnrkScrap(cre, SUserInfo));
                         return result;
                     }
                     //同步bpm组件报损
-                    if("SynIdnrkScrap" == cre.Name)
-					{
+                    else if ("SynIdnrkScrap" == cre.Name)
+                    {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
-                           () => SAPDataLogic.SynIdnrkScrap(cre, SUserInfo));
+                           () => BPMDataLogic.SynIdnrkScrap(cre, SUserInfo));
                         return result;
                     }
                     //撤销bpm组件报损
-                    if("CancelSynIdnrkScrap" == cre.Name)
-					{
+                    else if ("CancelSynIdnrkScrap" == cre.Name)
+                    {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
-                           () => SAPDataLogic.CancelSynIdnrkScrap(cre, SUserInfo));
+                           () => BPMDataLogic.CancelSynIdnrkScrap(cre, SUserInfo));
                         return result;
                     }
                     //查询成本中心
-                    if("GetCostCenter" == cre.Name)
-					{
+                    else if ("GetCostCenter" == cre.Name)
+                    {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
-                           () => SAPDataLogic.GetCostCenter(cre, SUserInfo));
+                           () => BPMDataLogic.GetCostCenter(cre, SUserInfo));
                         return result;
                     }
                     //设置成本中心
-                    if("SaveCostCenter" == cre.Name)
-					{
+                    else if ("SaveCostCenter" == cre.Name)
+                    {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
-                           () => SAPDataLogic.SaveCostCenter(cre, SUserInfo));
+                           () => BPMDataLogic.SaveCostCenter(cre, SUserInfo));
                         return result;
                     }
                     //确认bpm 同一流程实例报损履历是否全部选中
-                    if("CheckScrap" == cre.Name)
-					{
+                    else if ("CheckScrap" == cre.Name)
+                    {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
-                           () => SAPDataLogic.CheckScrap(cre, SUserInfo));
+                           () => BPMDataLogic.CheckScrap(cre, SUserInfo));
                         return result;
                     }
                     //删除报损履历
-                    if("DeleteIDNRKScrap" == cre.Name)
-					{
+                    else if ("DeleteIDNRKScrap" == cre.Name)
+                    {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
-                           () => SAPDataLogic.DeleteIDNRKScrap(cre, SUserInfo));
+                           () => BPMDataLogic.DeleteIDNRKScrap(cre, SUserInfo));
                         return result;
                     }
                     //新建报损履历
-                    if("AddIDNRKScrap" == cre.Name)
-					{
+                    else if ("AddIDNRKScrap" == cre.Name)
+                    {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
-                           () => SAPDataLogic.AddIDNRKScrap(cre, SUserInfo));
+                           () => BPMDataLogic.AddIDNRKScrap(cre, SUserInfo));
                         return result;
                     }
                     //获取报损履历信息
-                    if("GetIDNRKScrap" ==cre.Name)
-					{
+                    else if ("GetIDNRKScrap" == cre.Name)
+                    {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
-                           () => SAPDataLogic.GetIDNRKScrap(cre, SUserInfo));
+                           () => BPMDataLogic.GetIDNRKScrap(cre, SUserInfo));
                         return result;
                     }
                     //
-                    if("GetIdnrkCode" ==cre.Name)
-					{
+                    else if ("GetIdnrkCode" == cre.Name)
+                    {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
-                           () => SAPDataLogic.GetIdnrkCode(cre, SUserInfo));
+                           () => BPMDataLogic.GetIdnrkCode(cre, SUserInfo));
                         return result;
                     }
                     //编辑报损履历
-                    if("UpdateIDNRKScrap" == cre.Name)
-					{
+                    else if ("UpdateIDNRKScrap" == cre.Name)
+                    {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
-                          () => SAPDataLogic.UpdateIDNRKScrap(cre, SUserInfo));
+                          () => BPMDataLogic.UpdateIDNRKScrap(cre, SUserInfo));
                         return result;
                     }
+                    #endregion
+
                     return null;
                 }
                 #endregion

WCF.Service/WCF.Services/WCF.Services.csproj

@@ -143,6 +143,10 @@
       <Project>{31a876f7-cb0a-4ba7-a13c-69e864d10ea9}</Project>
       <Name>BarcodePrintService</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\DK.Service\BPMDataService\BPMDataService.csproj">
+      <Project>{e5e1f20d-62b9-452f-af7f-096e94d584a6}</Project>
+      <Name>BPMDataService</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\DK.Service\CommonModuleLogic\CommonModuleLogic.csproj">
       <Project>{f675544b-7bec-4fcf-b01a-fc322c6311fc}</Project>
       <Name>CommonModuleLogic</Name>