对于已拆解物料进行操作时去除部分操作

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -325,41 +325,44 @@ namespace UAS_MES.Make
                                     }
                                 }
                             }
-                            //判断生产信息
-                            sql.Clear();
-                            sql.Append("select ms_id,ms_sncode,cm_barcode from craftmaterial left join makeserial on cm_barcode = ms_sncode and cm_soncode = ms_prodcode where cm_id = '" + LabelDataGridView.Rows[i].Cells["cm_id"].Value + "' and cm_materialtype ='1' and ms_id>'0' and ms_nextmacode = '" + LabelDataGridView.Rows[i].Cells["cm_makecode"].Value.ToString() + "'");
-                            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                            //制造件
-                            if (dt.Rows.Count > 0)
+                            if (LabelDataGridView.Rows[i].Cells["cm_status"].Value.ToString() != "-1")
                             {
-                                string makecode = (String)dh.getFieldDataByCondition("makeserial", "ms_makecode", "ms_sncode = '" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "' and ms_prodcode = '" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value + "'");
-                                string mss_id = dt.Rows[0]["ms_id"].ToString();
-                                ////MakeBad表插入物料批号不良信息
+                                //判断生产信息
                                 sql.Clear();
-                                sql.Append(" insert into makebad (mb_id, mb_inman,mb_indate,mb_stepcode,mb_sourcecode, mb_bgcode,mb_mscode,mb_sncode, mb_badcode, mb_makecode)");
-                                sql.Append("values (MakeBad_seq.nextval,'" + User.UserName + "',sysdate,'" + User.CurrentStepCode + "','" + User.UserSourceCode + "',:bg_code ,'" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "','" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "',");
-                                sql.Append(":bc_code,'" + makecode + "')");
-                                dh.BatchInsert(sql.GetString(), new string[] { "bg_code", "bc_code" }, bgcode, bccode);
-                                //更新子件序列号为待维修                               
+                                sql.Append("select ms_id,ms_sncode,cm_barcode from craftmaterial left join makeserial on cm_barcode = ms_sncode and cm_soncode = ms_prodcode where cm_id = '" + LabelDataGridView.Rows[i].Cells["cm_id"].Value + "' and cm_materialtype ='1' and ms_id>'0' and ms_nextmacode = '" + LabelDataGridView.Rows[i].Cells["cm_makecode"].Value.ToString() + "'");
+                                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                                //制造件
+                                if (dt.Rows.Count > 0)
+                                {
+                                    string makecode = (String)dh.getFieldDataByCondition("makeserial", "ms_makecode", "ms_sncode = '" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "' and ms_prodcode = '" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value + "'");
+                                    string mss_id = dt.Rows[0]["ms_id"].ToString();
+                                    ////MakeBad表插入物料批号不良信息
+                                    sql.Clear();
+                                    sql.Append(" insert into makebad (mb_id, mb_inman,mb_indate,mb_stepcode,mb_sourcecode, mb_bgcode,mb_mscode,mb_sncode, mb_badcode, mb_makecode)");
+                                    sql.Append("values (MakeBad_seq.nextval,'" + User.UserName + "',sysdate,'" + User.CurrentStepCode + "','" + User.UserSourceCode + "',:bg_code ,'" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "','" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "',");
+                                    sql.Append(":bc_code,'" + makecode + "')");
+                                    dh.BatchInsert(sql.GetString(), new string[] { "bg_code", "bc_code" }, bgcode, bccode);
+                                    //更新子件序列号为待维修                               
+                                    sql.Clear();
+                                    sql.Append("update makeserial set ms_status=3 ,ms_badtimes = ms_badtimes+1,ms_nextmacode = '' where ms_id='" + mss_id + "' ");
+                                    dh.ExecuteSql(sql.GetString(), "update");
+                                }
+                                //没有生产信息，判定为采购件，则将不良信息插入不良零件表中MAKEBADRSPART
+                                else
+                                {
+                                    sql.Clear();
+                                    sql.Append("insert into  MAKEBADRSPART(mbp_id,mbp_indate,mbp_inman,mbp_sncode, mbp_badcode, mbp_part, mbp_makecode, mbp_sccode,mbp_barcode)values");
+                                    sql.Append("(MAKEBADRSPART_seq.nextval, sysdate, '" + User.UserCode + "','" + ms_sncode.Text + "',:bc_code,'" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value + "','" + ms_makecode.Text + "','" + User.UserSourceCode + "','" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "')");
+                                    dh.BatchInsert(sql.GetString(), new string[] { "bc_code" }, bccode);
+                                }
+
+                                //此物料上线状态更新为-1,代表被拆解
                                 sql.Clear();
-                                sql.Append("update makeserial set ms_status=3 ,ms_badtimes = ms_badtimes+1,ms_nextmacode = '' where ms_id='" + mss_id + "' ");
+                                sql.Append("update craftmaterial set cm_status=-1,cm_lastdeco=-1,cm_dropman='" + User.UserCode + "',");
+                                sql.Append("cm_dropdate =sysdate,cm_dropstep='" + User.CurrentStepCode + "',");
+                                sql.Append("cm_dropsccode='" + User.UserSourceCode + "' where cm_id='" + LabelDataGridView.Rows[i].Cells["cm_id"].Value + "'");
                                 dh.ExecuteSql(sql.GetString(), "update");
                             }
-                            //没有生产信息，判定为采购件，则将不良信息插入不良零件表中MAKEBADRSPART
-                            else
-                            {
-                                sql.Clear();
-                                sql.Append("insert into  MAKEBADRSPART(mbp_id,mbp_indate,mbp_inman,mbp_sncode, mbp_badcode, mbp_part, mbp_makecode, mbp_sccode,mbp_barcode)values");
-                                sql.Append("(MAKEBADRSPART_seq.nextval, sysdate, '" + User.UserCode + "','" + ms_sncode.Text + "',:bc_code,'" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value + "','" + ms_makecode.Text + "','" + User.UserSourceCode + "','" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "')");
-                                dh.BatchInsert(sql.GetString(), new string[] { "bc_code" }, bccode);
-                            }
-
-                            //此物料上线状态更新为-1,代表被拆解
-                            sql.Clear();
-                            sql.Append("update craftmaterial set cm_status=-1,cm_lastdeco=-1,cm_dropman='" + User.UserCode + "',");
-                            sql.Append("cm_dropdate =sysdate,cm_dropstep='" + User.CurrentStepCode + "',");
-                            sql.Append("cm_dropsccode='" + User.UserSourceCode + "' where cm_id='" + LabelDataGridView.Rows[i].Cells["cm_id"].Value + "'");
-                            dh.ExecuteSql(sql.GetString(), "update");
 
                             ////将新批号绑定到序列号中
                             //dt = (DataTable)dh.ExecuteSql("select sp_id from stepproduct where sp_mothercode='" + LabelDataGridView.Rows[i].Cells["cm_maprodcode"].Value + "'", "select");
@@ -380,41 +383,43 @@ namespace UAS_MES.Make
                         }
                         else if (nochange.Checked)
                         {
-                            //判断生产信息
-                            sql.Clear();
-                            sql.Append("select ms_id,ms_sncode,cm_barcode from craftmaterial left join makeserial on cm_barcode = ms_sncode and cm_soncode = ms_prodcode where cm_id = '" + LabelDataGridView.Rows[i].Cells["cm_id"].Value + "' and cm_materialtype ='1' and ms_id>'0' and ms_nextmacode = '" + LabelDataGridView.Rows[i].Cells["cm_makecode"].Value.ToString() + "'");
-                            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                            //制造件
-                            if (dt.Rows.Count > 0)
+                            if (LabelDataGridView.Rows[i].Cells["cm_status"].Value.ToString() != "-1")
                             {
-                                string makecode = (String)dh.getFieldDataByCondition("makeserial", "ms_makecode", "ms_sncode = '" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "' and ms_prodcode = '" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value + "'");
-                                string mss_id = dt.Rows[0]["ms_id"].ToString();
-                                ////MakeBad表插入物料批号不良信息
+                                //判断生产信息
                                 sql.Clear();
-                                sql.Append(" insert into makebad (mb_id, mb_inman,mb_indate,mb_stepcode,mb_sourcecode, mb_bgcode,mb_mscode,mb_sncode, mb_badcode, mb_makecode)");
-                                sql.Append("values (MakeBad_seq.nextval,'" + User.UserName + "',sysdate,'" + User.CurrentStepCode + "','" + User.UserSourceCode + "',:bg_code ,'" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "','" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "',");
-                                sql.Append(":bc_code,'" + makecode + "')");
-                                dh.BatchInsert(sql.GetString(), new string[] { "bg_code", "bc_code" }, bgcode, bccode);
-                                //更新子件序列号为待维修                               
+                                sql.Append("select ms_id,ms_sncode,cm_barcode from craftmaterial left join makeserial on cm_barcode = ms_sncode and cm_soncode = ms_prodcode where cm_id = '" + LabelDataGridView.Rows[i].Cells["cm_id"].Value + "' and cm_materialtype ='1' and ms_id>'0' and ms_nextmacode = '" + LabelDataGridView.Rows[i].Cells["cm_makecode"].Value.ToString() + "'");
+                                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                                //制造件
+                                if (dt.Rows.Count > 0)
+                                {
+                                    string makecode = (String)dh.getFieldDataByCondition("makeserial", "ms_makecode", "ms_sncode = '" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "' and ms_prodcode = '" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value + "'");
+                                    string mss_id = dt.Rows[0]["ms_id"].ToString();
+                                    ////MakeBad表插入物料批号不良信息
+                                    sql.Clear();
+                                    sql.Append(" insert into makebad (mb_id, mb_inman,mb_indate,mb_stepcode,mb_sourcecode, mb_bgcode,mb_mscode,mb_sncode, mb_badcode, mb_makecode)");
+                                    sql.Append("values (MakeBad_seq.nextval,'" + User.UserName + "',sysdate,'" + User.CurrentStepCode + "','" + User.UserSourceCode + "',:bg_code ,'" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "','" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "',");
+                                    sql.Append(":bc_code,'" + makecode + "')");
+                                    dh.BatchInsert(sql.GetString(), new string[] { "bg_code", "bc_code" }, bgcode, bccode);
+                                    //更新子件序列号为待维修                               
+                                    sql.Clear();
+                                    sql.Append("update makeserial set ms_status=3 ,ms_badtimes = ms_badtimes+1,ms_nextmacode = '' where ms_id='" + mss_id + "' ");
+                                    dh.ExecuteSql(sql.GetString(), "update");
+                                }
+                                //没有生产信息，判定为采购件，则将不良信息插入不良零件表中MAKEBADRSPART
+                                else
+                                {
+                                    sql.Clear();
+                                    sql.Append("insert into  MAKEBADRSPART(mbp_id,mbp_indate,mbp_inman,mbp_sncode, mbp_badcode, mbp_part, mbp_makecode, mbp_sccode,mbp_barcode)values");
+                                    sql.Append("(MAKEBADRSPART_seq.nextval, sysdate, '" + User.UserCode + "','" + ms_sncode.Text + "',:bc_code,'" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value + "','" + ms_makecode.Text + "','" + User.UserSourceCode + "','" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "')");
+                                    dh.BatchInsert(sql.GetString(), new string[] { "bc_code" }, bccode);
+                                }
+                                //craftmaterial解除相应物料绑定
                                 sql.Clear();
-                                sql.Append("update makeserial set ms_status=3 ,ms_badtimes = ms_badtimes+1,ms_nextmacode = '' where ms_id='" + mss_id + "' ");
+                                sql.Append("update craftmaterial set cm_status=-1,cm_dropman='" + User.UserCode + "',");
+                                sql.Append("cm_dropdate =sysdate,cm_dropstep='" + User.CurrentStepCode + "',");
+                                sql.Append("cm_dropsccode='" + User.UserSourceCode + "' where cm_id='" + LabelDataGridView.Rows[i].Cells["cm_id"].Value + "'");
                                 dh.ExecuteSql(sql.GetString(), "update");
                             }
-                            //没有生产信息，判定为采购件，则将不良信息插入不良零件表中MAKEBADRSPART
-                            else
-                            {
-                                sql.Clear();
-                                sql.Append("insert into  MAKEBADRSPART(mbp_id,mbp_indate,mbp_inman,mbp_sncode, mbp_badcode, mbp_part, mbp_makecode, mbp_sccode,mbp_barcode)values");
-                                sql.Append("(MAKEBADRSPART_seq.nextval, sysdate, '" + User.UserCode + "','" + ms_sncode.Text + "',:bc_code,'" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value + "','" + ms_makecode.Text + "','" + User.UserSourceCode + "','" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "')");
-                                dh.BatchInsert(sql.GetString(), new string[] { "bc_code" }, bccode);
-                            }
-
-                            //craftmaterial解除相应物料绑定
-                            sql.Clear();
-                            sql.Append("update craftmaterial set cm_status=-1,cm_dropman='" + User.UserCode + "',");
-                            sql.Append("cm_dropdate =sysdate,cm_dropstep='" + User.CurrentStepCode + "',");
-                            sql.Append("cm_dropsccode='" + User.UserSourceCode + "' where cm_id='" + LabelDataGridView.Rows[i].Cells["cm_id"].Value + "'");
-                            dh.ExecuteSql(sql.GetString(), "update");
 
                             //更新序列号信息
                             sql.Clear();