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

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -163,10 +163,6 @@ namespace UAS_MES.Make
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             if (dt.Rows.Count > 0)
             {
-                if (pr_code.Text != "")
-                {
-                    dt.Columns.Remove(dt.Columns["pa_standardqty"]);
-                }
                 //重量的临时变量
                 string _weight = dt.Rows[0]["pr_cartongw"].ToString();
                 string _maxweight = dt.Rows[0]["pr_cartonmaxw"].ToString();

UAS-MES/FunctionCode/Make/Make_SpecialCartonPack.cs

@@ -162,10 +162,6 @@ namespace UAS_MES.Make
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             if (dt.Rows.Count > 0)
             {
-                if (pr_code.Text != "")
-                {
-                    dt.Columns.Remove(dt.Columns["pa_standardqty"]);
-                }
                 //重量的临时变量
                 string _weight = dt.Rows[0]["pr_cartongw"].ToString();
                 string _maxweight = dt.Rows[0]["pr_cartonmaxw"].ToString();