Merge branch 'master' of http://s.dev01.dkiboss.com:9001/DK-MES-2.0/SANHOPE.mes.wcf

DK.Client/PMModule/F_PM_2105.Designer.cs

@@ -67,6 +67,7 @@
 			this.GroutingLineID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingLineDetailID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingLineCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.PROCEDURENAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingLineName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -312,6 +313,7 @@
             this.GroutingLineID,
             this.GroutingLineDetailID,
             this.GroutingLineCode,
+            this.PROCEDURENAME,
             this.GroutingLineName,
             this.GoodsCode,
             this.GoodsName,
@@ -552,6 +554,12 @@
 			this.GroutingLineCode.Name = "GroutingLineCode";
 			this.GroutingLineCode.ReadOnly = true;
 			// 
+			// PROCEDURENAME
+			// 
+			this.PROCEDURENAME.DataPropertyName = "PROCEDURENAME";
+			this.PROCEDURENAME.HeaderText = "当前工序";
+			this.PROCEDURENAME.Name = "PROCEDURENAME";
+			// 
 			// GroutingLineName
 			// 
 			this.GroutingLineName.DataPropertyName = "GroutingLineName";
@@ -756,6 +764,7 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineDetailID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn PROCEDURENAME;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;

DK.Client/PMModule/F_PM_2105.resx

@@ -212,6 +212,9 @@
   <metadata name="GroutingLineCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="PROCEDURENAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="GroutingLineName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Service/PCModuleLogic/PCModuleLogic.cs

@@ -347,6 +347,10 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                 "       GDD.GroutingLineName," +
                 // 注浆日期
                 "       GDD.GroutingDate," +
+                //当前工序ID
+                "   PD.PROCEDUREID ," +
+                //当前工序名称
+                "   PROC.PROCEDURENAME," +
                 // 成型工号
                 "       GDD.UserCode," +
                 // 产品编码
@@ -388,6 +392,8 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                 // 模具状态
                 " INNER JOIN TP_SYS_GMouldStatus GMS" +
                 "    ON GMS.GMouldStatusID = GDD.GMouldStatus" +
+                " INNER JOIN TP_PM_INPRODUCTION PD ON PD.BARCODE=GDD.BARCODE " +
+                " LEFT JOIN TP_PC_PROCEDURE PROC ON PROC.PROCEDUREID=PD.PROCEDUREID "+
                 // 创建工号
                 " INNER JOIN TP_MST_User U" +
                 "    ON U.UserID = GDD.CreateUserID" +

DK.Service/PDAModuleLogic/PDAModuleLogic.cs

@@ -1015,18 +1015,6 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
 			DataTable returnDs = oracleConn.GetSqlResultToDt(procsql);
 			if (returnDs != null && returnDs.Rows.Count > 0)
 			{
-				if (returnDs.Rows[0]["PROCEDUREID"].ToString() == "16" || returnDs.Rows[0]["PROCEDUREID"].ToString() == "28"
-                    || returnDs.Rows[0]["PROCEDUREID"].ToString() == "42" || returnDs.Rows[0]["PROCEDUREID"].ToString() == "60"
-                    || returnDs.Rows[0]["PROCEDUREID"].ToString() == "61")
-				{
-					procsql = $@"
-               SELECT
-	                '' AS PRODUCTIONDATAID, '' AS PROCEDUREID
-                FROM DUAL       where 1=0
-	                ";
-				}
-				else
-				{
 					procsql = $@"
             SELECT * FROM (
                 SELECT
@@ -1045,7 +1033,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
             WHERE 
                 ROWNUM=1
             ";
-				}
+				
 			}
 			try
 			{
@@ -1093,6 +1081,8 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                                     TP_PM_ProductionDataIn.Goodsid as GoodsID,
                                     TP_PM_ProductionDataIn.Goodscode as GoodsCode,
                                     TP_PM_ProductionDataIn.Goodsname as GoodsName,
+																		TP_PM_ProductionDataIn.PRODUCTIONDATAID,
+																		TP_PM_ProductionDataIn.PROCEDUREID,
                                     TP_PM_ProductionDataIn.GoodsLevelID as DefectFlagID,
                                     TP_PM_ProductionDataIn.Reworkprocedureid as ReworkProcedureID,
                                     TP_PM_ProductionDataIn.Remarks as Remarks,
@@ -1122,13 +1112,18 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                                     decode(TP_PM_ProductionDataIn.IsReFire,'6','是','0','否') as IsReFireName,
 									decode(gdd.LEAKFLAG1,'1','合格','0','不合格','未检测') as LEAKFLAG1Name,
 									decode(gdd.LEAKFLAG2,'1','合格','0','不合格','未检测') as LEAKFLAG2Name,
-									decode(gdd.LEAKFLAG3,'1','合格','0','不合格','未检测') as LEAKFLAG3Name
+									decode(gdd.LEAKFLAG3,'1','合格','0','不合格','未检测') as LEAKFLAG3Name,
+									CASE when TP_PM_ProductionDataIn.PROCEDUREID in (40,6,31,16,28,60,61)  THEN 
+									TO_CHAR('已检验	'||chr(10)||' 产品编码:'||TP_PM_ProductionDataIn.Goodscode||chr(10)||' 产品名称:'||TP_PM_ProductionDataIn.Goodsname||chr(10)||' 工序:'||TP_PM_ProductionDataIn.PROCEDURENAME||chr(10)||' 产品等级:'||TP_SYS_GOODSLEVELTYPE.GOODSLEVELTYPENAME)
+									 else null END  AS detailsMessage,
+									 	CASE when TP_PM_ProductionDataIn.PROCEDUREID in (40,6,31,16,28,60,61)  THEN  99 ELSE 0 END detailsFalg
+									
                                     from TP_PM_ProductionDataIn
-									INNER JOIN TP_PM_GROUTINGDAILYDETAIL gdd
-									on gdd.BARCODE = TP_PM_ProductionDataIn.BARCODE
+									INNER JOIN TP_PM_GROUTINGDAILYDETAIL gdd on gdd.BARCODE = TP_PM_ProductionDataIn.BARCODE
 									left join TP_MST_DATADICTIONARY dd on dd.DICTIONARYID = gdd.GLAZETYPEID
-                                    left join TP_MST_Logo
-                                    on gdd.logoid=TP_MST_Logo.logoid
+									LEFT JOIN TP_PM_INPRODUCTION  ON TP_PM_INPRODUCTION.BARCODE=TP_PM_ProductionDataIn.BARCODE
+									LEFT JOIN TP_SYS_GOODSLEVELTYPE ON TP_SYS_GOODSLEVELTYPE.GOODSLEVELTYPEID=TP_PM_ProductionDataIn.GOODSLEVELTYPEID
+                                    left join TP_MST_Logo on gdd.logoid=TP_MST_Logo.logoid
                                     where 
                                     TP_PM_ProductionDataIn.Productiondataid=:ProductionDataID
                                     ";

WCF.Service/WCF.DataModels/PDAModule/PDAProductionDataResult.cs

@@ -252,5 +252,23 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
 			get;
 			set;
 		}
-	}
+
+        /// <summary>
+        /// 提示标识
+        /// </summary>
+        public string DetailsFalg
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 提示信息
+        /// </summary>
+        public string DetailsMessage
+        {
+            get;
+            set;
+        }
+    }
 }

WCF.Service/WCF.Services/PDAModuleService.cs

@@ -2547,7 +2547,8 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 							productionData.LeakFlag1Name = reworkDs.Tables[0].Rows[i]["LeakFlag1Name"].ToString();
 							productionData.LeakFlag2Name = reworkDs.Tables[0].Rows[i]["LeakFlag2Name"].ToString();
 							productionData.LeakFlag3Name = reworkDs.Tables[0].Rows[i]["LeakFlag3Name"].ToString();
-
+							productionData.DetailsFalg = reworkDs.Tables[0].Rows[i]["detailsFalg"].ToString();
+							productionData.DetailsMessage = reworkDs.Tables[0].Rows[i]["detailsMessage"].ToString();
 							if (reworkDs.Tables[0].Rows[i]["logoid"].ToString() != "")
 							{
 								productionData.LogoID = Convert.ToInt32(reworkDs.Tables[0].Rows[i]["logoid"]);