Merge branch 'master' of ssh://pscg.dongkesoft.com:9003/mes/hg5020

DK.Client/PCModule/F_PC_0203.cs

@@ -228,12 +228,14 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                     procedureEntity.PieceType = Convert.ToInt32(dr1[0]["PieceType"].ToString());
                     procedureEntity.IsSpecialRework = Convert.ToInt32(dr1[0]["isspecialrework"].ToString());
 
-                //xuwei add 2019-10-17
-                procedureEntity.IsSemireWork = Convert.ToInt32(dr1[0]["isSemireWork"].ToString());
-                //xuwei add 2019-11-20
-                procedureEntity.PrintType = Convert.ToInt32(dr1[0]["printType"].ToString());
-                //xuwei add 2020-01-02
-                procedureEntity.IsGlazeChange = Convert.ToInt32(dr1[0]["IsGlazeChange"].ToString());
+                    //xuwei add 2019-10-17
+                    procedureEntity.IsSemireWork = Convert.ToInt32(dr1[0]["isSemireWork"].ToString());
+                    //xuwei add 2019-11-20
+                    procedureEntity.PrintType = Convert.ToInt32(dr1[0]["printType"].ToString());
+                    //xuwei add 2019-12-11
+                    procedureEntity.SemiGoodsLevel = dr1[0]["SemiGoodsLevel"].ToString();
+                    //xuwei add 2020-01-02
+                    procedureEntity.IsGlazeChange = Convert.ToInt32(dr1[0]["IsGlazeChange"].ToString());
 
                     procedureEntity.OrganizationID = Convert.ToInt32(dr1[0]["OrganizationID"].ToString());
                     procedureEntity.Remarks = dr1[0]["Remarks"].ToString();

DK.Client/PCModule/F_PC_0205.cs

@@ -892,8 +892,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             //xuwei add 2019-10-14
             procedureEntity.IsSemireWork = Convert.ToInt32(dr1[0]["isSemireWork"].ToString());
             //xuwei add 2019-12-12
-            if(dr1[0]["SemiGoodsLevel"]!=null)
-                procedureEntity.SemiGoodsLevel = dr1[0]["SemiGoodsLevel"].ToString();
+            if (dr1[0]["SemiGoodsLevel"] != null) procedureEntity.SemiGoodsLevel = dr1[0]["SemiGoodsLevel"].ToString();
             //xuwei add 2020-01-02
             procedureEntity.IsGlazeChange = Convert.ToInt32(dr1[0]["isGlazeChange"].ToString());
 

WCF.Service/WCF.Hosting/Config.ini

@@ -17,7 +17,7 @@ ServerName=Debug
 [VersionSetting]
 PublicClientVersion=1.0.0.6
 AndroidVersion=1.0.1.128
-ClientVersion=1.0.1.131
+ClientVersion=1.0.1.132
 
 [PathSetting]
 ;客户端升级，下载文件路径

WCF.Service/WCF.Services/PMModuleServiceNew.cs

@@ -513,11 +513,34 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                 }
                 #endregion
 
-                #region 半检返修登记
-                if (cre.NameSpace == "PM_SemiRework")
+                #region 窑车漏扫补件
+                if (cre.NameSpace == "F_PM_0504")
                 {
+                    // 验证窑车编码是否存在
+                    if (cre.Name == "CheckKilnCar")
+                    {
+                        return PMModuleLogic.CheckKilnCar(cre, SUserInfo);
+                    }
+                    // 验证窑车烧成批次号是否存在 和 是否能补漏扫
+                    if (cre.Name == "CheckKilnCarBatchNo")
+                    {
+                        return PMModuleLogic.CheckKilnCarBatchNo(cre, SUserInfo);
+                    }
+                    // 窑车漏扫补件
+                    if (cre.Name == "SetKilnCarMissing")
+                    {
+                        return PMModuleLogic.SetKilnCarMissing(cre, SUserInfo);
+                    }
+                }
+                #endregion
 
-
+                #region 工序半检 xuwei add 2019-12-11
+                if (cre.NameSpace == "ProcedureSemi")
+                {
+                    if (cre.Name == "GetGoodsGradeDataSemi")
+                    {
+                        return ServiceInvoker.Invoke(this, () => PDAModuleLogic.GetGoodsGradeDataSemi(Convert.ToInt32(cre.Properties["procedureId"]), this.SUserInfo));
+                    }
                     return null;
                 }
                 #endregion

WCF.Service/WCF.WebHosting/Config.ini

@@ -20,7 +20,7 @@ GOURL=http://192.168.0.237:9000/mes/mesgo.ashx
 [VersionSetting]
 PublicClientVersion=1.0.0.6
 AndroidVersion=1.0.0.125
-ClientVersion=1.0.0.131
+ClientVersion=1.0.0.132
 
 [PathSetting]
 ;客户端升级，下载文件路径