Merge branch 'master' of http://git.dongkesoft.com:9001/hg5020/dk.hg5020.wcf

DK.Service/PMModuleLogic/PMModuleLogic.csproj

@@ -119,6 +119,10 @@
       <Project>{4c4bfbdc-125c-488a-8b35-5a0637478c66}</Project>
       <Name>WCF.DataModels</Name>
     </ProjectReference>
+    <ProjectReference Include="..\CMNModuleService\CMNModuleService.csproj">
+      <Project>{86518B86-66A1-45D3-86CC-F6D6CF0EFA35}</Project>
+      <Name>CMNModuleService</Name>
+    </ProjectReference>
     <ProjectReference Include="..\CommonModuleLogic\CommonModuleLogic.csproj">
       <Project>{f675544b-7bec-4fcf-b01a-fc322c6311fc}</Project>
       <Name>CommonModuleLogic</Name>

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -17,6 +17,7 @@ using System.Text;
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Basics.Library;
+using Dongke.IBOSS.PRD.Service.CMNModuleService;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Oracle.ManagedDataAccess.Client;
@@ -10067,9 +10068,18 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
             try
             {
                 oracleTrConn.Connect();
+
+                #region 校验接口是否重复调用
+                if (productionDataEntitys.Length > 0 && CMNModuleLogic.CheckDataDouble(productionDataEntitys[0].DataKey, sUserInfo))
+                {
+                    return string.Format(Messages.MSG_HR_W006, "成检", "保存");
+                }
+                #endregion
+
                 #region 查询工序信息
                 ProcedureEntity procedure = GetProcedurByID(oracleTrConn, procedureID);
                 #endregion
+
                 #region 标准检验（半成品）
                 if (procedure.ModelType == (int)Constant.ProcedureModelType.Normal)
                 {

WCF.Service/WCF.DataModels/PMModule/ProductionDataEntity.cs

@@ -371,5 +371,11 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
         /// </summary>
         [DataMember]
         public int? CheckFlag { get; set; }
+
+        /// <summary>
+        /// 用户操作标识
+        /// </summary>
+        [DataMember]
+        public string DataKey { get; set; }
     }
 }

WCF.Service/WCF.WebHosting/Config.ini

@@ -3,10 +3,10 @@ ServiceName=
 Description=
 
 [DBSetting]
-DBIP=192.168.0.237
+DBIP=192.168.0.233
 DBPort=1521
-SID=ibossmes
-DBUser=devhgcz
+SID=hgtest
+DBUser=hgtest
 DBPassword=etLHPkLTOLw=
 
 [WCFSetting]
@@ -15,7 +15,7 @@ WCFPort=1234
 ServerName=Debug
 
 [WEBMESSetting]
-GOURL=http://192.168.0.237:9000/mes/mesgo.ashx
+GOURL=http://192.168.0.233:9000/mes/mesgo.ashx
 
 [VersionSetting]
 PublicClientVersion=1.0.0.6

WCF.Service/WCF.WebHosting/Properties/PublishProfiles/xuwei-mes.pubxml → WCF.Service/WCF.WebHosting/Properties/PublishProfiles/192.168.0.233.pubxml

@@ -1,18 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
-此文件由 Web 项目的发布/打包过程使用。可以通过编辑此 MSBuild 文件
-自定义此过程的行为。为了解与此相关的更多内容，请访问 https://go.microsoft.com/fwlink/?LinkID=208121。 
+https://go.microsoft.com/fwlink/?LinkID=208121. 
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <WebPublishMethod>FileSystem</WebPublishMethod>
-    <PublishProvider>FileSystem</PublishProvider>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
-    <publishUrl>\\192.168.0.237\e$\xuwell\mes.xuwell.cn\wwwroot</publishUrl>
-    <DeleteExistingFiles>False</DeleteExistingFiles>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>\\192.168.0.233\d$\dk.mes.wcf</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
   </PropertyGroup>
 </Project>

WCF.Service/WCF.WebHosting/WCF.WebHosting.csproj

@@ -65,8 +65,8 @@
     <Content Include="Config.ini">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <None Include="Properties\PublishProfiles\192.168.0.233.pubxml" />
     <None Include="Properties\PublishProfiles\WebHosting发布.pubxml" />
-    <None Include="Properties\PublishProfiles\xuwei-mes.pubxml" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>