Pārlūkot izejas kodu

取消采集逻辑更新

章政 8 gadi atpakaļ
vecāks
revīzija
218a3466e5

+ 19 - 0
UAS-MES/FunctionCode/Special/Special_CancelCollection.cs

@@ -55,11 +55,30 @@ namespace UAS_MES.Special
                         //送检数量-1
                         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");
+                    if (dt.Rows.Count > 0)
+                    {
+                        List<string> barcode = new List<string>();
+                        for (int i = 0; i < dt.Rows.Count; i++)
+                        {
+                            barcode.Add(dt.Rows[i]["cm_barcode"].ToString());
+                        }
+                        sql.Clear();
+                        sql.Append("update makeserial set ms_nextmacode='' where ms_makecode=:barcode and ms_id=(select max(ms_id) from makeserial where ms_sncode=:barcode1)");
+                        dh.BatchInsert(sql.GetString(), new string[] { "barcode", "barcode1" }, barcode.ToArray(), barcode.ToArray());
+                        sqls.Add("delete from craftmaterial where cm_sncode='" + sn_code.Text + "' and cm_makecode='" + ms_makecode + "'");
+                    }
+                    //清除操作日志
                     sqls.Add("delete from commandlog where cl_makecode='" + ms_makecode + "' and cl_sncode='" + sn_code.Text + "'");
                     //删除过站记录
                     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 + "'");
                     OperateResult.AppendText(">>序列号" + sn_code.Text + "成功解除绑定\n", Color.Green, sn_code);
                 }
                 else OperateResult.AppendText(">>序列号" + sn_code.Text + "不处于第一道工序,不允许取消采集\n", Color.Red, sn_code);