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

UAS-MES/Login.cs

@@ -119,7 +119,6 @@ namespace UAS_MES
                     }
                     LogManager.DoLog("登陆成功" + User.UserName + "  " + User.UserAccountType);
                     Main dialog = new Main();
-                    //
                     dialog.ShowDialog();
                     this.Close();
                 }

UAS-MES/PublicMethod/LogicHandler.cs

@@ -316,7 +316,7 @@ namespace UAS_MES.PublicMethod
                     Form = (DataTable)dh.ExecuteSql("select ob_id,ob_status,ob_prodcode,ob_batchqty,ob_source,ob_checkno from OQCBatch where ob_checkno='" + iCheckNo + "'", "select");
                     if (Form.Rows.Count > 0)
                     {
-                        if (Form.Rows[0]["ob_source"].ToString() == "新增" && Form.Rows[0]["ob_status"].ToString() == "ENTERING")
+                        if (/*Form.Rows[0]["ob_source"].ToString() == "新增" &&*/ Form.Rows[0]["ob_status"].ToString() == "ENTERING")
                         {
                             sql.Clear();
                             sql.Append("select ob_id,ob_status,ob_prodcode ma_prodcode,ob_batchqty,ob_source,ob_checkno,obd_id,obd_outboxcode,obd_makecode ma_code,count(1) cn from OQCBatch left join OQCBatchdetail ");