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

DK.Client/ReportModule/R03/M01/F_RPT_030105.Designer.cs

@@ -871,7 +871,6 @@
             this.Usercode.HeaderText = "生产工号";
             this.Usercode.Name = "Usercode";
             this.Usercode.ReadOnly = true;
-            this.Usercode.Visible = false;
             this.Usercode.Width = 120;
             // 
             // colGoodstypename2

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

@@ -168,7 +168,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 				else
 				{
 					this.dgvDetailReportModule.DataSource = null;
-					this.dgvDetailReportModule.DataSource = GetSearchDetailIData();
+					this.dgvDetailReportModule.DataSource = GetSearchDetailIData(rptse);
 				}
 
 			}
@@ -218,23 +218,37 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 				{
 					this.tblReportModule.SelectTab(1);
 
-					rptse = new RPT030105_SE();
+                    RPT030105_SE rptse_d = new RPT030105_SE();
+                    rptse_d.GoodsCode = rptse.GoodsCode;
 
-					rptse.ProcedureIDS = procedureId;
-					//rptse.GoodsCode = goodsCode;
+                    if (string.IsNullOrWhiteSpace(procedureId))
+                    {
+                        rptse_d.ProcedureIDS = rptse.ProcedureIDS;
+                    }
+                    else
+                    {
+                        rptse_d.ProcedureIDS = procedureId;
+                    }
+                    if (string.IsNullOrWhiteSpace(GoodsTypeIDS))
+                    {
+                        rptse_d.GoodsTypeIDS = rptse.GoodsTypeIDS;
+                    }
+                    else
+                    {
+                        rptse_d.GoodsTypeIDS = GoodsTypeIDS;
+                    }
 
-					if (!string.IsNullOrEmpty(goodsid))
-					{
-						rptse.GoodsID = Convert.ToInt32(goodsid);
+                    if (!string.IsNullOrEmpty(goodsid))
+                    {
+                        rptse_d.GoodsID = Convert.ToInt32(goodsid);
 					}
 					if (!string.IsNullOrEmpty(userid))
 					{
-						rptse.UserID = Convert.ToInt32(userid);
+                        rptse_d.UserID = Convert.ToInt32(userid);
                     }
-                    rptse.GoodsTypeIDS = GoodsTypeIDS;
 
                     this.dgvDetailReportModule.DataSource = null;
-					this.dgvDetailReportModule.DataSource = GetSearchDetailIData();
+					this.dgvDetailReportModule.DataSource = GetSearchDetailIData(rptse_d);
 				}
 			}
 			catch (Exception ex)
@@ -301,14 +315,14 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 		/// <summary>
 		/// 查询表
 		/// </summary>
-		private DataTable GetSearchDetailIData()
+		private DataTable GetSearchDetailIData(RPT030105_SE rptse_d)
 		{
 			try
 			{
 				//调用服务器端获取数据集
 				ServiceResultEntity sre = DoAsync<ServiceResultEntity>(() =>
 				{
-					return ReportModuleProxy.Service.GetRPT030105IData(rptse);
+					return ReportModuleProxy.Service.GetRPT030105IData(rptse_d);
 				}
 				);
 

DK.Client/SystemModule/F_MST_0210.cs

@@ -336,6 +336,10 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			{
 				_userInfo.IsWorker = 0;
 			}
+            if (chkValueFlag.Checked)
+            {
+                _userInfo.IsValueFlag = "1";
+            }
 			return _userInfo;
 		}
 

DK.Service/DKIBOSSPRDLogic/DKIBOSSPRDLogic.cs

@@ -466,6 +466,12 @@ namespace Dongke.IBOSS.PRD.Service.DKIBOSSPRDLogic
             //    return result;
             //}
 
+            if (versions[1] != "0" && versions[1] != serverVersions[1])
+            {
+                result.UpgradeState = false;
+                result.GradeInfo = string.Format("客户端[{0}]与服务端[{1}]的客户号（版本号第二位）不一致，此客户端不能连接服务器。", version, serverVersion);
+            }
+
             for (int j = 0; j < versions.Length; j++)
             {
                 int sv = Convert.ToInt32(serverVersions[j]);

DK.Service/PCModuleLogic/PCModuleLogicDAL.cs

@@ -1986,9 +1986,9 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                         sql = "update TP_PM_GroutingDailyDetail set barcode='' where barcode='" + subBarCode[i] + "'";
                         tran.ExecuteNonQuery(sql);
 
-                        //sql = "delete from TP_PM_UsedBarCode where barcode='" + subBarCode[i] + "'";
-                        sql = "update  TP_PM_UsedBarCode set barcode='" + subBarCode[i] + "@" + user.UserCode + "@"
-                            + DateTime.Now.ToString("yyyyMMddHHmmss") + "' where barcode='" + subBarCode[i] + "'";
+                        sql = "delete from TP_PM_UsedBarCode where barcode='" + subBarCode[i] + "'";
+                        //sql = "update  TP_PM_UsedBarCode set barcode='" + subBarCode[i] + "@" + user.UserCode + "@"
+                        //    + DateTime.Now.ToString("yyyyMMddHHmmss") + "' where barcode='" + subBarCode[i] + "'";
                         tran.ExecuteNonQuery(sql);
                     }
                 }

DK.Service/PDAModuleLogic/PDAModuleLogic.cs

@@ -980,7 +980,6 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                 FROM
 	                TP_PM_PRODUCTIONDATAIN T
 	                INNER JOIN TP_PM_INPRODUCTION INP ON INP.BARCODE = T.BARCODE 
-	                INNER JOIN TP_PM_INPRODUCTION INP ON INP.BARCODE = T.BARCODE 
 	                AND T.KILNCARBATCHNO = INP.KILNCARBATCHNO 
                 WHERE
 	                T.MODELTYPE = -1 

DK.Service/PDAModuleLogic/PDAModuleLogicWorkShop3.cs

@@ -2076,6 +2076,63 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
             return sre;
         }
 
+
+        /// <summary>
+        /// 按条码查询成检交接信息 2020-06-26 xuwei
+        /// </summary>
+        /// <param name="barCode"></param>
+        /// <param name="sUser"></param>
+        /// <returns></returns>
+        public static ServiceResultEntity GetPreProductCheck(string barCode, SUserInfo sUser)
+        {
+            ServiceResultEntity sre = new ServiceResultEntity();
+            sre.Data = new DataSet();
+            sre.Status = Constant.ServiceResultStatus.Success;
+            IDBTransaction conn = ClsDbFactory.CreateDBTransaction(DataBaseType.ORACLE, DataManager.ConnectionString);
+            string sqlStr = "";
+            try
+            {
+                conn.Connect();
+                //成型线注浆查询
+                if (sre.Status == Constant.ServiceResultStatus.Success)
+                {
+                    sqlStr = $@"
+                        SELECT
+	                        i.GOODSLEVELTYPEID,
+                            i.REWORKPROCEDUREID
+                        FROM
+	                        TP_PM_INPRODUCTION i
+                        WHERE
+	                        i.BARCODE = {barCode}
+                            AND i.MODELTYPE = -4
+                        ";
+                    DataTable PreProductCheck = conn.GetSqlResultToDt(sqlStr);
+                    PreProductCheck.TableName = "PreProductCheck";
+                    sre.Data.Tables.Add(PreProductCheck);
+                    if (PreProductCheck.Rows.Count == 0)
+                    {
+                        sre.Status = Constant.ServiceResultStatus.NoSearchResults;
+                        sre.Message = "没有查询结果！";
+                    }
+                    else
+                    {
+                        sre.Status = Constant.ServiceResultStatus.Success;
+                        sre.Message = "操作成功！";
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            finally
+            {
+                conn.Disconnect();
+            }
+            //返回数据
+            return sre;
+        }
+
         #endregion
     }
 }

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -10111,7 +10111,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 #region 校验接口是否重复调用
                 if (productionDataEntitys.Length > 0 && CMNModuleLogic.CheckDataDouble(productionDataEntitys[0].DataKey, sUserInfo))
                 {
-                    return string.Format(Messages.MSG_HR_W006, "成检", "保存");
+                    //string.Format(Messages.MSG_HR_W006, "成检", "保存")
+                    return "DataDouble";
                 }
                 #endregion
 

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -8936,13 +8936,18 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
             "      ,decode(gid, 3, '合计【' || t.procedurename || '】', t.procedurename) procedurename\n" +
             "      ,t.Goodstypeid2\n" +
             "      ,t.Goodstypecode2\n" +
-            "      ,decode(gid, 1, '小计【' || t.Goodstypename2 || '】', t.Goodstypename2) Goodstypename2\n" +
+            "      ,t.Goodstypename2\n" +
+            //"      ,decode(gid, 1, '小计【' || t.Goodstypename2 || '】', t.Goodstypename2) Goodstypename2\n" +
+            "      ,t.userid\n" +
+            "      ,t.usercode\n" +
             "      ,t.Goodsid\n" +
             "      ,t.Goodscode\n" +
             "      ,t.InCount\n" +
             "  from (select grouping_id(inp.productionlineid\n" +
             "                          ,inp.ProcedureID\n" +
-            "                          ,gt2.Goodstypeid\n" +
+            //"                          ,gt2.Goodstypeid\n" +
+            //"                          ,gt.Goodstypeid\n" +
+            "                          ,inp.userid\n" +
             "                          ,inp.Goodsid) gid\n" +
             "              ,inp.productionlineid\n" +
             "              ,pline.productionlinecode\n" +
@@ -8950,10 +8955,15 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
             "              ,inp.ProcedureID\n" +
             "              ,p.procedurecode\n" +
             "              ,p.procedurename\n" +
-            "              ,gt2.GoodstypeID GoodstypeID2\n" +
-            "              ,gt2.Goodstypecode Goodstypecode2\n" +
-            "              ,gt2.Goodstypename Goodstypename2\n" +
+            //"              ,gt2.GoodstypeID GoodstypeID2\n" +
+            //"              ,gt2.Goodstypecode Goodstypecode2\n" +
+            //"              ,gt2.Goodstypename Goodstypename2\n" +
+            "              ,gt.GoodstypeID GoodstypeID2\n" +
+            "              ,gt.Goodstypecode Goodstypecode2\n" +
+            "              ,gt.Goodstypename Goodstypename2\n" +
             "              ,inp.Goodsid\n" +
+            "              ,inp.userid\n" +
+            "              ,u.usercode\n" +
             "              ,g.Goodscode\n" +
             "              ,count(barcode) as InCount\n" +
             "          from tp_pm_inproduction inp\n" +
@@ -8967,9 +8977,9 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
             "            on inp.goodsid = g.Goodsid\n" +
             "         inner join TP_MST_GoodsType gt\n" +
             "            on g.GoodsTypeID = gt.GoodsTypeID\n" +
-            "         inner join TP_MST_GoodsType gt2\n" +
-            "            on gt.accountid = gt2.accountid\n" +
-            "           and substr(gt.Goodstypecode, 0, 6) = gt2.Goodstypecode\n" +
+            //"         inner join TP_MST_GoodsType gt2\n" +
+            //"            on gt.accountid = gt2.accountid\n" +
+            //"           and substr(gt.Goodstypecode, 0, 6) = gt2.Goodstypecode\n" +
             "         where inp.AccountID = 1\n" +
             "           and inp.valueflag = '1'\n";
 
@@ -8995,8 +9005,10 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 parameters.Add(new OracleParameter(":GoodsCode", OracleDbType.NVarchar2, se.GoodsCode, ParameterDirection.Input));
             }
 
-            sqlString += "         group by grouping sets((inp.productionlineid, pline.productionlinecode, pline.productionlinename, inp.ProcedureID, p.procedurecode, p.procedurename, gt2.Goodstypeid, gt2.Goodstypecode, gt2.Goodstypename, inp.Goodsid, g.Goodscode),(inp.productionlineid, pline.productionlinecode, pline.productionlinename, inp.ProcedureID, p.procedurecode, p.procedurename, gt2.Goodstypeid, gt2.Goodstypecode, gt2.Goodstypename),(inp.productionlineid, pline.productionlinecode, pline.productionlinename, inp.ProcedureID, p.procedurecode, p.procedurename),())) t";
-
+            //sqlString += "         group by grouping sets((inp.productionlineid, pline.productionlinecode, pline.productionlinename, inp.ProcedureID, p.procedurecode, p.procedurename, gt2.Goodstypeid, gt2.Goodstypecode, gt2.Goodstypename, inp.Goodsid, g.Goodscode),(inp.productionlineid, pline.productionlinecode, pline.productionlinename, inp.ProcedureID, p.procedurecode, p.procedurename, gt2.Goodstypeid, gt2.Goodstypecode, gt2.Goodstypename),(inp.productionlineid, pline.productionlinecode, pline.productionlinename, inp.ProcedureID, p.procedurecode, p.procedurename),())) t";
+            //sqlString += "         group by grouping sets((inp.productionlineid, pline.productionlinecode, pline.productionlinename, inp.ProcedureID, p.procedurecode, p.procedurename, gt.Goodstypeid, gt.Goodstypecode, gt.Goodstypename, inp.Goodsid, g.Goodscode),(inp.productionlineid, pline.productionlinecode, pline.productionlinename, inp.ProcedureID, p.procedurecode, p.procedurename, gt.Goodstypeid, gt.Goodstypecode, gt.Goodstypename),(inp.productionlineid, pline.productionlinecode, pline.productionlinename, inp.ProcedureID, p.procedurecode, p.procedurename),())) t";
+            sqlString += "         group by grouping sets((inp.productionlineid, pline.productionlinecode, pline.productionlinename, inp.ProcedureID, p.procedurecode, p.procedurename,inp.userid,u.usercode, gt.Goodstypeid, gt.Goodstypecode, gt.Goodstypename, inp.Goodsid, g.Goodscode),(inp.productionlineid, pline.productionlinecode, pline.productionlinename, inp.ProcedureID, p.procedurecode, p.procedurename),())) t";
+            sqlString += " order by t.procedurename, t.usercode, t.Goodstypecode2, t.Goodscode";
             return sqlString;
         }
 
@@ -9144,8 +9156,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 					 "  left join TP_MST_Logo on TP_PM_InProduction.logoid=TP_MST_Logo.logoid " +
 					 "  left join TP_MST_Goods on tp_pm_inproduction.goodsid=TP_MST_Goods.Goodsid " +
 					 "  left join TP_MST_GoodsType on TP_MST_Goods.GoodsTypeID=TP_MST_GoodsType.GoodsTypeID" +
-					 "  Where 1=1 and  TP_PM_InProduction.ValueFlag = 1 " +
-					 "  and TP_PM_InProduction.AccountID=:AccountID ";
+					 "  Where TP_PM_InProduction.AccountID=:AccountID ";
 
 			return selSql;
 		}

DK.Service/SystemModuleLogic/SystemModuleDAL.cs

@@ -3088,17 +3088,24 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                 }
                 oracleTrConn.Connect();
                 #region 删除数据
-                string sqlString1 = "DELETE TP_MST_UserRight WHERE UserID = :pUserID";
-                Oracle.ManagedDataAccess.Client.OracleParameter[] paras1 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
-                    {
-                        new Oracle.ManagedDataAccess.Client.OracleParameter(":pUserID", OracleDbType.Int32, userID, ParameterDirection.Input)
-                    };
+                //string sqlString1 = "DELETE TP_MST_UserRight WHERE UserID = :pUserID";
+                //Oracle.ManagedDataAccess.Client.OracleParameter[] paras1 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
+                //    {
+                //        new Oracle.ManagedDataAccess.Client.OracleParameter(":pUserID", OracleDbType.Int32, userID, ParameterDirection.Input)
+                //    };
+                //result.OperationStatus += oracleTrConn.ExecuteNonQuery(sqlString1, paras1);
                 #endregion
-                result.OperationStatus += oracleTrConn.ExecuteNonQuery(sqlString1, paras1);
                 #region  增加新的数据
                 // 对现有功能权限进行遍历
                 foreach (DataRow dataRow in userRightData.Tables[0].Rows)
                 {
+                    string sqlString1 = "DELETE TP_MST_UserRight WHERE UserID = :pUserID and FunctionCode=:FunctionCode";
+                    Oracle.ManagedDataAccess.Client.OracleParameter[] paras1 = new Oracle.ManagedDataAccess.Client.OracleParameter[]
+                    {
+                        new Oracle.ManagedDataAccess.Client.OracleParameter(":pUserID", OracleDbType.Int32, userID, ParameterDirection.Input),
+                        new Oracle.ManagedDataAccess.Client.OracleParameter(":FunctionCode", OracleDbType.Varchar2, dataRow["FunctionCode"], ParameterDirection.Input)
+                    };
+                    result.OperationStatus += oracleTrConn.ExecuteNonQuery(sqlString1, paras1);
                     if (dataRow["Choose"].ToString() == "1")
                     {
                         string sqlString2 = "INSERT INTO TP_MST_UserRight "

IBOSS.PRD.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29519.181
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.1169
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WCF.Service", "WCF.Service", "{30200D07-8FA7-4A96-A0A3-BE8A4906CA50}"
 EndProject
@@ -137,6 +137,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PPModule", "DK.Client\PPMod
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InvoiceLayout", "DK.Service\InvoiceLayout\InvoiceLayout.csproj", "{440B03E6-474C-439A-AF83-900A01A57ABE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WCF.ExHGS3QRS", "WCF.Service\WCF.Ex_HGS3_QRS\WCF.ExHGS3QRS.csproj", "{157CB7A7-8B8A-4043-AB3A-2C5BF32A1A27}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -982,6 +984,22 @@ Global
 		{440B03E6-474C-439A-AF83-900A01A57ABE}.Release|x64.Build.0 = Release|Any CPU
 		{440B03E6-474C-439A-AF83-900A01A57ABE}.Release|x86.ActiveCfg = Release|x86
 		{440B03E6-474C-439A-AF83-900A01A57ABE}.Release|x86.Build.0 = Release|x86
+		{157CB7A7-8B8A-4043-AB3A-2C5BF32A1A27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{157CB7A7-8B8A-4043-AB3A-2C5BF32A1A27}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{157CB7A7-8B8A-4043-AB3A-2C5BF32A1A27}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{157CB7A7-8B8A-4043-AB3A-2C5BF32A1A27}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{157CB7A7-8B8A-4043-AB3A-2C5BF32A1A27}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{157CB7A7-8B8A-4043-AB3A-2C5BF32A1A27}.Debug|x64.Build.0 = Debug|Any CPU
+		{157CB7A7-8B8A-4043-AB3A-2C5BF32A1A27}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{157CB7A7-8B8A-4043-AB3A-2C5BF32A1A27}.Debug|x86.Build.0 = Debug|Any CPU
+		{157CB7A7-8B8A-4043-AB3A-2C5BF32A1A27}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{157CB7A7-8B8A-4043-AB3A-2C5BF32A1A27}.Release|Any CPU.Build.0 = Release|Any CPU
+		{157CB7A7-8B8A-4043-AB3A-2C5BF32A1A27}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{157CB7A7-8B8A-4043-AB3A-2C5BF32A1A27}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{157CB7A7-8B8A-4043-AB3A-2C5BF32A1A27}.Release|x64.ActiveCfg = Release|Any CPU
+		{157CB7A7-8B8A-4043-AB3A-2C5BF32A1A27}.Release|x64.Build.0 = Release|Any CPU
+		{157CB7A7-8B8A-4043-AB3A-2C5BF32A1A27}.Release|x86.ActiveCfg = Release|Any CPU
+		{157CB7A7-8B8A-4043-AB3A-2C5BF32A1A27}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1038,6 +1056,7 @@ Global
 		{812E21A4-4925-4129-AF25-FD15B1BDA1AA} = {4F444F96-11BB-4747-85BB-1AA1C90BD882}
 		{3ADEFD6C-64B4-41B3-A157-84A99CCA9A5C} = {E9343424-91E2-493F-B0F0-3761452B9899}
 		{440B03E6-474C-439A-AF83-900A01A57ABE} = {4F444F96-11BB-4747-85BB-1AA1C90BD882}
+		{157CB7A7-8B8A-4043-AB3A-2C5BF32A1A27} = {30200D07-8FA7-4A96-A0A3-BE8A4906CA50}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {76578E1C-DBEC-4554-A011-D4113926C5B3}

IBOSS.PRD/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.20.0423")]
-[assembly: AssemblyFileVersion("1.0.20.0423")]
+[assembly: AssemblyVersion("1.2.20.0625")]
+[assembly: AssemblyFileVersion("1.2.20.0625")]

WCF.Service/WCF.Contracts/IPDAModuleWorkShop3.cs

@@ -135,6 +135,11 @@ namespace Dongke.IBOSS.PRD.WCF.Contracts
         , RequestFormat = WebMessageFormat.Json)]
         ActionResult GetGroutingDailyDetail(string accountCode, string userCode, string userPassword, string sessionKey, string barCode);
 
+        [OperationContract]
+        [WebInvoke(BodyStyle = WebMessageBodyStyle.WrappedRequest
+        , ResponseFormat = WebMessageFormat.Json
+        , RequestFormat = WebMessageFormat.Json)]
+        ActionResult GetPreProductCheck(string accountCode, string userCode, string userPassword, string sessionKey, string barCode);
 
         #endregion
 

WCF.Service/WCF.Contracts/WCF.Contracts.csproj

@@ -96,7 +96,6 @@
     <Compile Include="IPublicModule.cs" />
     <Compile Include="IReportModule.cs" />
     <Compile Include="ISAPData.cs" />
-    <Compile Include="Ex\IEx_HGS3_QR.cs" />
     <Compile Include="ISmartDevice.cs" />
     <Compile Include="ISystemModule.cs" />
     <Compile Include="IPAMModule.cs" />

WCF.Service/WCF.Ex_HGS3_QRS/Ex_HGS3_QR.cs

@@ -0,0 +1,262 @@
+/*******************************************************************************
+ * Copyright(c) 2014 DongkeSoft All rights reserved. / Confidential
+ * 类的信息：
+ *      1.程序名称：SmartDeviceService.cs
+ *      2.功能描述：接收智能设备请求
+ * 编辑履历：
+ *      作者            日期                版本            修改内容
+ *      陈晓野          2018/10/25          1.00            新建
+ *******************************************************************************/
+
+using System;
+using System.Data;
+using System.ServiceModel;
+using System.ServiceModel.Activation;
+
+using Dongke.IBOSS.PRD.Basics.Library;
+using Dongke.IBOSS.PRD.Service.DataModels;
+using Dongke.IBOSS.PRD.Service.PMModuleLogic;
+using Dongke.IBOSS.PRD.Service.SmartDeviceService;
+using Dongke.IBOSS.PRD.WCF.DataModels;
+
+namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
+{
+    /// <summary>
+    /// 智能设备对接服务
+    /// </summary>
+    [AspNetCompatibilityRequirements(RequirementsMode = AspNetCompatibilityRequirementsMode.Allowed)]
+    [ServiceBehavior(ConfigurationName = "ExHGS3QR",
+    InstanceContextMode = InstanceContextMode.PerCall,
+    ConcurrencyMode = ConcurrencyMode.Multiple,
+    UseSynchronizationContext = false)]
+    public class ExHGS3QR : IExHGS3QR
+    {
+        #region 恒洁三水三车间对接乾润扫码
+        public string AddWorkInfoHGS3_QR_TEST(string barcode, string procedure_no, int road_no, double weight)
+        {
+            return $"OK:{barcode}#{"H0122L"}#{"ABCDEFG"}#{1}#{1}#{1}";
+        }
+
+        /// <summary>
+        /// 恒洁三水三车间对接乾润扫码
+        /// </summary>
+        /// <param name="barcode"></param>
+        /// <param name="procedure_no">工序号</param>
+        /// <param name="road_no">道口号</param>
+        /// <param name="weight">重量</param>
+        /// <returns></returns>
+        public string AddWorkInfoHGS3_QR(string barcode, string procedure_no, int road_no, double weight)
+        {
+            /* TP_SYS_SMARTDEVICEPOINT
+工序号	工序名	道口号
+3_5_1	预干区（入）	1-6
+3_4_1	阴干区（入）	1
+3_4_2	烘干区（入）	1
+3_4_3	烘干区（出）	1
+3_3_1	毛坯库（入）	1-2
+3_3_2	毛坯库（出）	1
+3_3_3	精坯库（入）	1
+3_2_1	釉坯库（入）	1
+3_1_1	光瓷库（入）	1
+
+             */
+            string inputCode = $" barcode:{barcode} procedure_no:{procedure_no} road_no:{road_no} weight:{weight}";
+            SUserInfo sUserInfo = new SUserInfo();
+            sUserInfo.AccountID = 1;
+            sUserInfo.AccountCode = "dongke";
+            string returnMessage = "OK";
+            try
+            {
+                DataTable gdata = SmartDeviceLogic.GetGroutingdailydetail(barcode);
+
+                if (gdata == null || gdata.Rows.Count == 0)
+                {
+                    return $"NG:条码[{barcode}]不存在";
+                }
+                DataRow dataRow = gdata.Rows[0];
+                int goodstypeid = Convert.ToInt32(dataRow["goodstypeid"]);
+                string zhineng = (goodstypeid == 18 || goodstypeid == 19) ? "1" : "2";
+                int goods_line_type = Convert.ToInt32(dataRow["goods_line_type"]);
+                string gaoya = (goods_line_type == 1) ? "1" : "2";
+                int goodsleveltypeid = Convert.ToInt32(dataRow["goodsleveltypeid"]);
+                string level = goodsleveltypeid.ToString();
+                if (goodsleveltypeid == 4 || goodsleveltypeid == 5)
+                {
+                    level = "1";
+                }
+                else if (goodsleveltypeid == 15)
+                {
+                    level = "1";
+                }
+                else if (goodsleveltypeid == 8)
+                {
+                    level = "3";
+                }
+
+                //OK: 返回字符串（条码#型号#SKU码#结果#智能:1\连体:2#高压:1\普通:2）
+                returnMessage = $"OK:{barcode}#{dataRow["goodscode"]}#{dataRow["materialcode"]}#{level}#{zhineng}#{gaoya}";
+
+                int procedureID = 0;
+                if (procedure_no == "3_5_1")
+                {
+                    // 预干区（入）
+                    // TODO
+                    procedureID = 5;
+                    switch (road_no)
+                    {
+                        case 1:
+                            sUserInfo.UserID = 1;
+                            sUserInfo.UserCode = "SC35_1";
+                            break;
+                        case 2:
+                            sUserInfo.UserID = 2;
+                            sUserInfo.UserCode = "SC35_2";
+                            break;
+                        case 3:
+                            sUserInfo.UserID = 3;
+                            sUserInfo.UserCode = "SC35_3";
+                            break;
+                        case 4:
+                            sUserInfo.UserID = 4;
+                            sUserInfo.UserCode = "SC35_4";
+                            break;
+                        case 5:
+                            sUserInfo.UserID = 5;
+                            sUserInfo.UserCode = "SC35_5";
+                            break;
+                        case 6:
+                            sUserInfo.UserID = 6;
+                            sUserInfo.UserCode = "SC35_6";
+                            break;
+                        default:
+                            returnMessage = $"NG:工序[3_5_1]预干区（入）不存在道口号[{road_no}]";
+                            return returnMessage;
+                    }
+                }
+                else if (procedure_no == "3_4_1")
+                {
+                    // 阴干区（入）
+                    // TODO
+                    procedureID = 0;
+                    sUserInfo.UserID = 4;
+                    sUserInfo.UserCode = "SC35_4";
+
+                }
+                else if (procedure_no == "3_4_2")
+                {
+                    // 烘干区（入）
+                    // TODO
+                    procedureID = 0;
+                    sUserInfo.UserID = 4;
+                    sUserInfo.UserCode = "SC35_4";
+
+                }
+                else if (procedure_no == "3_4_3")
+                {
+                    // 烘干区（出）
+                    // TODO
+                    procedureID = 0;
+                    sUserInfo.UserID = 4;
+                    sUserInfo.UserCode = "SC35_4";
+
+                }
+                else if (procedure_no == "3_3_1")
+                {
+                    // 毛坯库（入）
+                    // TODO
+                    procedureID = 0;
+                    sUserInfo.UserID = 4;
+                    sUserInfo.UserCode = "SC35_4";
+                    if (road_no == 2)
+                    {
+
+                    }
+
+                }
+                else if (procedure_no == "3_3_2")
+                {
+                    // 毛坯库（出）
+                    // TODO
+                    procedureID = 0;
+                    sUserInfo.UserID = 4;
+                    sUserInfo.UserCode = "SC35_4";
+
+                }
+                else if (procedure_no == "3_3_3")
+                {
+                    // 精坯库（入）
+                    // TODO
+                    procedureID = 0;
+                    sUserInfo.UserID = 4;
+                    sUserInfo.UserCode = "SC35_4";
+
+                }
+                else if (procedure_no == "3_2_1")
+                {
+                    // 釉坯库（入）
+                    // TODO
+                    procedureID = 100;
+                    sUserInfo.UserID = 4;
+                    sUserInfo.UserCode = "SC35_4";
+
+                }
+                else if (procedure_no == "3_1_1")
+                {
+                    // 光瓷库（入）
+                    // TODO
+                    procedureID = 0;
+                    sUserInfo.UserID = 4;
+                    sUserInfo.UserCode = "SC35_4";
+
+                }
+
+                if (procedureID > 0)
+                {
+                    DataTable barcodeTable = new DataTable();
+                    barcodeTable.Columns.Add("LogoID");
+                    barcodeTable.Columns.Add("BarCode");
+                    barcodeTable.Columns.Add("Remarks");
+
+                    barcodeTable.Rows[0]["BarCode"] = barcode;
+                    barcodeTable.Rows[0]["Remarks"] = (weight > 0 ? weight+"KG" : null);
+
+                    ProcedureEntity procedureInfo = null;
+                    DataTable dt = PMModuleLogicDAL.AddWorkPiece(procedureID, barcodeTable, sUserInfo, out procedureInfo);
+
+                    if (dt != null && dt.Rows.Count > 0)
+                    {
+                        string out_msg = dt.Rows[0]["out_errMsg"].ToString();
+                        if (!string.IsNullOrWhiteSpace(out_msg))
+                        {
+                            OutputLog.TraceLog(LogPriority.Warning,
+                                    this.ToString(),
+                                    System.Reflection.MethodBase.GetCurrentMethod().Name,
+                                    inputCode + JsonHelper.ToJson(dt),
+                                    LocalPath.LogExePath + "SmartDevice\\");
+                            //if (out_msg.StartsWith("无效条码"))
+                            //{
+                            //    return "EP-01=" + out_msg;
+                            //}
+                            //if (out_msg.Contains("不能到达该工序"))
+                            //{
+                            //    return "EP-02=" + out_msg;
+                            //}
+                            return "NG:" + out_msg;
+                        }
+                    }
+                }
+                return returnMessage;
+            }
+            catch (Exception ex)
+            {
+                OutputLog.TraceLog(LogPriority.Error,
+                        this.ToString(),
+                        System.Reflection.MethodBase.GetCurrentMethod().Name,
+                        inputCode + ex.ToString(),
+                        LocalPath.LogExePath);
+                return "NG:MES系统异常";
+            }
+        }
+        #endregion
+    }
+}

WCF.Service/WCF.Ex_HGS3_QRS/IEx_HGS3_QR.cs

@@ -0,0 +1,43 @@
+
+using System.ServiceModel;
+using System.ServiceModel.Web;
+
+namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
+{
+    /// <summary>
+    /// 智能设备对接服务(恒洁三水三车间对接乾润扫码)
+    /// </summary>
+    [ServiceContract(ConfigurationName = "ExHGS3QR.IExHGS3QR",
+    Name = "IExHGS3QR",
+    Namespace = "Dongke.IBOSS.PRD.WCF.ExHGS3QRS")]
+    public interface IExHGS3QR
+    {
+        #region 恒洁三水三车间对接乾润扫码
+        [OperationContract]
+        //[WebInvoke(BodyStyle = WebMessageBodyStyle.WrappedRequest
+        //    , ResponseFormat = WebMessageFormat.Json
+        //    , RequestFormat = WebMessageFormat.Json)]
+        [WebGet(
+            RequestFormat = WebMessageFormat.Json ,
+            ResponseFormat = WebMessageFormat.Json )]
+        string AddWorkInfoHGS3_QR_TEST(string barcode, string procedure_no, int road_no, double weight);
+
+        /// <summary>
+        /// 恒洁三水三车间对接乾润扫码
+        /// </summary>
+        /// <param name="barcode"></param>
+        /// <param name="procedure_no">工序号</param>
+        /// <param name="road_no">道口号</param>
+        /// <param name="weight">重量</param>
+        /// <returns></returns>
+        [OperationContract]
+        //[WebInvoke(BodyStyle = WebMessageBodyStyle.WrappedRequest
+        //    , ResponseFormat = WebMessageFormat.Json
+        //    , RequestFormat = WebMessageFormat.Json)]
+        [WebGet(
+            RequestFormat = WebMessageFormat.Json,
+            ResponseFormat = WebMessageFormat.Json)]
+        string AddWorkInfoHGS3_QR(string barcode, string procedure_no, int road_no, double weight);
+        #endregion
+    }
+}

WCF.Service/WCF.Ex_HGS3_QRS/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("WCF.ExHGS3QRS")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("北京东科企信软件有限公司")]
+[assembly: AssemblyProduct("IBOSS-PRD")]
+[assembly: AssemblyCopyright("Copyright (C) 2014 DongkeSoft Co., Ltd. All rights reserved.")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
+[assembly: Guid("157cb7a7-8b8a-4043-ab3a-2c5bf32a1a27")]
+
+// 程序集的版本信息由下列四个值组成: 
+//
+//      主版本
+//      次版本
+//      生成号
+//      修订号
+//
+// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*"，如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

WCF.Service/WCF.Ex_HGS3_QRS/WCF.ExHGS3QRS.csproj

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{157CB7A7-8B8A-4043-AB3A-2C5BF32A1A27}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Dongke.IBOSS.PRD.WCF.ExHGS3QRS</RootNamespace>
+    <AssemblyName>WCF.ExHGS3QRS</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceModel.Web" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Ex_HGS3_QR.cs" />
+    <Compile Include="IEx_HGS3_QR.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\DK.Basics\Library\Library.csproj">
+      <Project>{922D0F0F-01C2-4FA5-A4AD-00064232F455}</Project>
+      <Name>Library</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\DK.Service\PMModuleLogic\PMModuleLogic.csproj">
+      <Project>{0492B0D6-2908-4AFF-BE1E-0E4F7B07622D}</Project>
+      <Name>PMModuleLogic</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\DK.Service\Service.DataModels\Service.DataModels.csproj">
+      <Project>{16C72702-C162-4CD3-9CCC-40B9D8491CCD}</Project>
+      <Name>Service.DataModels</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\DK.Service\SmartDeviceService\SmartDeviceService.csproj">
+      <Project>{0B637813-6AE3-4AEE-8317-0FF1EC7C0584}</Project>
+      <Name>SmartDeviceService</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\WCF.DataModels\WCF.DataModels.csproj">
+      <Project>{4C4BFBDC-125C-488A-8B35-5A0637478C66}</Project>
+      <Name>WCF.DataModels</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

WCF.Service/WCF.Hosting/App.config

@@ -276,9 +276,18 @@
                   contract="SmartDeviceService.ISmartDevice"/>
       </service>
       <!--恒洁三水三车-乾润对接接口-->
+      <service name="ExHGS3QR" behaviorConfiguration="serviceBehavior_DKIBOSSPRDService">
+        <endpoint address=""
+                  binding="webHttpBinding"
+                  bindingConfiguration="webHttpBinding_DKIBOSSPRDService"
+                  behaviorConfiguration="endpointBehavior_DKIBOSSPRD_PDAService"
+                  contract="ExHGS3QR.IExHGS3QR"/>
+      </service>
       <service name="Ex_HGS3_QR" behaviorConfiguration="serviceBehavior_DKIBOSSPRDService">
-        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_DKIBOSSPRDService"
-                  behaviorConfiguration="endpointBehavior_DKIBOSSPRDService"
+        <endpoint address=""
+                  binding="webHttpBinding"
+                  bindingConfiguration="webHttpBinding_DKIBOSSPRDService"
+                  behaviorConfiguration="endpointBehavior_DKIBOSSPRD_PDAService"
                   contract="Ex_HGS3_QR.IEx_HGS3_QR"/>
       </service>
       <!-- SAP数据接口 -->
@@ -324,6 +333,7 @@
     -->
   </system.serviceModel>
   <dongke.batchingHosting>
+    <add type="Dongke.IBOSS.PRD.WCF.Services.WCFTestService, WCF.Services" />
     <add type="Dongke.IBOSS.PRD.WCF.Services.PDAModuleService, WCF.Services" />
     <add type="Dongke.IBOSS.PRD.WCF.Services.DKIBOSSPRDService, WCF.Services" />
     <add type="Dongke.IBOSS.PRD.WCF.Services.CommonModuleService, WCF.Services" />
@@ -334,7 +344,6 @@
     <add type="Dongke.IBOSS.PRD.WCF.Services.PPModuleService, WCF.Services" />
     <add type="Dongke.IBOSS.PRD.WCF.Services.TATModuleService, WCF.Services" />
     <add type="Dongke.IBOSS.PRD.WCF.Services.ReportModuleService, WCF.Services" />
-    <add type="Dongke.IBOSS.PRD.WCF.Services.WCFTestService, WCF.Services" />
     <add type="Dongke.IBOSS.PRD.WCF.Services.CMNModuleService, WCF.Services" />
     <add type="Dongke.IBOSS.PRD.WCF.Services.PMModuleServiceNew, WCF.Services" />
     <add type="Dongke.IBOSS.PRD.WCF.Services.PCModuleServiceNew, WCF.Services" />
@@ -342,6 +351,7 @@
     <add type="Dongke.IBOSS.PRD.WCF.Services.PublicModuleService, WCF.Services" />
     <add type="Dongke.IBOSS.PRD.WCF.Services.SmartDeviceService, WCF.Services" />
     <add type="Dongke.IBOSS.PRD.WCF.Services.SAPDataService, WCF.Services" />
+    <add type="Dongke.IBOSS.PRD.WCF.ExHGS3QRS.ExHGS3QR, WCF.ExHGS3QRS" />
     <add type="Dongke.IBOSS.PRD.WCF.Services.Ex_HGS3_QR, WCF.Services" />
   </dongke.batchingHosting>
 </configuration>

WCF.Service/WCF.Hosting/Config.ini

@@ -18,8 +18,8 @@ ServerName=Debug
 
 [VersionSetting]
 PublicClientVersion=1.0.0.6
-AndroidVersion=1.0.20.0423
-ClientVersion=1.0.20.0423
+AndroidVersion=1.2.20.0423
+ClientVersion=1.2.20.0625
 
 [PathSetting]
 ;客户端升级，下载文件路径

WCF.Service/WCF.Hosting/WCF.Hosting.csproj

@@ -167,6 +167,10 @@
       <Project>{9709de66-52b3-4f9e-adea-ea639586080b}</Project>
       <Name>WCF.Contracts</Name>
     </ProjectReference>
+    <ProjectReference Include="..\WCF.Ex_HGS3_QRS\WCF.ExHGS3QRS.csproj">
+      <Project>{157cb7a7-8b8a-4043-ab3a-2c5bf32a1a27}</Project>
+      <Name>WCF.ExHGS3QRS</Name>
+    </ProjectReference>
     <ProjectReference Include="..\WCF.Services\WCF.Services.csproj">
       <Project>{20e7bf78-5301-4d5a-a7a0-fa24c0f32cdc}</Project>
       <Name>WCF.Services</Name>

WCF.Service/WCF.Services/PDAModuleService.cs

@@ -1434,6 +1434,12 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 				{
 					err = "";
 				}
+                if (err == "DataDouble")
+                {
+                    actionResult.Result = string.Format(Messages.MSG_HR_W006, "成检", "保存");
+                    actionResult.Status = 2;
+                    return actionResult;
+                }
 
 				//actionResult.Result = JsonHelper.ToJson(err);
 				actionResult.Result = err;// JsonHelper.ToJson(err);

WCF.Service/WCF.Services/PDAModuleServiceWorkShop3.cs

@@ -305,6 +305,18 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                 );
         }
 
+        //2020-06-26 读取预检（成检交接）数据
+        public ActionResult GetPreProductCheck(string accountCode, string userCode, string userPassword, string sessionKey, string barCode)
+        {
+            return CallActionResult("PDAModuleLogic.PDAModuleLogic.GetPreProductCheck",
+                accountCode,
+                userCode,
+                userPassword,
+                sessionKey,
+                barCode
+                );
+        }
+
         //xuwei end
         #endregion
     }

WCF.Service/WCF.Services/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.20.0423")]
-[assembly: AssemblyFileVersion("1.0.20.0423")]
+[assembly: AssemblyVersion("1.2.20.0625")]
+[assembly: AssemblyFileVersion("1.2.20.0625")]

WCF.Service/WCF.Services/ServiceHost/ServiceHostCollection.cs

@@ -11,7 +11,7 @@
 using System;
 using System.Collections.ObjectModel;
 using System.ServiceModel;
-
+using Dongke.IBOSS.PRD.WCF.ExHGS3QRS;
 using Dongke.IBOSS.PRD.WCF.Services.ConfigSetting;
 
 namespace Dongke.IBOSS.PRD.WCF.Services
@@ -70,11 +70,51 @@ namespace Dongke.IBOSS.PRD.WCF.Services
         /// </summary>
         public void Init()
         {
-            BatchingHostingSettings settings = BatchingHostingSettings.GetSection();
-            foreach (ServiceTypeElement element in settings.ServiceTypes)
-            {
-                this.AddServiceHost(element.ServiceType);
-            }
+            //BatchingHostingSettings settings = BatchingHostingSettings.GetSection();
+            //foreach (ServiceTypeElement element in settings.ServiceTypes)
+            //{
+            //    this.AddServiceHost(element.ServiceType);
+            //}            
+            //<add type="Dongke.IBOSS.PRD.WCF.Services.WCFTestService, WCF.Services" />
+            //<add type="Dongke.IBOSS.PRD.WCF.ExHGS3QRS.ExHGS3QR, WCF.ExHGS3QRS" />
+            //<add type="Dongke.IBOSS.PRD.WCF.Services.PDAModuleService, WCF.Services" />
+            //<add type="Dongke.IBOSS.PRD.WCF.Services.DKIBOSSPRDService, WCF.Services" />
+            //<add type="Dongke.IBOSS.PRD.WCF.Services.CommonModuleService, WCF.Services" />
+            //<add type="Dongke.IBOSS.PRD.WCF.Services.SystemModuleService, WCF.Services" />
+            //<add type="Dongke.IBOSS.PRD.WCF.Services.HRModuleService, WCF.Services" />
+            //<add type="Dongke.IBOSS.PRD.WCF.Services.PCModuleService, WCF.Services" />
+            //<add type="Dongke.IBOSS.PRD.WCF.Services.PMModuleService, WCF.Services" />
+            //<add type="Dongke.IBOSS.PRD.WCF.Services.PPModuleService, WCF.Services" />
+            //<add type="Dongke.IBOSS.PRD.WCF.Services.TATModuleService, WCF.Services" />
+            //<add type="Dongke.IBOSS.PRD.WCF.Services.ReportModuleService, WCF.Services" />
+            //<add type="Dongke.IBOSS.PRD.WCF.Services.CMNModuleService, WCF.Services" />
+            //<add type="Dongke.IBOSS.PRD.WCF.Services.PMModuleServiceNew, WCF.Services" />
+            //<add type="Dongke.IBOSS.PRD.WCF.Services.PCModuleServiceNew, WCF.Services" />
+            //<add type="Dongke.IBOSS.PRD.WCF.Services.PAMModuleService, WCF.Services" />
+            //<add type="Dongke.IBOSS.PRD.WCF.Services.PublicModuleService, WCF.Services" />
+            //<add type="Dongke.IBOSS.PRD.WCF.Services.SmartDeviceService, WCF.Services" />
+            //<add type="Dongke.IBOSS.PRD.WCF.Services.SAPDataService, WCF.Services" />
+            //<add type="Dongke.IBOSS.PRD.WCF.Services.Ex_HGS3_QR, WCF.Services" />
+            this.AddServiceHost(typeof(WCFTestService));
+            this.AddServiceHost(typeof(PDAModuleService));
+            this.AddServiceHost(typeof(DKIBOSSPRDService));
+            this.AddServiceHost(typeof(CommonModuleService));
+            this.AddServiceHost(typeof(CMNModuleService));
+            this.AddServiceHost(typeof(SystemModuleService));
+            this.AddServiceHost(typeof(HRModuleService));
+            this.AddServiceHost(typeof(PCModuleService));
+            this.AddServiceHost(typeof(PMModuleService));
+            this.AddServiceHost(typeof(PPModuleService));
+            this.AddServiceHost(typeof(TATModuleService));
+            this.AddServiceHost(typeof(ReportModuleService));
+            this.AddServiceHost(typeof(PMModuleServiceNew));
+            this.AddServiceHost(typeof(PCModuleServiceNew));
+            this.AddServiceHost(typeof(PAMModuleService));
+            this.AddServiceHost(typeof(PublicModuleService));
+            this.AddServiceHost(typeof(SmartDeviceService));
+            this.AddServiceHost(typeof(SAPDataService));
+            this.AddServiceHost(typeof(ExHGS3QR));
+            //this.AddServiceHost(typeof(Ex_HGS3_QR));
         }
 
         /// <summary>

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

@@ -99,7 +99,6 @@
     <Compile Include="ServiceHost\ServiceInvoker.cs" />
     <Compile Include="ServiceInterpector\MyServiceBehavior.cs" />
     <Compile Include="ServiceInterpector\ServiceInterpector.cs" />
-    <Compile Include="Ex\Ex_HGS3_QR.cs" />
     <Compile Include="SmartDeviceService.cs" />
     <Compile Include="SystemModuleService.cs" />
     <Compile Include="PAMModuleService.cs" />
@@ -219,6 +218,10 @@
       <Project>{4c4bfbdc-125c-488a-8b35-5a0637478c66}</Project>
       <Name>WCF.DataModels</Name>
     </ProjectReference>
+    <ProjectReference Include="..\WCF.Ex_HGS3_QRS\WCF.ExHGS3QRS.csproj">
+      <Project>{157CB7A7-8B8A-4043-AB3A-2C5BF32A1A27}</Project>
+      <Name>WCF.ExHGS3QRS</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

WCF.Service/WCF.WebHosting/Config.ini

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

WCF.Service/WCF.WebHosting/Global.asax.cs

@@ -11,6 +11,8 @@ using Curtain.Log;
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Basics.Library;
+using Dongke.IBOSS.PRD.WCF.Contracts;
+using Dongke.IBOSS.PRD.WCF.ExHGS3QRS;
 using Dongke.IBOSS.PRD.WCF.Services;
 
 namespace Dongke.IBOSS.PRD.WCF.WebHosting
@@ -162,7 +164,7 @@ namespace Dongke.IBOSS.PRD.WCF.WebHosting
             (
                 new ServiceRoute
                 (
-                    "DKService/Ex_HGS3_QR", new WebServiceHostFactory(), typeof(Ex_HGS3_QR)
+                    "DKService/ExHGS3QR", new WebServiceHostFactory(), typeof(ExHGS3QR)
                 )
             );
             RouteTable.Routes.Add

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

@@ -96,6 +96,10 @@
       <Project>{9709de66-52b3-4f9e-adea-ea639586080b}</Project>
       <Name>WCF.Contracts</Name>
     </ProjectReference>
+    <ProjectReference Include="..\WCF.Ex_HGS3_QRS\WCF.ExHGS3QRS.csproj">
+      <Project>{157cb7a7-8b8a-4043-ab3a-2c5bf32a1a27}</Project>
+      <Name>WCF.ExHGS3QRS</Name>
+    </ProjectReference>
     <ProjectReference Include="..\WCF.Services\WCF.Services.csproj">
       <Project>{20e7bf78-5301-4d5a-a7a0-fa24c0f32cdc}</Project>
       <Name>WCF.Services</Name>

WCF.Service/WCF.WebHosting/Web.config

@@ -185,9 +185,12 @@
           behaviorConfiguration="endpointBehavior_DKIBOSSPRDService" contract="SmartDeviceService.ISmartDevice"/>
       </service>
       <!--恒洁三水三车-乾润对接接口-->
-      <service name="Ex_HGS3_QR" behaviorConfiguration="serviceBehavior_DKIBOSSPRDService">
-        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_DKIBOSSPRDService"
-          behaviorConfiguration="endpointBehavior_DKIBOSSPRDService" contract="Ex_HGS3_QR.IEx_HGS3_QR"/>
+      <service name="ExHGS3QR" behaviorConfiguration="serviceBehavior_DKIBOSSPRDService">
+        <endpoint address=""
+                  binding="webHttpBinding"
+                  bindingConfiguration="webHttpBinding_DKIBOSSPRDService"
+                  behaviorConfiguration="endpointBehavior_DKIBOSSPRD_PDAService"
+                  contract="ExHGS3QR.IExHGS3QR"/>
       </service>
       <!-- SAP数据接口 -->
       <service name="SAPDataService" behaviorConfiguration="serviceBehavior_DKIBOSSPRDService">
@@ -226,8 +229,8 @@
         <add service="Dongke.IBOSS.PRD.WCF.Services.TATModuleService" relativeAddress="DKService/TATModuleService.svc"/>
         <add service="Dongke.IBOSS.PRD.WCF.Services.WCFTestService" relativeAddress="DKService/WCFTestService.svc"/>
         <add service="Dongke.IBOSS.PRD.WCF.Services.SmartDeviceService" relativeAddress="DKService/SmartDeviceService.svc"/>
-        <add service="Dongke.IBOSS.PRD.WCF.Services.Ex_HGS3_QR" relativeAddress="DKService/Ex_HGS3_QR.svc"/>
         <add service="Dongke.IBOSS.PRD.WCF.Services.SAPDataService" relativeAddress="DKService/SAPDataService.svc"/>
+        <add service="Dongke.IBOSS.PRD.WCF.ExHGS3QRS.ExHGS3QR" relativeAddress="DKService/ExHGS3QR.svc"/>
       </serviceActivations>
     </serviceHostingEnvironment>
   </system.serviceModel>
@@ -249,8 +252,8 @@
     <add type="Dongke.IBOSS.PRD.WCF.Services.PAMModuleService, WCF.Services"/>
     <add type="Dongke.IBOSS.PRD.WCF.Services.PublicModuleService, WCF.Services"/>
     <add type="Dongke.IBOSS.PRD.WCF.Services.SmartDeviceService, WCF.Services"/>
-    <add type="Dongke.IBOSS.PRD.WCF.Services.Ex_HGS3_QR, WCF.Services"/>
     <add type="Dongke.IBOSS.PRD.WCF.Services.SAPDataService, WCF.Services"/>
+    <!--<add type="Dongke.IBOSS.PRD.WCF.ExHGS3QRS.ExHGS3QR, WCF.ExHGS3QRS"/>-->
   </dongke.batchingHosting>
   <system.web>
     <customErrors mode="Off"/>