半检产品等级完成

DK.Client/PCModule/F_PC_0205.cs

@@ -891,6 +891,9 @@ 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();
 
             procedureEntity.OrganizationID = Convert.ToInt32(dr1[0]["OrganizationID"].ToString());
             procedureEntity.Remarks = dr1[0]["Remarks"].ToString();

DK.Service/PCModuleLogic/PCModuleLogicDAL.cs

@@ -1148,41 +1148,6 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                         }
                         else
                         {
-
-                            #region 更新工序半检信息 xuwei add 2019-12-11
-                            if (!string.IsNullOrEmpty(procedure.SemiGoodsLevel))
-                            {
-                                string[] ids = procedure.SemiGoodsLevel.Split(',');
-                                string sqlStr = @"
-                                    BEGIN
-
-                                    DELETE 
-                                        TP_PC_PROCEDUREGOODSLEVEL
-                                    WHERE 
-                                        PRODUCTIONLINEID = :PRODUCTIONLINEID
-                                        AND PROCEDUREID = :PROCEDUREID;
-                                ";
-                                for (int i = 0; i < ids.Length; i++)
-                                {
-                                    sqlStr += $@"
-                                        INSERT INTO TP_PC_PROCEDUREGOODSLEVEL 
-                                            ( PRODUCTIONLINEID,  PROCEDUREID,  GOODSLEVELTYPEID)
-                                        VALUES
-	                                        (:PRODUCTIONLINEID, :PROCEDUREID, {ids[i]});
-                                    ";
-                                }
-                                sqlStr += "END;";
-                                oracleTrConn.ExecuteNonQuery(
-                                    sqlStr,
-                                    new OracleParameter[]
-                                    {
-                                        new OracleParameter(":PRODUCTIONLINEID",productionLine.ProductionLineID),
-                                        new OracleParameter(":PROCEDUREID",procedure.ProcedureID)
-                                    }
-                                );
-                            }
-                            #endregion
-
                             #region 编辑
                             sqlText = "UPDATE TP_PC_Procedure SET "
                                                                                 + " ProcedureName=:procedureName,"
@@ -1279,6 +1244,11 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                     sqlText = "DELETE TP_PC_ProcedureKiln WHERE ProductionLineID=:productionLineID";
                     returnRows += oracleTrConn.ExecuteNonQuery(sqlText, paras);
                     #endregion
+
+                    #region 删除半检产品等级 然后再插入 xuwei add 2019-12-12
+                    sqlText = "DELETE TP_PC_PROCEDUREGOODSLEVEL WHERE PRODUCTIONLINEID = :productionLineID";
+                    returnRows += oracleTrConn.ExecuteNonQuery(sqlText, paras);
+                    #endregion
                 }
                 #endregion
 
@@ -1496,6 +1466,34 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                         }
                     }
                     #endregion
+
+                    #region 插入生产工序对应半检产品等级 xuwei add 2019-12-12
+                    if (!string.IsNullOrEmpty(procedure.SemiGoodsLevel))
+                    {
+                        string[] ids = procedure.SemiGoodsLevel.Split(',');
+                        string sqlStr = @"
+                                    BEGIN
+                                ";
+                        for (int i = 0; i < ids.Length; i++)
+                        {
+                            sqlStr += $@"
+                                        INSERT INTO TP_PC_PROCEDUREGOODSLEVEL 
+                                            ( PRODUCTIONLINEID,  PROCEDUREID,  GOODSLEVELTYPEID)
+                                        VALUES
+	                                        (:PRODUCTIONLINEID, :PROCEDUREID, {ids[i]});
+                                    ";
+                        }
+                        sqlStr += "END;";
+                        oracleTrConn.ExecuteNonQuery(
+                            sqlStr,
+                            new OracleParameter[]
+                            {
+                                new OracleParameter(":PRODUCTIONLINEID",productionLine.ProductionLineID),
+                                new OracleParameter(":PROCEDUREID",procedure.ProcedureID)
+                            }
+                        );
+                    }
+                    #endregion
                 }
                 #endregion
 
@@ -1551,40 +1549,6 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
 
                 string sqlText = "";
 
-                #region 更新工序半检信息 xuwei add 2019-12-11
-                if (!string.IsNullOrEmpty(procedure.SemiGoodsLevel))
-                {
-                    string[] ids = procedure.SemiGoodsLevel.Split(',');
-                    string sqlStr = @"
-                                    BEGIN
-
-                                    DELETE 
-                                        TP_PC_PROCEDUREGOODSLEVEL
-                                    WHERE 
-                                        PRODUCTIONLINEID = :PRODUCTIONLINEID
-                                        AND PROCEDUREID = :PROCEDUREID;
-                                ";
-                    for (int i = 0; i < ids.Length; i++)
-                    {
-                        sqlStr += $@"
-                                        INSERT INTO TP_PC_PROCEDUREGOODSLEVEL 
-                                            ( PRODUCTIONLINEID,  PROCEDUREID,  GOODSLEVELTYPEID)
-                                        VALUES
-	                                        (:PRODUCTIONLINEID, :PROCEDUREID, {ids[i]});
-                                    ";
-                    }
-                    sqlStr += "END;";
-                    oracleTrConn.ExecuteNonQuery(
-                        sqlStr,
-                        new OracleParameter[]
-                        {
-                                        new OracleParameter(":PRODUCTIONLINEID",procedure.ProductionLineID),
-                                        new OracleParameter(":PROCEDUREID",procedure.ProcedureID)
-                        }
-                    );
-                }
-                #endregion
-
                 #region 更新工序信息
                 sqlText = "UPDATE TP_PC_Procedure SET "
                     + " ProcedureName=:procedureName,"
@@ -1675,6 +1639,15 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                 returnRows += oracleTrConn.ExecuteNonQuery(sqlText, paras);
                 #endregion
 
+                #region 删除半检产品等级 然后再插入 xuwei add 2019-12-12
+                sqlText = "DELETE TP_PC_PROCEDUREGOODSLEVEL WHERE PRODUCTIONLINEID = :productionLineID and ProcedureID=:procedureid";
+                returnRows += oracleTrConn.ExecuteNonQuery(sqlText, new OracleParameter[]
+                        {
+                            new OracleParameter(":productionLineID",procedure.ProductionLineID),
+                            new OracleParameter(":procedureid",procedure.ProcedureID),
+                        });
+                #endregion
+
                 #region 插入生产工序对应产品表
                 foreach (DataRow row in procedure.ProcedureGoodsTable.Rows)
                 {
@@ -1835,6 +1808,34 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                 }
                 #endregion
 
+                #region 插入生产工序对应半检产品等级 xuwei add 2019-12-12
+                if (!string.IsNullOrEmpty(procedure.SemiGoodsLevel))
+                {
+                    string[] ids = procedure.SemiGoodsLevel.Split(',');
+                    string sqlStr = @"
+                                    BEGIN
+                                ";
+                    for (int i = 0; i < ids.Length; i++)
+                    {
+                        sqlStr += $@"
+                                        INSERT INTO TP_PC_PROCEDUREGOODSLEVEL 
+                                            ( PRODUCTIONLINEID,  PROCEDUREID,  GOODSLEVELTYPEID)
+                                        VALUES
+	                                        (:PRODUCTIONLINEID, :PROCEDUREID, {ids[i]});
+                                    ";
+                    }
+                    sqlStr += "END;";
+                    oracleTrConn.ExecuteNonQuery(
+                        sqlStr,
+                        new OracleParameter[]
+                        {
+                                new OracleParameter(":PRODUCTIONLINEID",procedure.ProductionLineID),
+                                new OracleParameter(":PROCEDUREID",procedure.ProcedureID)
+                        }
+                    );
+                }
+                #endregion
+
                 oracleTrConn.Commit();
             }
             catch (Exception ex)