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

UAS-MES/PublicMethod/LogicHandler.cs

@@ -555,7 +555,7 @@ namespace UAS_MES.PublicMethod
                     sql.Append("select ob_checkno,nvl(ob_nowcheckqty,0)ob_nowcheckqty,nvl(ob_batchqty,0)ob_batchqty,pr_qualmethod,nvl(pr_qcbatchqty,0)pr_qcbatchqty,");
                     sql.Append("nvl(pr_ifautocutcheckno, 0)pr_ifautocutcheckno,nvl(ob_id, 0)ob_id from product left join oqcbatch on pr_code");
                     sql.Append("=ob_prodcode and ob_linecode='" + User.UserLineCode + "'and ob_status = 'ENTERING' ");
-                    sql.Append("AND OB_SOURCE = '工序' and '" + pr_sendchecktype + "'='LineCode' or ob_salecode='" + ms_salecode + "' where pr_code = '" + prodcode + "'");
+                    sql.Append("AND OB_SOURCE = '工序' and ('" + pr_sendchecktype + "'='LineCode' or ob_salecode='" + ms_salecode + "') where pr_code = '" + prodcode + "'");
                     dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                     string ob_id = "";
                     string ob_checkno = "";