提示音修改，取消采集不取消上记录

UAS_MES_LGDZ/CustomControl/RichText/RichTextAutoBottom.cs

@@ -42,7 +42,7 @@ namespace UAS_MES_NEW.CustomControl.RichText
             }
             else if (color == Color.DarkRed && Entity.SystemInf.CheckAudioEnable)
             {
-                FileName = Application.StartupPath + @"\Resources\Sound\5185.wav";
+                FileName = Application.StartupPath + @"\Resources\Sound\1454.wav";
                 thread.Start();
                 thread = new Thread(PlaySound);
             }
@@ -88,6 +88,12 @@ namespace UAS_MES_NEW.CustomControl.RichText
                 thread.Start();
                 thread = new Thread(PlaySound);
             }
+            else if (color == Color.DarkRed && Entity.SystemInf.CheckAudioEnable)
+            {
+                FileName = Application.StartupPath + @"\Resources\Sound\1454.wav";
+                thread.Start();
+                thread = new Thread(PlaySound);
+            }
             else if (color == Color.Green && Entity.SystemInf.CheckAudioEnable)
             {
                 //颜色是绿色，进行正确提示音
@@ -98,7 +104,14 @@ namespace UAS_MES_NEW.CustomControl.RichText
             else if (color == Color.GreenYellow && Entity.SystemInf.CheckAudioEnable)
             {
                 //颜色是绿色，进行正确提示音
-                FileName = Application.StartupPath + @"\Resources\Sound\9865.wav";
+                FileName = Application.StartupPath + @"\Resources\Sound\3285.wav";
+                thread.Start();
+                thread = new Thread(PlaySound);
+            }
+            else if (color == Color.LightGreen && Entity.SystemInf.CheckAudioEnable)
+            {
+                //颜色是绿色，进行正确提示音
+                FileName = Application.StartupPath + @"\Resources\Sound\3853.wav";
                 thread.Start();
                 thread = new Thread(PlaySound);
             }

UAS_MES_LGDZ/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -240,86 +240,86 @@ namespace UAS_MES_NEW.Make
                             sncode.Focus();
                             return;
                         }
-                        if (int.Parse(mcd_remainqty.Text) <= 0 && dt.Rows[0]["ma_unlimitin"].ToString() == "0")
+                        //if (int.Parse(mcd_remainqty.Text) <= 0 && dt.Rows[0]["ma_unlimitin"].ToString() == "0")
+                        //{
+                        //    macode = ma_code.Text;
+                        //    ErrorMessage = "工单" + macode + "打印结束\n>请输入SN";
+                        //    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
+                        //    sncode.Focus();
+                        //}
+                        //else
+                        //{
+                        //所选标签不为空
+                        if (PrintLabel.SelectedValue != null)
                         {
-                            macode = ma_code.Text;
-                            ErrorMessage = "工单" + macode + "打印结束\n>请输入SN";
-                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
-                            sncode.Focus();
-                        }
-                        else
-                        {
-                            //所选标签不为空
-                            if (PrintLabel.SelectedValue != null)
+                            //如果打印张数为空，返回
+                            if (PrintNum.Text == "" || int.Parse(PrintNum.Text) == 0)
                             {
-                                //如果打印张数为空，返回
-                                if (PrintNum.Text == "" || int.Parse(PrintNum.Text) == 0)
+                                OperateResult.AppendText(">>打印张数不可空或者为0\n", Color.Red, sncode);
+                                //清空输入框的值，聚焦
+                                sncode.Focus();
+                                //提示用户“>>请输入SN”
+                                OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                                return;
+                            }
+                            //更新至下一步工序
+                            if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, sncode.Text, "彩盒打印", "彩盒打印成功", User.UserCode, out ErrorMessage))
+                            {
+                                //提示正确返回时传递的信息
+                                if (ErrorMessage.Contains("AFTERSUCCESS"))
+                                    OperateResult.AppendText(">>" + ErrorMessage + "\n");
+                                if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, pr_code.Text, "彩盒标", "0", out ErrorMessage))
                                 {
-                                    OperateResult.AppendText(">>打印张数不可空或者为0\n", Color.Red, sncode);
-                                    //清空输入框的值，聚焦
-                                    sncode.Focus();
-                                    //提示用户“>>请输入SN”
-                                    OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                                    return;
+                                    //提示用户打印成功
+                                    OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);
                                 }
-                                //更新至下一步工序
-                                if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, sncode.Text, "彩盒打印", "彩盒打印成功", User.UserCode, out ErrorMessage))
+                                else
+                                {
+                                    OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
+                                }
+                                if (PrintSecond.Checked)
                                 {
-                                    //提示正确返回时传递的信息
-                                    if (ErrorMessage.Contains("AFTERSUCCESS"))
-                                        OperateResult.AppendText(">>" + ErrorMessage + "\n");
-                                    if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, pr_code.Text, "彩盒标", "0", out ErrorMessage))
+                                    if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel1.Text, PrintLabel1.SelectedValue.ToString(), PrintList1.Text, sncode.Text, int.Parse(PrintNum1.Text), oMakeCode, pr_code.Text, "彩盒标", "0", out ErrorMessage))
                                     {
-                                        //提示用户打印成功
                                         OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);
                                     }
                                     else
                                     {
                                         OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
                                     }
-                                    if (PrintSecond.Checked)
-                                    {
-                                        if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel1.Text, PrintLabel1.SelectedValue.ToString(), PrintList1.Text, sncode.Text, int.Parse(PrintNum1.Text), oMakeCode, pr_code.Text, "彩盒标", "0", out ErrorMessage))
-                                        {
-                                            OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);
-                                        }
-                                        else
-                                        {
-                                            OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
-                                        }
-                                    }
-                                    if (CollectRemark.Checked && Remark.Text != "")
-                                    {
-                                        LogicHandler.CollectRemarkInf(sncode.Text, "", "", oMakeCode, pr_code.Text, Remark.Text);
-                                    }
-                                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒打印", "彩盒打印成功", sncode.Text, "");
-                                    //刷新打印数量和剩余数量
-                                    dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty,mcd_okqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
-                                    BaseUtil.SetFormValue(Controls, dt);
-                                    sncode.Text = "";
-                                    ms_id = null;
-                                    sncode.Focus();
                                 }
-                                else
+                                if (CollectRemark.Checked && Remark.Text != "")
                                 {
-                                    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, sncode);
-                                    ms_id = null;
-                                    sncode.Focus();
+                                    LogicHandler.CollectRemarkInf(sncode.Text, "", "", oMakeCode, pr_code.Text, Remark.Text);
                                 }
+                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒打印", "彩盒打印成功", sncode.Text, "");
+                                //刷新打印数量和剩余数量
+                                dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty,mcd_okqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
+                                BaseUtil.SetFormValue(Controls, dt);
+                                sncode.Text = "";
+                                ms_id = null;
+                                sncode.Focus();
                             }
                             else
                             {
-                                OperateResult.AppendText(">>产品编号:" + pr_code.Text + "未维护彩盒标签\n", Color.Red, sncode);
-                                return;
-                            }
-                            if (CheckTSN.Checked == true)
-                            {
-                                OperateResult.AppendText(">>请输入TSN\n", Color.Black);
+                                OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, sncode);
                                 ms_id = null;
+                                sncode.Focus();
                             }
-                            else
-                                OperateResult.AppendText(">>请输入SN\n", Color.Black);
                         }
+                        else
+                        {
+                            OperateResult.AppendText(">>产品编号:" + pr_code.Text + "未维护彩盒标签\n", Color.Red, sncode);
+                            return;
+                        }
+                        if (CheckTSN.Checked == true)
+                        {
+                            OperateResult.AppendText(">>请输入TSN\n", Color.Black);
+                            ms_id = null;
+                        }
+                        else
+                            OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                        //}
                     }
                     else
                     {

UAS_MES_LGDZ/FunctionCode/Make/Make_ColorBoxLabelPrint_WN.cs

@@ -240,86 +240,86 @@ namespace UAS_MES_NEW.Make
                             sncode.Focus();
                             return;
                         }
-                        if (int.Parse(mcd_remainqty.Text) <= 0 && dt.Rows[0]["ma_unlimitin"].ToString() == "0")
+                        //if (int.Parse(mcd_remainqty.Text) <= 0 && dt.Rows[0]["ma_unlimitin"].ToString() == "0")
+                        //{
+                        //    macode = ma_code.Text;
+                        //    ErrorMessage = "工单" + macode + "打印结束\n>请输入SN";
+                        //    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
+                        //    sncode.Focus();
+                        //}
+                        //else
+                        //{
+                        //所选标签不为空
+                        if (PrintLabel.SelectedValue != null)
                         {
-                            macode = ma_code.Text;
-                            ErrorMessage = "工单" + macode + "打印结束\n>请输入SN";
-                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
-                            sncode.Focus();
-                        }
-                        else
-                        {
-                            //所选标签不为空
-                            if (PrintLabel.SelectedValue != null)
+                            //如果打印张数为空，返回
+                            if (PrintNum.Text == "" || int.Parse(PrintNum.Text) == 0)
                             {
-                                //如果打印张数为空，返回
-                                if (PrintNum.Text == "" || int.Parse(PrintNum.Text) == 0)
+                                OperateResult.AppendText(">>打印张数不可空或者为0\n", Color.Red, sncode);
+                                //清空输入框的值，聚焦
+                                sncode.Focus();
+                                //提示用户“>>请输入SN”
+                                OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                                return;
+                            }
+                            //更新至下一步工序
+                            if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, sncode.Text, "彩盒打印", "彩盒打印成功", User.UserCode, out ErrorMessage))
+                            {
+                                //提示正确返回时传递的信息
+                                if (ErrorMessage.Contains("AFTERSUCCESS"))
+                                    OperateResult.AppendText(">>" + ErrorMessage + "\n");
+                                if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, pr_code.Text, "彩盒标", "0", out ErrorMessage))
                                 {
-                                    OperateResult.AppendText(">>打印张数不可空或者为0\n", Color.Red, sncode);
-                                    //清空输入框的值，聚焦
-                                    sncode.Focus();
-                                    //提示用户“>>请输入SN”
-                                    OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                                    return;
+                                    //提示用户打印成功
+                                    OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);
                                 }
-                                //更新至下一步工序
-                                if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, sncode.Text, "彩盒打印", "彩盒打印成功", User.UserCode, out ErrorMessage))
+                                else
+                                {
+                                    OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
+                                }
+                                if (PrintSecond.Checked)
                                 {
-                                    //提示正确返回时传递的信息
-                                    if (ErrorMessage.Contains("AFTERSUCCESS"))
-                                        OperateResult.AppendText(">>" + ErrorMessage + "\n");
-                                    if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, pr_code.Text, "彩盒标", "0", out ErrorMessage))
+                                    if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel1.Text, PrintLabel1.SelectedValue.ToString(), PrintList1.Text, sncode.Text, int.Parse(PrintNum1.Text), oMakeCode, pr_code.Text, "彩盒标", "0", out ErrorMessage))
                                     {
-                                        //提示用户打印成功
                                         OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);
                                     }
                                     else
                                     {
                                         OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
                                     }
-                                    if (PrintSecond.Checked)
-                                    {
-                                        if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel1.Text, PrintLabel1.SelectedValue.ToString(), PrintList1.Text, sncode.Text, int.Parse(PrintNum1.Text), oMakeCode, pr_code.Text, "彩盒标", "0", out ErrorMessage))
-                                        {
-                                            OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);
-                                        }
-                                        else
-                                        {
-                                            OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
-                                        }
-                                    }
-                                    if (CollectRemark.Checked && Remark.Text != "")
-                                    {
-                                        LogicHandler.CollectRemarkInf(sncode.Text, "", "", oMakeCode, pr_code.Text, Remark.Text);
-                                    }
-                                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒打印", "彩盒打印成功", sncode.Text, "");
-                                    //刷新打印数量和剩余数量
-                                    dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty,mcd_okqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
-                                    BaseUtil.SetFormValue(Controls, dt);
-                                    sncode.Text = "";
-                                    ms_id = null;
-                                    sncode.Focus();
                                 }
-                                else
+                                if (CollectRemark.Checked && Remark.Text != "")
                                 {
-                                    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, sncode);
-                                    ms_id = null;
-                                    sncode.Focus();
+                                    LogicHandler.CollectRemarkInf(sncode.Text, "", "", oMakeCode, pr_code.Text, Remark.Text);
                                 }
+                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒打印", "彩盒打印成功", sncode.Text, "");
+                                //刷新打印数量和剩余数量
+                                dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty,mcd_okqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
+                                BaseUtil.SetFormValue(Controls, dt);
+                                sncode.Text = "";
+                                ms_id = null;
+                                sncode.Focus();
                             }
                             else
                             {
-                                OperateResult.AppendText(">>产品编号:" + pr_code.Text + "未维护彩盒标签\n", Color.Red, sncode);
-                                return;
-                            }
-                            if (CheckTSN.Checked == true)
-                            {
-                                OperateResult.AppendText(">>请输入TSN\n", Color.Black);
+                                OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, sncode);
                                 ms_id = null;
+                                sncode.Focus();
                             }
-                            else
-                                OperateResult.AppendText(">>请输入SN\n", Color.Black);
                         }
+                        else
+                        {
+                            OperateResult.AppendText(">>产品编号:" + pr_code.Text + "未维护彩盒标签\n", Color.Red, sncode);
+                            return;
+                        }
+                        if (CheckTSN.Checked == true)
+                        {
+                            OperateResult.AppendText(">>请输入TSN\n", Color.Black);
+                            ms_id = null;
+                        }
+                        else
+                            OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                        //}
                     }
                     else
                     {

UAS_MES_LGDZ/FunctionCode/Make/Make_ImeiCheck.cs

@@ -83,7 +83,7 @@ namespace UAS_MES_NEW.Make
             {
                 if (sncode.Text == "")
                 {
-                    OperateResult.AppendText("<<输入不能为空\n", Color.Red);
+                    OperateResult.AppendText("<<输入不能为空\n", Color.DarkRed);
                     return;
                 }
                 dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_code='" + sncode.Text + "' or  ms_imei1='" + sncode.Text + "' order by ms_id desc", "select");
@@ -148,7 +148,7 @@ namespace UAS_MES_NEW.Make
                                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                                     if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
                                     {
-                                        OperateResult.AppendText("<<SN错误，序列号" + sncode.Text + "不存在\n", Color.Red, sncode);
+                                        OperateResult.AppendText("<<SN错误，序列号" + sncode.Text + "不存在\n", Color.DarkRed, sncode);
                                         OperateResult.AppendText(">>请输入SN\n", Color.Black);
                                     }
                                 }
@@ -173,9 +173,9 @@ namespace UAS_MES_NEW.Make
                     }
                     else
                     {
-                        OperateResult.AppendText("<<SN:" + sncode.Text + "对应的SN不存在\n", Color.Red, sncode);
+                        OperateResult.AppendText("<<SN:" + sncode.Text + "对应的SN不存在\n", Color.DarkRed, sncode);
                         OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                        SetCheck set = new SetCheck("NG", Color.Red);
+                        SetCheck set = new SetCheck("NG", Color.DarkRed);
                         BaseUtil.SetFormCenter(set);
                         set.ShowDialog();
                     }
@@ -209,7 +209,7 @@ namespace UAS_MES_NEW.Make
                                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                                     if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
                                     {
-                                        OperateResult.AppendText("<<SN错误，序列号" + sncode.Text + "不存在\n", Color.Red, sncode);
+                                        OperateResult.AppendText("<<SN错误，序列号" + sncode.Text + "不存在\n", Color.DarkRed, sncode);
                                         OperateResult.AppendText(">>请输入SN\n", Color.Black);
                                     }
                                 }
@@ -237,7 +237,7 @@ namespace UAS_MES_NEW.Make
                                 if (nextstepcode != User.CurrentStepCode)
                                 {
                                     string stname = dh.getFieldDataByCondition("step", "st_name", "st_code='" + nextstepcode + "'").ToString();
-                                    OperateResult.AppendText("<<序列号:" + sncode.Text + "下一工序是" + stname + ",不是当前岗位的工序\n", Color.Red, sncode);
+                                    OperateResult.AppendText("<<序列号:" + sncode.Text + "下一工序是" + stname + ",不是当前岗位的工序\n", Color.DarkRed, sncode);
                                     imei1 = "";
                                     isImei1 = false;
                                     return;
@@ -262,15 +262,15 @@ namespace UAS_MES_NEW.Make
                                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "标签核对", "标签核对成功", SN, "");
                                     //SN核对成功
                                     //>> 请输入SN
-                                    OperateResult.AppendText("<<SN核对成功\n", Color.Green, sncode);
+                                    OperateResult.AppendText("<<SN核对成功\n", Color.LightGreen, sncode);
                                     OperateResult.AppendText(">>请输入SN\n", Color.Black);
                                 }
                                 else
                                 {
                                     //setstepresult不通过
-                                    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
+                                    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.DarkRed, sncode);
                                     recordResult(checksn, DateTime.Now.ToString(), "失败");
-                                    SetCheck set = new SetCheck("NG", Color.Red);
+                                    SetCheck set = new SetCheck("NG", Color.DarkRed);
                                     BaseUtil.SetFormCenter(set);
                                     set.ShowDialog();
                                 }
@@ -278,9 +278,9 @@ namespace UAS_MES_NEW.Make
                             else
                             {
                                 //判定序列号下一工序不通过
-                                OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
+                                OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.DarkRed, sncode);
                                 recordResult(checksn, DateTime.Now.ToString(), "失败");
-                                SetCheck set = new SetCheck("NG", Color.Red);
+                                SetCheck set = new SetCheck("NG", Color.DarkRed);
                                 BaseUtil.SetFormCenter(set);
                                 set.ShowDialog();
                             }
@@ -288,7 +288,7 @@ namespace UAS_MES_NEW.Make
                         else
                         {
                             //判定工序属性不通过
-                            OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
+                            OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.DarkRed, sncode);
                             recordResult(checksn, DateTime.Now.ToString(), "失败");
                         }
                     }
@@ -299,7 +299,7 @@ namespace UAS_MES_NEW.Make
                         imei1 = "";
                         //SN核对失败
                         //>> 请输入SN
-                        OperateResult.AppendText(">>SN核对失败,不一致\n", Color.Red, sncode);
+                        OperateResult.AppendText(">>SN核对失败,不一致\n", Color.DarkRed, sncode);
                         OperateResult.AppendText(">>请输入SN\n", Color.Black);
                     }
                     //imei1校对结束，下次输入的是SN

UAS_MES_LGDZ/FunctionCode/Special/Special_CancelCollectionWN.cs

@@ -117,7 +117,7 @@ namespace UAS_MES_NEW.Special
                     sql.Clear();
                     sql.Append("update makeserial set ms_nextmacode='' where ms_sncode=:barcode and ms_nextmacode='" + ms_makecode + "'");
                     dh.BatchInsert(sql.GetString(), new string[] { "barcode" }, barcode.ToArray());
-                    sqls.Add("delete from craftmaterial where cm_sncode='" + sn_code.Text + "' and cm_makecode='" + ms_makecode + "'");
+                    sqls.Add("update craftmaterial set cm_status=-1 where cm_sncode='" + sn_code.Text + "' and cm_makecode='" + ms_makecode + "'");
                 }
                 sqls.Add("delete from sninfo where si_sn='" + sn_code.Text + "'");
                 //sqls.Add("update makeaddresslist set mal_sncode='',mal_status=0 where mal_sncode='" + sn_code.Text + "'");

UAS_MES_ODLF/FunctionCode/Special/Special_CancelCollection.cs

@@ -105,7 +105,7 @@ namespace UAS_MES_NEW.Special
                 sqls.Add("update  makeaddresslist set mal_status=0,mal_sncode='' where mal_sncode='" + sn_code.Text + "' and mal_makecode='" + ms_makecode + "'");
                 sqls.Add("delete from makesnrelation where (sn='"+sn_code.Text+"' or beforesn='"+sn_code.Text+"') and makecode='"+ms_makecode+"'");
 
-                sqls.Add("update makesnlist set msl_status=0 where msl_sncode='" + sn_code.Text + "' and msl_makecode='" + ms_makecode + "' and msl_type='before'");
+                sqls.Add("update makesnlist set msl_status=0,msl_sncode='' where msl_sncode='" + sn_code.Text + "' and msl_makecode='" + ms_makecode + "' and msl_type='before'");
                 ////初始化号段状态
                 sqls.Add("update MAKESNRULEDETAIL set msd_status=0 where msd_sncode='" + sn_code.Text + "' and msd_makecode='" + ms_makecode + "'  and msd_type='before'");
                 //清除操作日志