取消采集功能出入站数量BUG修改

UAS-MES/FunctionCode/Special/Special_CancelCollection.cs

@@ -26,7 +26,7 @@ namespace UAS_MES.Special
         private void Confirm_Click(object sender, EventArgs e)
         {
             //获取序列号的途程
-            DataTable dt = (DataTable)dh.ExecuteSql("select ms_currentstepcode,ms_makecode,ms_status,ms_checkno,ms_craftcode,ms_prodcode,ms_stepcode from makeserial where ms_sncode='" + sn_code.Text + "' order by ms_id desc", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ms_id,ms_currentstepcode,ms_makecode,ms_status,ms_checkno,ms_craftcode,ms_prodcode,ms_stepcode from makeserial where ms_sncode='" + sn_code.Text + "' order by ms_id desc", "select");
             if (dt.Rows.Count > 0)
             {
                 string pr_code = dt.Rows[0]["ms_prodcode"].ToString();
@@ -36,6 +36,7 @@ namespace UAS_MES.Special
                 string ms_checkno = dt.Rows[0]["ms_checkno"].ToString();
                 string ms_status = dt.Rows[0]["ms_status"].ToString();
                 string ms_currentstepcode = dt.Rows[0]["ms_currentstepcode"].ToString();
+                string ms_id = dt.Rows[0]["ms_id"].ToString();
                 sql.Clear();
                 sql.Append("select cd_stepcode from craft left join craftdetail on cr_id=cd_crid where ");
                 sql.Append("cr_prodcode='" + pr_code + "' and cr_code='" + cr_code + "' and rownum=1 order by cd_detno ");
@@ -47,6 +48,12 @@ namespace UAS_MES.Special
                     if (ms_status == "3")
                     {
                         sqls.Add("delete from makebad where mb_sncode='" + sn_code.Text + "' and mb_makecode='" + ms_makecode + "'");
+                        //更新MakeCraftDetail表记录
+                        sqls.Add("update makecraftdetail set mcd_inqty=mcd_inqty-1,mcd_outqty=mcd_outqty-1 where mcd_macode='" + ms_makecode + "' and mcd_stepcode='" + ms_stepcode + "'");
+                    }
+                    else
+                    {
+                        sqls.Add("update makecraftdetail set mcd_inqty=mcd_inqty-1,mcd_outqty=mcd_outqty-1,mcd_okqty=mcd_okqty-1 where mcd_macode='" + ms_makecode + "' and mcd_stepcode='" + ms_stepcode + "'");
                     }
                     if (ms_checkno != "")
                     {
@@ -56,7 +63,7 @@ namespace UAS_MES.Special
                         sqls.Add("update oqcbatch set ob_nowcheckqty=ob_nowcheckqty-1 where ob_checkno='" + ms_checkno + "'");
                     }
                     //清除上料数据
-                    dt = (DataTable)dh.ExecuteSql("select cm_barcode from craftmaterial where cm_sncode='" + sn_code.Text + "' cm_makecode='" + ms_makecode + "'", "select");
+                    dt = (DataTable)dh.ExecuteSql("select cm_barcode from craftmaterial where cm_sncode='" + sn_code.Text + "' and cm_makecode='" + ms_makecode + "'", "select");
                     if (dt.Rows.Count > 0)
                     {
                         List<string> barcode = new List<string>();
@@ -75,10 +82,9 @@ namespace UAS_MES.Special
                     sqls.Add("delete from makeprocess where mp_sncode='" + sn_code.Text + "' and mp_makecode='" + ms_makecode + "'");
                     //投入数-1
                     sqls.Add("update make set ma_inqty=ma_inqty-1 where ma_code='" + ms_makecode + "'");
-                    //更新MakeCraftDetail表记录
-                    sqls.Add("update makecraftdetail set mcd_inqty=mcd_inqty-1,mcd_outqty=mcd_outqty-1,mcd_okqty=mcd_okqty-1 where mcd_macode='" + ms_makecode + "' and mcd_stepcode='" + ms_stepcode + "'");
                     //删除StepPass
                     sqls.Add("delete from steppassed where sp_sncode='" + sn_code.Text + "' and sp_makecode='" + ms_makecode + "'");
+                    sqls.Add("delete from makeserial where ms_id='" + ms_id + "'");
                     dh.ExecuteSQLTran(sqls.ToArray());
                     OperateResult.AppendText(">>序列号" + sn_code.Text + "成功解除绑定\n", Color.Green, sn_code);
                 }