Merge branch 'master' of ssh://10.10.100.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -112,7 +112,7 @@ namespace UAS_MES.Make
             sql.Clear();
             sql.Append("select cm_craftcode,cm_spid,cm_craftname,cm_firstsn,cm_makecode,cm_stepcode,cm_stepname,cm_maprodcode,cm_fsoncode,cm_wccode,cm_maid,cm_soncode,cm_materialtype,");
             sql.Append("max(cm_status) cm_status,max(cm_id) cm_id from craftmaterial where(cm_sncode  in (select '" + sncode_1 + "' from dual union select firstsn from makesnrelation where sn ");
-            sql.Append(" ='" + sncode_1 + "'union  select sn from makesnrelation where firstsn = '" + sncode_1 + "')");
+            sql.Append(" ='" + sncode_1 + "'union  select sn from makesnrelation where firstsn = '" + sncode_1 + "' union select ms_code from makeserial where ms_sncode = '" + sncode_1 + "')");
             sql.Append(") group by cm_craftcode,cm_firstsn,cm_stepcode,cm_stepname,cm_spid,cm_makecode,cm_maprodcode,cm_maid,cm_soncode,cm_wccode,cm_materialtype,cm_craftname,cm_fsoncode ORDER BY cm_status DESC");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             if (dt.Rows.Count > 0)

UAS-MES/FunctionCode/Make/Make_Decompose_Ex.cs

@@ -112,7 +112,7 @@ namespace UAS_MES.Make
             sql.Clear();
             sql.Append("select cm_craftcode,cm_spid,cm_craftname,cm_firstsn,cm_makecode,cm_stepcode,cm_stepname,cm_maprodcode,cm_fsoncode,cm_wccode,cm_maid,cm_soncode,cm_materialtype,");
             sql.Append("max(cm_status) cm_status,max(cm_id) cm_id from craftmaterial where(cm_sncode  in (select '" + sncode_1 + "' from dual union select firstsn from makesnrelation where sn ");
-            sql.Append(" ='" + sncode_1 + "'union  select sn from makesnrelation where firstsn = '" + sncode_1 + "')");
+            sql.Append(" ='" + sncode_1 + "'union  select sn from makesnrelation where firstsn = '" + sncode_1 + "' union select ms_code from makeserial where ms_sncode = '"+ sncode_1 + "')");
             sql.Append(") group by cm_craftcode,cm_firstsn,cm_stepcode,cm_stepname,cm_spid,cm_makecode,cm_maprodcode,cm_maid,cm_soncode,cm_wccode,cm_materialtype,cm_craftname,cm_fsoncode ORDER BY cm_status DESC");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             if (dt.Rows.Count > 0)

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -122,20 +122,20 @@ namespace UAS_MES.Make
                                         OperateResult.AppendText("<<当前TSN号处于下地状态不允许操作\n", Color.Red, code);
                                         return;
                                     }
-                                    if (dt.Rows[0]["ms_stepcode"].ToString() == User.CurrentStepCode)
-                                    {
+                                    //if (dt.Rows[0]["ms_stepcode"].ToString() == User.CurrentStepCode)
+                                    //{
                                         step = 1;
 
                                         TSN = code.Text;
                                         //显示序列号
                                         show_sncode.Text = TSN;
                                         ChangeResult.Enabled = false;
-                                    }
-                                    else
-                                    {
+                                    //}
+                                    //else
+                                    //{
                                         OperateResult.AppendText("<<当前工序不允许重新转号\n", Color.Red, code);
                                         return;
-                                    }
+                                    //}
                                 }
                                 else
                                 {

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -87,18 +87,18 @@ namespace UAS_MES.Make
                                         OperateResult.AppendText("<<当前TSN号处于下地状态不允许操作\n", Color.Red, sncode);
                                         return;
                                     }
-                                    if (dt.Rows[0]["ms_stepcode"].ToString() == User.CurrentStepCode)
-                                    {
+                                    //if (dt.Rows[0]["ms_stepcode"].ToString() == User.CurrentStepCode)
+                                    //{
                                         bsncode = sncode.Text;
                                         //显示序列号
                                         show_sncode.Text = bsncode;
                                         ChangeResult.Enabled = false;
-                                    }
-                                    else
-                                    {
-                                        OperateResult.AppendText("<<当前工序不允许重新转号\n", Color.Red, sncode);
-                                        return;
-                                    }
+                                    //}
+                                    //else
+                                    //{
+                                    //    OperateResult.AppendText("<<当前工序不允许重新转号\n", Color.Red, sncode);
+                                    //    return;
+                                    //}
                                 }
                                 else
                                 {
@@ -278,7 +278,7 @@ namespace UAS_MES.Make
                                     }
                                 }
 
-                                if (!ChangeResult.Checked && !onlyPass || bsncode != sncode.Text)
+                                if (!ChangeResult.Checked && !onlyPass || ChangeResult.Checked)
                                 {
                                     string firstsn = "";
                                     string updateSql = "";