Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_CollectBTMAC.cs

@@ -36,6 +36,7 @@ namespace UAS_MES.Make
         Boolean isMAC = false;
         //打印计数
         int printcount;
+        int ma_unlimitin;
 
         public Make_CollectBTMAC()
         {
@@ -109,6 +110,7 @@ namespace UAS_MES.Make
                                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                                 if (dt.Rows.Count > 0)
                                 {
+                                    ma_unlimitin = int.Parse(dt.Rows[0]["ma_unlimitin"].ToString());
                                     BaseUtil.SetFormValue(this.Controls, dt);
                                     dh.UpdateByCondition("makeserial", "ms_currentstepcode = '" + User.CurrentStepCode + "'", "ms_id = '" + oMsID + "'");
                                     OperateResult.AppendText(">>请输入BT\n", Color.Black);
@@ -180,7 +182,7 @@ namespace UAS_MES.Make
                         }
                         //根据序列号获取此时BT号
                         //ms_bt = dh.getFieldDataByCondition("makeserial", "ms_bt", "ms_id = '" + oMsID + "'").ToString();
-                        if (int.Parse(mcd_remainqty.Text) <= 0 && dt.Rows[0]["ma_unlimitin"].ToString() == "0")
+                        if (int.Parse(mcd_remainqty.Text) <= 0 && ma_unlimitin == 0)
                         {
                             ErrorMessage = "工单" + ms_makecode.Text + "剩余采集数不足\n>>>请输入SN";
                             OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
@@ -251,7 +253,7 @@ namespace UAS_MES.Make
                     }
                     ////根据序列号获取此时网标号
                     //ms_mac = dh.getFieldDataByCondition("makeserial", "ms_mac", "ms_id = '" + oMsID + "'").ToString();
-                    if (int.Parse(mcd_remainqty.Text) <= 0 && dt.Rows[0]["ma_unlimitin"].ToString() == "0")
+                    if (int.Parse(mcd_remainqty.Text) <= 0 && ma_unlimitin == 0)
                     {
                         ErrorMessage = "工单" + ms_makecode.Text + "剩余采集数不足\n>>>请输入SN";
                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);

UAS-MES/FunctionCode/Make/Make_CollectNetCode.cs

@@ -30,6 +30,7 @@ namespace UAS_MES.Make
         Boolean isnetcode = false;
         //打印计数
         int printcount = 0;
+        int ma_unlimitin;
 
         public Make_CollectNetCode()
         {
@@ -79,6 +80,7 @@ namespace UAS_MES.Make
                             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt.Rows.Count > 0)
                             {
+                                ma_unlimitin = int.Parse(dt.Rows[0]["ma_unlimitin"].ToString());
                                 BaseUtil.SetFormValue(this.Controls, dt);
                                 dh.UpdateByCondition("makeserial", "ms_currentstepcode = '" + User.CurrentStepCode + "'", "ms_id = '" + oMsID + "'");
                                 OperateResult.AppendText(">>请输入网标\n", Color.Black);
@@ -121,7 +123,7 @@ namespace UAS_MES.Make
                     string result = "";
                     ////根据序列号获取此时网标号
                     //net_code = dh.getFieldDataByCondition("makeserial", "ms_netcode", "ms_id = '" + oMsID + "'").ToString();
-                    if (int.Parse(mcd_remainqty.Text) <= 0 && dt.Rows[0]["ma_unlimitin"].ToString() == "0")
+                    if (int.Parse(mcd_remainqty.Text) <= 0 && ma_unlimitin == 0)
                     {
                         ErrorMessage = "工单" + ms_makecode.Text + "剩余采集数不足\n>>>请输入SN";
                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);