浏览代码

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

Hcsy 7 年之前
父节点
当前提交
3f7aa22e2b
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      UAS-出货标签管理/UAS_出货标签管理.cs

+ 2 - 2
UAS-出货标签管理/UAS_出货标签管理.cs

@@ -210,7 +210,7 @@ namespace UAS_LabelMachine
                 pib_cusoutboxcode.Visible = false;
                 ViVoPlate.Visible = false;
                 OutBoxLabelPackage.Visible = false;
-                GetOutBoxCode.Visible = false;
+                //GetOutBoxCode.Visible = false;
             }
             asc.controllInitializeSize(this);
             asc.controlAutoSize(this);
@@ -2268,7 +2268,7 @@ namespace UAS_LabelMachine
         {
             int Current = 0;
             sql.Clear();
-            sql.Append("select pr_qtyperplace,pd_qty,pd_cartonno,pr_zxbzs,pd_cartons from packingdetail left join packing on pd_piid=pi_id left join prodinout on ");
+            sql.Append("select pr_qtyperplace,pd_qty,packingdetail.pd_cartonno,pr_zxbzs,packingdetail.pd_cartons from packingdetail left join packing on pd_piid=pi_id left join prodinout on ");
             sql.Append("pi_packingcode=packing.pi_code left join product on pd_prodcode=pr_code where pi_inoutno='" + pi_inoutno.Text + "' order by pr_code,pd_detno");
             dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
             if (dt.Rows.Count > 0)