PDA 二次质量登记提示

DK.Service/PMModuleLogic/PMModuleLogic.cs

@@ -1845,6 +1845,17 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
             try
             {
                 con.Open();
+                int procedureID = int.Parse(con.GetSqlResultToStr("select procedureID from TP_PM_INPRODUCTION where barcode='"+ barcode + "'",null));
+                
+                if (procedureID == 40 || procedureID == 6 || procedureID == 31 || procedureID == 16 || procedureID == 28 ||
+                        procedureID == 60 || procedureID == 61)
+                { 
+                    DataSet dss = new DataSet();
+                    DataTable dt = new DataTable();
+                    dss.Tables.Add(dt);
+                    return dss;
+
+                }
                 string sqlString = @"select 
                                     FlowProcedureID as 
                                     CompleteProcedureID,

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -17689,26 +17689,30 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 				{
 					return -2;
 				}
-
-				// 釉料变更履历
-				sql = "insert into TP_PM_GlazetypeRecord\n" +
-				//"values\n" + xuwei update 2020-01-02
-				"  (GROUTINGDAILYDETAILID\n" +
-				"  ,OldGlazetypeid\n" +
-				"  ,NewGlazetypeid\n" +
-				"  ,ProcedureID\n" +
-				"  ,Remarks\n" +
-				"  ,AccountID\n" +
-				"  ,CreateUserID)\n" +
-				"values\n" +
-				"  (:GROUTINGDAILYDETAILID\n" +
-				"  ,:OldGlazetypeid\n" +
-				"  ,:NewGlazetypeid\n" +
-				"  ,:ProcedureID\n" +
-				"  ,:Remarks\n" +
-				"  ,:AccountID\n" +
-				"  ,:CreateUserID)";
-				Paras = new OracleParameter[] {
+				if (logoid == 00 && glazetypeid == 00)
+				{
+					return returnRows;
+				}
+				else {
+					// 釉料变更履历
+					sql = "insert into TP_PM_GlazetypeRecord\n" +
+					//"values\n" + xuwei update 2020-01-02
+					"  (GROUTINGDAILYDETAILID\n" +
+					"  ,OldGlazetypeid\n" +
+					"  ,NewGlazetypeid\n" +
+					"  ,ProcedureID\n" +
+					"  ,Remarks\n" +
+					"  ,AccountID\n" +
+					"  ,CreateUserID)\n" +
+					"values\n" +
+					"  (:GROUTINGDAILYDETAILID\n" +
+					"  ,:OldGlazetypeid\n" +
+					"  ,:NewGlazetypeid\n" +
+					"  ,:ProcedureID\n" +
+					"  ,:Remarks\n" +
+					"  ,:AccountID\n" +
+					"  ,:CreateUserID)";
+					Paras = new OracleParameter[] {
 					new OracleParameter(":GROUTINGDAILYDETAILID",OracleDbType.Int32,
 						dt.Rows[0]["GROUTINGDAILYDETAILID"],ParameterDirection.Input),
 					new OracleParameter(":OldGlazetypeid",OracleDbType.Int32,
@@ -17724,29 +17728,29 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 					new OracleParameter(":CreateUserID",OracleDbType.Int32,
 						sUserInfo.UserID,ParameterDirection.Input),
 				};
-				returnRows = oracleTrConn.ExecuteNonQuery(sql, Paras);
+					returnRows = oracleTrConn.ExecuteNonQuery(sql, Paras);
 
-				// 变更履历
-				sql =
-				"INSERT INTO TP_PM_LOGOCHANGEDRECORD\n" +
-				"  (BARCODE\n" +
-				"  ,OLDLOGOID\n" +
-				"  ,NEWLOGOID\n" +
-				//"  ,PROCEDUREID\n" +
-				"  ,REMARKS\n" +
-				"  ,ACCOUNTID\n" +
-				"  ,CREATETIME\n" +
-				"  ,CREATEUSERID)\n" +
-				"VALUES\n" +
-				"  (:BARCODE\n" +
-				"  ,:OLDLOGOID\n" +
-				"  ,:NEWLOGOID\n" +
-				//"  ,:PROCEDUREID\n" +
-				"  ,NULL\n" +
-				"  ,:ACCOUNTID\n" +
-				"  ,SYSDATE\n" +
-				"  ,:CREATEUSERID)";
-				Paras = new OracleParameter[] {
+					// 变更履历
+					sql =
+					"INSERT INTO TP_PM_LOGOCHANGEDRECORD\n" +
+					"  (BARCODE\n" +
+					"  ,OLDLOGOID\n" +
+					"  ,NEWLOGOID\n" +
+					//"  ,PROCEDUREID\n" +
+					"  ,REMARKS\n" +
+					"  ,ACCOUNTID\n" +
+					"  ,CREATETIME\n" +
+					"  ,CREATEUSERID)\n" +
+					"VALUES\n" +
+					"  (:BARCODE\n" +
+					"  ,:OLDLOGOID\n" +
+					"  ,:NEWLOGOID\n" +
+					//"  ,:PROCEDUREID\n" +
+					"  ,NULL\n" +
+					"  ,:ACCOUNTID\n" +
+					"  ,SYSDATE\n" +
+					"  ,:CREATEUSERID)";
+					Paras = new OracleParameter[] {
 						new OracleParameter(":OLDLOGOID",OracleDbType.Int32,
 							dt.Rows[0]["LOGOID"],ParameterDirection.Input),
 						new OracleParameter(":NEWLOGOID",OracleDbType.Int32,
@@ -17760,11 +17764,11 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 						new OracleParameter(":BARCODE",OracleDbType.Varchar2,
 							barcode,ParameterDirection.Input)
 					};
-				returnRows += oracleTrConn.ExecuteNonQuery(sql, Paras);
+					returnRows += oracleTrConn.ExecuteNonQuery(sql, Paras);
 
-				// 1.更新注浆明细
-				sql = "update tp_pm_groutingdailydetail set logoid=:logoid, glazetypeid =:glazetypeid, updateuserid=:updateuserid where barcode=:barcode";
-				Paras = new OracleParameter[] {
+					// 1.更新注浆明细
+					sql = "update tp_pm_groutingdailydetail set logoid=:logoid, glazetypeid =:glazetypeid, updateuserid=:updateuserid where barcode=:barcode";
+					Paras = new OracleParameter[] {
 					new OracleParameter(":logoid",OracleDbType.Int32,
 						logoid,ParameterDirection.Input),
 					new OracleParameter(":glazetypeid",OracleDbType.Int32,
@@ -17774,13 +17778,13 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 					new OracleParameter(":barcode",OracleDbType.Varchar2,
 						barcode,ParameterDirection.Input)
 					};
-				returnRows = oracleTrConn.ExecuteNonQuery(sql, Paras);
+					returnRows = oracleTrConn.ExecuteNonQuery(sql, Paras);
 
-				// 1.更新在产
-				sql = @"update TP_PM_INPRODUCTION set logoid=:logoid, 
---glazetypeid =:glazetypeid, 
-updateuserid=:updateuserid where barcode=:barcode";
-				Paras = new OracleParameter[] {
+					// 1.更新在产
+					sql = @"update TP_PM_INPRODUCTION set logoid=:logoid, 
+								--glazetypeid =:glazetypeid, 
+								updateuserid=:updateuserid where barcode=:barcode";
+					Paras = new OracleParameter[] {
 					new OracleParameter(":logoid",OracleDbType.Int32,
 						logoid,ParameterDirection.Input),
                     //new OracleParameter(":glazetypeid",OracleDbType.Int32,
@@ -17790,9 +17794,11 @@ updateuserid=:updateuserid where barcode=:barcode";
 					new OracleParameter(":barcode",OracleDbType.Varchar2,
 						barcode,ParameterDirection.Input)
 					};
-				returnRows += oracleTrConn.ExecuteNonQuery(sql, Paras);
+					returnRows += oracleTrConn.ExecuteNonQuery(sql, Paras);
 
-				oracleTrConn.Commit();
+					oracleTrConn.Commit();
+				}
+				
 			}
 			catch (Exception ex)
 			{

DK.Service/PMModuleLogic/PMModuleLogicPartial.cs

@@ -1470,6 +1470,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 			IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
 			try
 			{
+				DataTable secondDt = null;
 				oracleConn.Open();
 				DataSet returnDs = new DataSet();
 				#region 判断是否事装具条码
@@ -1964,7 +1965,27 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 						dr[Constant.BarCodeResultTableColumns.out_barcode.ToString()] = sqlBarcode;
 						barcode = sqlBarcode;
 					}
-
+					if (procedureID ==40|| procedureID == 6 || procedureID == 31 || procedureID == 16 || procedureID == 28 ||
+						procedureID == 60 || procedureID == 61 ) {
+						string sql = @"SELECT 
+												TO_CHAR('	已检验	'||chr(10)||' 产品编码:'||GOODSCODE||chr(10)||' 产品名称:'||GOODSNAME||chr(10)||' 工序:'||PROCEDURENAME||chr(10)||
+												' 产品等级:'||TP_SYS_GOODSLEVELTYPE.GOODSLEVELTYPENAME) AS detailsMessage FROM TP_PM_PRODUCTIONDATA
+												LEFT JOIN TP_SYS_GOODSLEVELTYPE ON TP_SYS_GOODSLEVELTYPE.GOODSLEVELTYPEID=TP_PM_PRODUCTIONDATA.GOODSLEVELTYPEID
+												WHERE BARCODE= :BARCODE AND PROCEDUREID= :PROCEDUREID";
+						OracleParameter[] secondparas = new OracleParameter[]{
+						new OracleParameter("PROCEDUREID",OracleDbType.Int32,procedureID,ParameterDirection.Input),
+					    new OracleParameter("BARCODE",OracleDbType.NVarchar2,barcode,ParameterDirection.Input),
+						};
+						secondDt = oracleConn.GetSqlResultToDt(sql, secondparas);
+						if (secondDt != null && secondDt.Rows.Count > 0) {
+							dr[Constant.BarCodeResultTableColumns.out_errMsg.ToString()] = secondDt.Rows[0]["detailsMessage"];
+							dr[Constant.BarCodeResultTableColumns.out_missFlag.ToString()] = 0;
+							dtBarCode.Rows.Add(dr);
+							returnDs.Tables.Add(dtBarCode);
+							return returnDs;
+						}
+				
+					}
 					#endregion
 					OracleParameter[] paras = new OracleParameter[]{
 					new OracleParameter("in_procedureid",OracleDbType.Int32,procedureID,ParameterDirection.Input),