优化管理采集项

UAS_MES_HGS/FunctionCode/Make/Make_RePrintLabel.cs

@@ -104,7 +104,7 @@ namespace UAS_MES_NEW.Make
         private void radioButton_CheckedChange(object sender, EventArgs e)
         {
             RadioButton btn = sender as RadioButton;
-            if ((btn.Name == "giftBox" ) && btn.Checked)
+            if ((btn.Name == "giftBox") && btn.Checked)
             {
                 //如果是切换成彩盒或者机身标提示用户 输入SN
                 OperateResult.AppendText(">>请输入SN\n", Color.Black);
@@ -139,10 +139,11 @@ namespace UAS_MES_NEW.Make
                 }
                 OperateResult.AppendText(">>" + inputText.Text + "\n", Color.Black);
                 //打印类型为彩盒或者机身标
-                if (giftBox.Checked||jishen.Checked)
+                if (giftBox.Checked || jishen.Checked)
                 {
+
                     //select max(ms_id)ms_id from makeserial where ms_sncode=? 
-                    ms_id = dh.getFieldDataByCondition("makeserial", "max(ms_id) ms_id", "ms_sncode='" + inputText.Text + "'").ToString();
+                    ms_id = dh.getFieldDataByCondition("makeserial", "max(ms_id) ms_id", "ms_sncode='" + inputText.Text + "' or replace(MS_OTHCODE1,':','')='" + inputText.Text + "' ").ToString();
                     //如果ms_id 无值或者为空，提示用户SN不存在，请输入SN
                     if (ms_id == "")
                     {
@@ -278,7 +279,8 @@ namespace UAS_MES_NEW.Make
                 //    //插入数据
                 //    putInfo2MakeDown();
                 //}
-            }else if (jishen.Checked)
+            }
+            else if (jishen.Checked)
             {
                 mapB = (DataTable)dh.ExecuteSql("select ms_outboxcode, nvl(ms_downstatus,0) ms_downstatus from makeserial where ms_id='" + ms_id + "' and ms_sncode='" + inputValue.Text + "'", "select");
                 if (mapB.Rows.Count == 0)
@@ -417,7 +419,7 @@ namespace UAS_MES_NEW.Make
 
         private void rePrintCheck_KeyDown(object sender, KeyEventArgs e)
         {
-          
+
         }
         /// <summary>
         /// 清除信息

UAS_MES_HGS/FunctionCode/Packing/Packing_PackageCollection.cs

@@ -216,11 +216,19 @@ namespace UAS_MES_NEW.Packing
             {
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
                 {
-                    dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where replace(ms_mac,':','')='" + sn_code.Text + "' order by ms_id desc", "select");
+                    dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where replace(ms_mac,':','')='" + sn_code.Text + "'  order by ms_id desc", "select");
                     if (dt.Rows.Count > 0)
                     {
                         sn_code.Text = dt.Rows[0]["ms_sncode"].ToString();
                     }
+                    else
+                    {
+                        dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where replace(MS_OTHCODE1,':','')='" + sn_code.Text + "'  order by ms_id desc", "select");
+                        if (dt.Rows.Count > 0)
+                        {
+                            sn_code.Text = dt.Rows[0]["ms_sncode"].ToString();
+                        }
+                    }
                     dt = (DataTable)dh.ExecuteSql("select ms_status,ms_id,ms_makecode,ms_nextstepcode,ms_craftcode,ms_prodcode from makeserial where ms_sncode ='" + sn_code.Text + "' order by ms_id desc", "select");
                     if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, sn_code.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage) || (dt.Rows.Count > 0 && dt.Rows[0]["ms_status"].ToString() == "2"))
                     {