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

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -491,7 +491,8 @@ namespace UAS_MES.Make
             {
                 condition = "and ob_status='ENTERING' ";
             }
-            if (dh.getFieldDataByCondition("line", "nvl(LI_REQSAMESACODE,0)", "li_code='" + User.UserLineCode + "'").ToString() != "0")
+            string LI_REQSAMESACODE = dh.getFieldDataByCondition("line", "nvl(LI_REQSAMESACODE,0)", "li_code='" + User.UserLineCode + "'").ToString();
+            if (LI_REQSAMESACODE != "0" && LI_REQSAMESACODE != "")
             {
                 condition += " and ob_salecode='" + ms_salecode.Text + "'";
             }

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -601,7 +601,8 @@ namespace UAS_MES.Make
             {
                 condition = "and ob_status='ENTERING' ";
             }
-            if (dh.getFieldDataByCondition("line", "nvl(LI_REQSAMESACODE,0)", "li_code='" + User.UserLineCode + "'").ToString() != "0")
+            string LI_REQSAMESACODE = dh.getFieldDataByCondition("line", "nvl(LI_REQSAMESACODE,0)", "li_code='" + User.UserLineCode + "'").ToString();
+            if (LI_REQSAMESACODE != "0" && LI_REQSAMESACODE != "")
             {
                 condition += " and ob_salecode='" + ms_salecode.Text + "'";
             }