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

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -86,7 +86,7 @@ namespace UAS_MES.Make
             //加载表单数据
             string Err = "";
             sql.Clear();
-            sql.Append("select pr_code,pa_outboxcode,pa_prodcode,pa_makecode,pa_sccode,nvl(pa_downstatus,0) pa_downstatus,pa_checkno,pa_status,pr_packrule,nvl(PR_CHECKCARTONW,'0') PR_CHECKCARTONW,pr_detail,pa_packageqty,nvl(pa_standardqty,0) pa_standardqty,nvl(pr_outboxinnerqty,0)pr_outboxinnerqty,pa_currentqty from package left join product on pa_prodcode=");
+            sql.Append("select pr_code,pa_outboxcode,pa_prodcode,pa_salecode,pa_makecode,pa_sccode,nvl(pa_downstatus,0) pa_downstatus,pa_checkno,pa_status,pr_packrule,nvl(PR_CHECKCARTONW,'0') PR_CHECKCARTONW,pr_detail,pa_packageqty,nvl(pa_standardqty,0) pa_standardqty,nvl(pr_outboxinnerqty,0)pr_outboxinnerqty,pa_currentqty from package left join product on pa_prodcode=");
             sql.Append("pr_code where pa_outboxcode='" + pa_outboxcode.Text + "'");
             Err = "箱号";
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
@@ -94,6 +94,7 @@ namespace UAS_MES.Make
             {
                 //记录该数据保证在修改不被允许的前提下能偶回复之前的值
                 StandardQTY = decimal.Parse(dt.Rows[0]["pr_outboxinnerqty"].ToString());
+                ms_salecode.Text = dt.Rows[0]["pa_salecode"].ToString();
                 BaseUtil.SetFormValue(this.Controls, dt);
                 if (pa_standardqty.Text != "0")
                 {
@@ -490,7 +491,7 @@ namespace UAS_MES.Make
             {
                 condition = "and ob_status='ENTERING' ";
             }
-            if (dh.getFieldDataByCondition("line", "LI_REQSAMESACODE", "li_code='" + User.UserLineCode + "'").ToString() != "0")
+            if (dh.getFieldDataByCondition("line", "nvl(LI_REQSAMESACODE,0)", "li_code='" + User.UserLineCode + "'").ToString() != "0")
             {
                 condition += " and ob_salecode='" + ms_salecode.Text + "'";
             }

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -154,7 +154,7 @@ namespace UAS_MES.Make
             //加载表单数据
             string Err = "";
             sql.Clear();
-            sql.Append("select pa_prodcode,pr_cartonmaxw,pa_makecode,pr_cartonunit,pr_code,pr_cartonminw,pr_cartongw,pa_outboxcode,pa_sccode,nvl(pa_downstatus,0) pa_downstatus,pa_checkno,");
+            sql.Append("select pa_prodcode,pr_cartonmaxw,pa_salecode,pa_makecode,pr_cartonunit,pr_code,pr_cartonminw,pr_cartongw,pa_outboxcode,pa_sccode,nvl(pa_downstatus,0) pa_downstatus,pa_checkno,");
             sql.Append("pa_status,pr_packrule,pr_detail,pa_packageqty,nvl(pa_standardqty,0)pa_standardqty,nvl(pr_outboxinnerqty,0)pr_outboxinnerqty,nvl(PR_CHECKCARTONW,'0') PR_CHECKCARTONW,pa_currentqty from package left join ");
             sql.Append("product on pa_prodcode=pr_code where pa_outboxcode='" + pa_outboxcode.Text + "'");
             Err = "箱号";
@@ -166,6 +166,7 @@ namespace UAS_MES.Make
                 string _maxweight = dt.Rows[0]["pr_cartonmaxw"].ToString();
                 string _minweight = dt.Rows[0]["pr_cartonminw"].ToString();
                 PR_CHECKCARTONW = dt.Rows[0]["PR_CHECKCARTONW"].ToString();
+                ms_salecode.Text = dt.Rows[0]["pa_salecode"].ToString();
                 if (PR_CHECKCARTONW != "0")
                     checkweightlabel.Text = "需要检测重量";
                 else
@@ -600,7 +601,7 @@ namespace UAS_MES.Make
             {
                 condition = "and ob_status='ENTERING' ";
             }
-            if (dh.getFieldDataByCondition("line", "LI_REQSAMESACODE", "li_code='" + User.UserLineCode + "'").ToString() != "0")
+            if (dh.getFieldDataByCondition("line", "nvl(LI_REQSAMESACODE,0)", "li_code='" + User.UserLineCode + "'").ToString() != "0")
             {
                 condition += " and ob_salecode='" + ms_salecode.Text + "'";
             }