|
@@ -159,7 +159,7 @@ namespace UAS_MES_NEW.Make
|
|
|
//}
|
|
//}
|
|
|
sql.Clear();
|
|
sql.Clear();
|
|
|
sql.Append("select ms_makecode ma_code,ma_qty,ma_salecode,ma_colorcode,pr_colorboxunit,pr_code,ms_sku,pr_colorboxgw,");
|
|
sql.Append("select ms_makecode ma_code,ma_qty,ma_salecode,ma_colorcode,pr_colorboxunit,pr_code,ms_sku,pr_colorboxgw,");
|
|
|
- sql.Append("pr_colorboxunit,pr_colorboxmaxw,pr_colorboxminw,nvl(PR_CHECKCOLORBOXW,'0') PR_CHECKCOLORBOXW,nvl(pr_sendchecktype,'LineCode')");
|
|
|
|
|
|
|
+ sql.Append("pr_colorboxunit,ma_maxcolorboxweight pr_colorboxmaxw,ma_mincolorboxweight pr_colorboxminw,nvl(PR_CHECKCOLORBOXW,'0') PR_CHECKCOLORBOXW,nvl(pr_sendchecktype,'LineCode')");
|
|
|
sql.Append("pr_sendchecktype from makeserial left join make on ms_makecode=ma_code left join product on ");
|
|
sql.Append("pr_sendchecktype from makeserial left join make on ms_makecode=ma_code left join product on ");
|
|
|
sql.Append("ms_prodcode=pr_code where ms_sncode='" + sncode.Text + "' order by ms_id desc");
|
|
sql.Append("ms_prodcode=pr_code where ms_sncode='" + sncode.Text + "' order by ms_id desc");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
@@ -487,7 +487,7 @@ namespace UAS_MES_NEW.Make
|
|
|
private void RefreshWeigh_Click(object sender, EventArgs e)
|
|
private void RefreshWeigh_Click(object sender, EventArgs e)
|
|
|
{
|
|
{
|
|
|
sql.Clear();
|
|
sql.Clear();
|
|
|
- sql.Append("select pr_colorboxgw,pr_colorboxmaxw,pr_colorboxminw,pr_colorboxunit from product where pr_code='" + pr_code.Text + "'");
|
|
|
|
|
|
|
+ sql.Append("select pr_colorboxgw,ma_maxcolorboxweight pr_colorboxmaxw,ma_mincolorboxweight pr_colorboxminw,pr_colorboxunit from make left join product on ma_prodcode=pr_code where ma_code='" + ma_code.Text + "'");
|
|
|
DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
{
|
