修磨保存。

DK.Service/PMModuleLogic/PMModuleLogic.cs

@@ -79,7 +79,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
             barCodeResultTable.Columns.Add(Constant.BarCodeResultTableColumns.out_lengBuName.ToString());
 
             //增加冷补返工工序
-            barCodeResultTable.Columns.Add(Constant.BarCodeResultTableColumns.out_ReworkProcedureId.ToString());
+            //barCodeResultTable.Columns.Add(Constant.BarCodeResultTableColumns.out_ReworkProcedureId.ToString());
+            barCodeResultTable.Columns.Add("out_ReworkProcedureId", typeof(string));
 
             //养水标识 试水标识 qq add 2022-12-28
             barCodeResultTable.Columns.Add("out_LeakFlag4", typeof(string));
@@ -101,7 +102,10 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
             barCodeResultTable.Columns.Add("offlineFlag", typeof(string));
             barCodeResultTable.Columns.Add("recyclingFlag", typeof(string));
             barCodeResultTable.Columns.Add("waterLabelCode", typeof(string));
-            
+            //修磨
+            barCodeResultTable.Columns.Add("out_LeakFlag7", typeof(string));
+            barCodeResultTable.Columns.Add("out_LeakFlag7Name", typeof(string));
+             
             return barCodeResultTable;
         }
 

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -9809,6 +9809,17 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                         remarks = "【补裂位置：" + productionData.LeakFlag6Position + "】";
                     }
                 }
+                else if (productionData.ProcedureName.Contains("修磨"))
+                {
+                    if (productionData.LeakFlag7 == "1")
+                    {
+                        remarks = "【修磨合格】";
+                    }
+                    else
+                    {
+                        remarks = "【修磨不合格】";
+                    }
+                }
                 productionData.Remarks = remarks;
                 //errMsg = AddProductionData(oracleTrConn, accountDate, productionData, sUserInfo, out OutSpecialRepairflag);
                 errMsg = AddFinishCheckProductionData(oracleTrConn, accountDate, productionData, sUserInfo, out OutSpecialRepairflag);
@@ -10313,6 +10324,15 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                             });
                         }
                     }
+                    else if (productionData.ProcedureName.Contains("修磨"))
+                    {
+                        oracleTrConn.ExecuteNonQuery(@"UPDATE TP_PM_GROUTINGDAILYDETAIL SET LEAKFLAG7 =  :LEAKFLAG7
+                                                WHERE groutingdailydetailid = :groutingdailydetailid ",
+                                    new OracleParameter[] {
+                                        new OracleParameter(":LEAKFLAG7", productionData.LeakFlag7),
+                                        new OracleParameter(":groutingdailydetailid", groutingdailydetailid)
+                                    });
+                    }
                     else if (productionData.ProcedureName.Contains("漏气"))
                     {
                         oracleTrConn.ExecuteNonQuery(@"UPDATE TP_PM_GROUTINGDAILYDETAIL SET LEAKFLAG1 =  :LEAKFLAG1

DK.Service/PMModuleLogic/PMModuleLogicPartial.cs

@@ -1867,14 +1867,16 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 									gdd.LEAKFLAG3,
 									gdd.LEAKFLAG4,
 									gdd.LEAKFLAG5,
+									gdd.LEAKFLAG7, 
 									decode(TP_PM_InProduction.SpecialRepairFlag,'1','是','0','否') as SpecialRepairflagName,
                                     decode(TP_PM_InProduction.IsReFire,'6','是','0','否') as IsReFireName,
 									DECODE(TP_PM_INPRODUCTION.ISLENGBU, '1', '是', '0', '否') AS ISLENGBUNAME,
 									decode(gdd.LEAKFLAG1,'1','合格','0','不合格','未检测') as LEAKFLAG1Name,
 									decode(gdd.LEAKFLAG2,'1','合格','0','不合格','未检测') as LEAKFLAG2Name,
 									decode(gdd.LEAKFLAG3,'1','合格','0','不合格','未检测') as LEAKFLAG3Name,
-									decode(gdd.LEAKFLAG4,'1','合格','0','不合格','未检测') as LEAKFLAG4Name,
+									decode(gdd.LEAKFLAG4,'1','合格','0','不合格','未检测') as LEAKFLAG4Name, 
 									decode(gdd.LEAKFLAG5,'1','合格','0','不合格','未检测') as LEAKFLAG5Name,
+									decode(gdd.LEAKFLAG7,'1','合格','0','不合格','未检测') as LEAKFLAG7Name,
 									gdd.InspectionLevel,
 									gdd.PackingDefect,
 									gdd.InspectionGoodsLevel,
@@ -2038,7 +2040,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 
 								dr["GOODSMODELforCheck"] = ds.Tables[0].Rows[0]["GOODSMODELforCheck"].ToString();
 								dr["PlateLimitNum"] = ds.Tables[0].Rows[0]["PlateLimitNum"];
-								dr["out_LeakFlag4"] = ds.Tables[0].Rows[0]["LEAKFLAG4"].ToString();
+								dr["out_LeakFlag4"] = ds.Tables[0].Rows[0]["LEAKFLAG4"].ToString(); 
 								dr["out_LeakFlag5"] = ds.Tables[0].Rows[0]["LEAKFLAG5"].ToString();
 								dr["out_LeakFlag4Name"] = ds.Tables[0].Rows[0]["LEAKFLAG4Name"].ToString();
 								dr["out_LeakFlag5Name"] = ds.Tables[0].Rows[0]["LEAKFLAG5Name"].ToString();
@@ -2048,7 +2050,9 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 								dr["offlineFlag"] = ds.Tables[0].Rows[0]["OFFLINEFLAG"].ToString();
 								dr["recyclingFlag"] = ds.Tables[0].Rows[0]["RECYCLINGFLAG"].ToString();
 								dr["waterLabelCode"] = ds.Tables[0].Rows[0]["WATERLABELCODE"].ToString();
-								
+								//修磨
+								dr["out_LeakFlag7"] = ds.Tables[0].Rows[0]["LEAKFLAG7"].ToString();
+								dr["out_LeakFlag7Name"] = ds.Tables[0].Rows[0]["LEAKFLAG7Name"].ToString();
 
 								//养水不合格，查询养水不合格位置
 								if (ds.Tables[0].Rows[0]["LEAKFLAG4"].ToString() == "0")

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

@@ -473,5 +473,11 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
         /// </summary>
         [DataMember]
         public string LENGBUTYPE { get; set; }
+
+        /// <summary>
+        /// 修磨标识（1：合格；0：不合格）
+        /// </summary>
+        [DataMember]
+        public string LeakFlag7 { get; set; }
     }
 }