取消采集更新分配日志接口

UAS_MES_LGDZ/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -122,7 +122,7 @@ namespace UAS_MES_NEW.Make
                     string oStatus = "";
                     //调用公共方法CheckStepSNAndMacode判断工序是否正确
                     string status = "";
-                    dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei1='" + sncode.Text + "' order by ms_id desc", "select");
+                    dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei1='" + sncode.Text + "' or ms_psn='"+sncode.Text+"' order by ms_id desc", "select");
                     if (dt.Rows.Count > 0)
                     {
                         sncode.Text = dt.Rows[0]["ms_sncode"].ToString();

UAS_MES_LGDZ/FunctionCode/Make/Make_ImeiCheck.cs

@@ -86,7 +86,7 @@ namespace UAS_MES_NEW.Make
                     OperateResult.AppendText("<<输入不能为空\n", Color.DarkRed);
                     return;
                 }
-                dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei1='" + sncode.Text + "' order by ms_id desc", "select");
+                dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei1='" + sncode.Text + "' or ms_psn='"+sncode.Text+"' order by ms_id desc", "select");
                 if (dt.Rows.Count > 0)
                 {
                     sncode.Text = dt.Rows[0]["ms_sncode"].ToString();
@@ -129,7 +129,7 @@ namespace UAS_MES_NEW.Make
                     if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
                     {
                         sql.Clear();
-                        sql.Append("select max(ms_id) ms_id from makeserial where ms_imei1 ='" + sncode.Text + "'");
+                        sql.Append("select max(ms_id) ms_id from makeserial where ms_imei1 ='" + sncode.Text + "' or ms_psn='"+sncode.Text+"'");
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
                         {
@@ -184,7 +184,7 @@ namespace UAS_MES_NEW.Make
                     if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
                     {
                         sql.Clear();
-                        sql.Append("select max(ms_id) ms_id from makeserial where ms_imei1 ='" + sncode.Text + "'");
+                        sql.Append("select max(ms_id) ms_id from makeserial where ms_imei1 ='" + sncode.Text + "' or ms_psn='"+sncode.Text+"'");
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
                         {

UAS_MES_LGDZ/FunctionCode/Special/Special_CancelCollection.cs

@@ -115,6 +115,7 @@ namespace UAS_MES_NEW.Special
                 //删除StepPass
                 sqls.Add("delete from steppassed where sp_sncode='" + ms_firstsn + "' and sp_makecode='" + ms_makecode + "'");
                 sqls.Add("delete from steppassed where sp_sncode='" + sn_code.Text + "' and sp_makecode='" + ms_makecode + "'");
+                sqls.Add("update MACRELEASE set mr_status=-1 where mr_sncode='" + ms_firstsn + "' or mr_sncode='" + sn_code.Text + "'");
                 sqls.Add("delete from makeserial where ms_id='" + ms_id + "'");
                 dh.ExecuteSQLTran(sqls.ToArray());
                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "取消采集", "取消采集成功", sn_code.Text, "");

UAS_MES_LGDZ/FunctionCode/Special/Special_CancelCollectionWN.cs

@@ -144,6 +144,7 @@ namespace UAS_MES_NEW.Special
                 sqls.Add("update make set ma_inqty=ma_inqty-1 where ma_code='" + ms_makecode + "'");
                 //删除StepPass
                 sqls.Add("delete from steppassed where sp_sncode='" + ms_firstsn + "' or sp_sncode='" + ms_code + "' and sp_makecode='" + ms_makecode + "'");
+                sqls.Add("update MACRELEASE set mr_status=-1 where mr_sncode='" + ms_firstsn + "' or mr_sncode='" + ms_code + "'");
                 sqls.Add("delete from makeserial where ms_id='" + ms_id + "'");
                 dh.ExecuteSQLTran(sqls.ToArray());
                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "取消采集", "取消采集成功", sn_code.Text, "");