Bläddra i källkod

不允许重复老化

callm 5 månader sedan
förälder
incheckning
4d42f9930e
1 ändrade filer med 17 tillägg och 13 borttagningar
  1. 17 13
      UAS_MES_ZT/FunctionCode/Make/Make_Aging.cs

+ 17 - 13
UAS_MES_ZT/FunctionCode/Make/Make_Aging.cs

@@ -18,7 +18,7 @@ namespace UAS_MES_NEW.Make
         AutoSizeFormClass asc = new AutoSizeFormClass();
         LogStringBuilder sql = new LogStringBuilder();
         DataTable dt;
-        
+
         //当前序列号记录
         string sn_code;
         //制造单号
@@ -54,11 +54,11 @@ namespace UAS_MES_NEW.Make
                 string oMakeCode;
                 //采集序列号
 
-                    if (sncode.Text == "")
-                    {
-                        OperateResult.AppendText(">>序列号不能为空\n", Color.Red);
-                        return;
-                    }
+                if (sncode.Text == "")
+                {
+                    OperateResult.AppendText(">>序列号不能为空\n", Color.Red);
+                    return;
+                }
                 if (!quxiao.Checked)
                 {
                     if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage2))
@@ -177,8 +177,6 @@ namespace UAS_MES_NEW.Make
                                 OperateResult.AppendText(">>" + ErrorMessage2 + "\n", Color.Red, sncode);
                                 return;
                             }
-                           
-
                         }
                         else
                         {
@@ -188,6 +186,11 @@ namespace UAS_MES_NEW.Make
                         {
                             dh.ExecuteSql("insert into ageing(ag_id,ag_code,ag_indate,ag_status) values(ageing_seq.nextval,'" + agcode.Text + "',sysdate,0)", "insert");
                         }
+                        if (dh.CheckExist("ageingdetail", "agd_sncode='" + sncode.Text + "' agd_makecode='" + ms_makecode.Text + "'"))
+                        {
+                            OperateResult.AppendText(">>" + sncode.Text + "已经进入老化,不允许重复采集\n", Color.Red, sncode);
+                            return;
+                        }
                         dh.ExecuteSql("insert into ageingdetail(agd_id,agd_agid,agd_agcode,agd_makecode,agd_sncode,agd_indate) select ageingdetail_seq.nextval,ag_id,ag_code,'" + ms_makecode.Text + "','" + sncode.Text + "',sysdate from ageing where ag_code = '" + agcode.Text + "'", "insert");
                         LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "老化采集" + agcode.Text, "采集成功", LastSncode, "");
                         OperateResult.AppendText(">>" + sncode.Text + "老化采集成功\n", Color.Green, sncode);
@@ -195,17 +198,18 @@ namespace UAS_MES_NEW.Make
                     }
                     else OperateResult.AppendText(">>" + ErrorMessage2 + "\n", Color.Red, sncode);
                 }
-                else {
+                else
+                {
                     if (agcode.Text == "")
                     {
-                            OperateResult.AppendText(">>老化编号不可为空\n", Color.Red, sncode);
-                            return;
+                        OperateResult.AppendText(">>老化编号不可为空\n", Color.Red, sncode);
+                        return;
                     }
                     else
                     {
                         fildgv();
                     }
-                    DataTable dtB = (DataTable)dh.ExecuteSql("select ag_code from ageingdetail left join ageing on agd_agid = ag_id where agd_agcode = '"+agcode.Text+"' and agd_sncode = '" + sncode.Text + "' and ag_status =0", "select");
+                    DataTable dtB = (DataTable)dh.ExecuteSql("select ag_code from ageingdetail left join ageing on agd_agid = ag_id where agd_agcode = '" + agcode.Text + "' and agd_sncode = '" + sncode.Text + "' and ag_status =0", "select");
                     if (dtB.Rows.Count > 0)
                     {
                         dh.ExecuteSql("delete ageingdetail where agd_agcode = '" + agcode.Text + "' and agd_sncode = '" + sncode.Text + "' ", "delete");
@@ -292,7 +296,7 @@ namespace UAS_MES_NEW.Make
                 else
                 {
                     dtc = (DataTable)dh.ExecuteSql("select * from ageingdetail left join ageing on agd_agid = ag_id where ag_code = '" + agcode.Text + "'  ", "select");
-                    agsum.Text = dh.getFieldDataByCondition("ageingdetail", "count(1) cn"," agd_agcode = '"+ agcode.Text + "'").ToString();
+                    agsum.Text = dh.getFieldDataByCondition("ageingdetail", "count(1) cn", " agd_agcode = '" + agcode.Text + "'").ToString();
                 }
                 BaseUtil.FillDgvWithDataTable(LabelDataGridView, dtc);
             }