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

UAS-MES/FunctionCode/Make/Make_CollectNetCode.cs

@@ -121,13 +121,13 @@ namespace UAS_MES.Make
                     string result = "";
                     ////根据序列号获取此时网标号
                     //net_code = dh.getFieldDataByCondition("makeserial", "ms_netcode", "ms_id = '" + oMsID + "'").ToString();
-                    if (int.Parse(mcd_remainqty.Text) <= 0)
-                    {
-                        ErrorMessage = "工单" + ms_makecode.Text + "剩余采集数不足\n>>>请输入SN";
-                        OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
-                        return;
-                    }
-                    else if (dh.CheckExist("makeserial", "ms_netcode = '" + sncode.Text + "'"))
+                    //if (int.Parse(mcd_remainqty.Text) <= 0)
+                    //{
+                    //    ErrorMessage = "工单" + ms_makecode.Text + "剩余采集数不足\n>>>请输入SN";
+                    //    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
+                    //    return;
+                    //}
+                    if (dh.CheckExist("makeserial", "ms_netcode = '" + sncode.Text + "'"))
                     {
                         sncode.Text = "";
                         OperateResult.AppendText(">>录入错误，已存在此网标\n", Color.Red);