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

DK.Client/PCModule/F_PC_0205.cs

@@ -981,7 +981,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 procedureEntity.ProcedureKilnTable = dsProductionDataSet.Tables["procedureKilnTable"].Clone();
             }
             // 成检工序 add xiacm 2022-10-12
-            DataRow[] drfin = dsProductionDataSet.Tables["procedureTable"].Select("PROCEDUREID IN(139)");
+            DataRow[] drfin = dsProductionDataSet.Tables["procedureTable"].Select("PROCEDUREID IN(12, 59, 105)");
             procedureEntity.FinishedCheckProcedureTable = drfin.CopyToDataTable();
 
             node.TagNonSerialized = procedureEntity;

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -9759,6 +9759,13 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                         remarks = "【试水不合格：" + productionData.LeakFlag5Position + "】";
                     }
                 }
+                else if (productionData.ProcedureName.Contains("补裂"))
+                {
+                    if (!string.IsNullOrWhiteSpace(productionData.LeakFlag6Position))
+                    {
+                        remarks = "【补裂位置：" + productionData.LeakFlag6Position + "】";
+                    }
+                }
                 productionData.Remarks = remarks;
                 //errMsg = AddProductionData(oracleTrConn, accountDate, productionData, sUserInfo, out OutSpecialRepairflag);
                 errMsg = AddFinishCheckProductionData(oracleTrConn, accountDate, productionData, sUserInfo, out OutSpecialRepairflag);
@@ -10273,6 +10280,74 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                                     });
 
                     }
+                    else if (productionData.ProcedureName.Contains("补裂"))
+                    { 
+                        if (!string.IsNullOrWhiteSpace(productionData.LeakFlag6Position))
+                        {
+                            oracleTrConn.ExecuteNonQuery(@"UPDATE TP_PM_GROUTINGDAILYDETAIL SET LEAKFLAG6 =  :LEAKFLAG6
+                                                WHERE groutingdailydetailid = :groutingdailydetailid ",
+                                    new OracleParameter[] {
+                                        new OracleParameter(":LEAKFLAG6", "0"),
+                                        new OracleParameter(":groutingdailydetailid", groutingdailydetailid)
+                                    });
+
+                            //判断是否存在，保存最新的一条
+                            string position6 = @" SELECT t.RELATIONID FROM TP_PM_BARCODELEAKPOSITION t 
+				                WHERE t.BARCODE = :BARCODE and t.LEAKTYPE = 6";
+
+                            OracleParameter[] position6par = new OracleParameter[]
+                            {
+                                new OracleParameter(":BARCODE", OracleDbType.NVarchar2,  productionData.Barcode, ParameterDirection.Input),
+                            };
+                            DataTable position6Table = oracleTrConn.GetSqlResultToDt(position6, position6par);
+
+                            if (position6Table != null && position6Table.Rows.Count > 0)
+                            {
+								for (int i = 0; i < position6Table.Rows.Count; i++)
+								{
+                                    oracleTrConn.ExecuteNonQuery(@"DELETE FROM TP_PM_BARCODELEAKPOSITION 
+                                                WHERE RELATIONID = :RELATIONID ",
+                                   new OracleParameter[] {
+                                        new OracleParameter(":RELATIONID", position6Table.Rows[i]["RELATIONID"]),
+                                   });
+                                } 
+                            }
+                            //拆开多选的补裂位置
+                            string leakFlag6Position = productionData.LeakFlag6Position;
+                            string[] position6s = leakFlag6Position.Split(',');
+
+							for (int j = 0; j < position6s.Length; j++)
+							{
+                                string sqlString = @"
+                                        INSERT INTO TP_PM_BARCODELEAKPOSITION
+                                            (BARCODE,
+                                                LEAKTYPE,
+                                                POSITION,
+                                                ACCOUNTID,
+                                                CREATEUSERID,
+                                                UPDATEUSERID)
+                                        VALUES
+                                            (:BARCODE,
+                                                :LEAKTYPE,
+                                                :POSITION,
+                                                :ACCOUNTID,
+                                                :USERID,
+                                                :USERID)";
+
+                                oracleTrConn.ExecuteNonQuery(sqlString,
+                                new OracleParameter[]
+                                {
+                            new OracleParameter(":BARCODE", productionData.Barcode),
+                            new OracleParameter(":LEAKTYPE", 6),
+                            new OracleParameter(":POSITION", position6s[j]),
+                            new OracleParameter(":ACCOUNTID", sUserInfo.AccountID),
+                            new OracleParameter(":USERID", sUserInfo.UserID)
+                                });
+                            }
+                            
+                        }
+
+                    }
 
                 }
 				#endregion

DK.Service/PMModuleLogic/PMModuleLogicPartial.cs

@@ -1726,6 +1726,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 				DataSet returnDs = new DataSet();
 				DataTable leakFlag4Table = new DataTable();
 				DataTable leakFlag5Table = new DataTable();
+				DataTable leakFlag6Table = new DataTable();
+				
 				DataSet defectSet = new DataSet();
 				DataRow dr = dtBarCode.NewRow();
 				#region 查出工序条码类型 wangx 2017-3-13
@@ -1959,6 +1961,17 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 									leakFlag5Table = oracleConn.GetSqlResultToDt(leakFlag5Positions, paras);
 
 								}
+								//补裂位置
+								
+								string leakFlag6Positions = @"SELECT t.* 
+											FROM TP_PM_BARCODELEAKPOSITION t where t.barcode= :BARCODE and leaktype = 6";
+
+								OracleParameter[] paras6 = new OracleParameter[]{
+										new OracleParameter(":BARCODE",barcode),};
+
+								leakFlag6Table = oracleConn.GetSqlResultToDt(leakFlag6Positions, paras6);
+
+								
 							}
 
 							//获取上一次成品检验的缺陷
@@ -2039,6 +2052,12 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 					leakFlag5Table.TableName = "leakFlag5Table";
 					returnDs.Tables.Add(leakFlag5Table);
 				}
+				if (leakFlag6Table != null && leakFlag6Table.Rows.Count > 0)
+				{
+					leakFlag6Table.TableName = "leakFlag6Table";
+					returnDs.Tables.Add(leakFlag6Table);
+				}
+				
 				//缺陷
 				if (defectSet != null && defectSet.Tables.Count > 0 && defectSet.Tables[0].Rows.Count > 0)
 				{

DK.Service/SystemModuleLogic/SystemModuleLogicPartial.cs

@@ -627,14 +627,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 						G.WATERLABELCODE,
 						G.CERTIFICATECODE,
 						'1' VALUEFLAG, 	- 1 DISPLAYNO,
-						G.PLATELIMITNUM,
-						pr.PRODUCEDAYS,
-						pr.ATTENDANCE,
-						pr.DAYGROUTINGNUMBER,
-						pr.PROTECTDAMRATE 
+						G.PLATELIMITNUM
 					FROM
 						TP_MST_GOODS G
-						INNER JOIN TP_MST_PRODUCTATTRIBUTES PR ON PR.GOODSID = G.GOODSID 
 					WHERE
 						G.GOODSID = :goodsid
 					UNION ALL

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

@@ -443,5 +443,12 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
         /// </summary>
         [DataMember]
         public string LeakFlag5Position { get; set; }
+
+        /// <summary>
+        /// 补裂位置
+        /// </summary>
+        [DataMember]
+        public string LeakFlag6Position { get; set; }
+        
     }
 }