|
|
@@ -52,7 +52,7 @@ namespace UAS_MES.Make
|
|
|
ma_code.SelectField = "ma_code # 工单号,ma_prodcode # 产品编号,ma_qty # 工单数量,pr_detail # 产品名称,ma_softversion # 软件版本,ma_salecode # 销售单号,pr_sendchecktype # 产品送检方式";
|
|
|
ma_code.FormName = Name;
|
|
|
ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "ma_qty", "pr_detail", "ma_softversion", "ma_salecode", "nvl(pr_sendchecktype,'LineCode')pr_sendchecktype" };
|
|
|
- ma_code.Condition = "ma_statuscode='STARTED'";
|
|
|
+ ma_code.Condition = "ma_statuscode in('STARTED','AUDITED')";
|
|
|
ma_code.DbChange += Ma_code_DbChange;
|
|
|
|
|
|
li_code.TableName = "Line";
|
|
|
@@ -371,7 +371,14 @@ namespace UAS_MES.Make
|
|
|
DataTable dt = (DataTable)dh.ExecuteSql("select case when nvl(ST_COMBINENUMBER,1)=0 then 1 else nvl(ST_COMBINENUMBER,1) end from STENCIL where st_code='" + SU_DEVCODE1.Text + "' and st_statuscode='AUDITED'", "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
- st_combinenumber.Text = (int.Parse(ma_qty.Text) / int.Parse(dt.Rows[0][0].ToString())).ToString();
|
|
|
+ try
|
|
|
+ {
|
|
|
+ st_combinenumber.Text = (int.Parse(ma_qty.Text) / int.Parse(dt.Rows[0][0].ToString())).ToString();
|
|
|
+ }
|
|
|
+ catch (Exception)
|
|
|
+ {
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
else
|
|
|
{
|