|
|
@@ -137,7 +137,7 @@ namespace UAS_MES_NEW.Make
|
|
|
}
|
|
|
//工单信息
|
|
|
sql.Clear();
|
|
|
- sql.Append("select ma_salecode,nvl(ma_checksacode,0)ma_checksacode,ma_prodcode,ma_craftname,ma_inqty,ma_craftcode,ma_qty,nvl(ma_inqty,0) ma_inqty,");
|
|
|
+ sql.Append("select ma_salecode,ma_bomversion,nvl(ma_checksacode,0)ma_checksacode,ma_prodcode,ma_craftname,ma_inqty,ma_craftcode,ma_qty,nvl(ma_inqty,0) ma_inqty,");
|
|
|
sql.Append("nvl(ma_scrapqty,0)ma_scrapqty,ma_id,nvl(ma_unlimitin,0) ma_unlimitin,ma_wccode,NVL(re_autodecom,0)");
|
|
|
sql.Append("re_autodecom,nvl(re_ifsnok,0)re_ifsnok,re_code from make left join rework on ma_screcode=re_code where ");
|
|
|
sql.Append("ma_code='" + ma_code.Text + "'and ma_kind in('返工','委托加工直接入库-返工生产','返工委外订单') and ma_statuscode='STARTED'");
|
|
|
@@ -147,6 +147,7 @@ namespace UAS_MES_NEW.Make
|
|
|
string re_autodecom = MaInf.Rows[0]["re_autodecom"].ToString();
|
|
|
string re_ifsnok = MaInf.Rows[0]["re_ifsnok"].ToString();
|
|
|
string ma_checksacode = MaInf.Rows[0]["ma_checksacode"].ToString();
|
|
|
+ string ma_bomversion = MaInf.Rows[0]["ma_bomversion"].ToString();
|
|
|
string re_code = MaInf.Rows[0]["re_code"].ToString();
|
|
|
int ma_unlimitin = int.Parse(MaInf.Rows[0]["ma_unlimitin"].ToString());
|
|
|
int ma_inqty = int.Parse(MaInf.Rows[0]["ma_inqty"].ToString());
|
|
|
@@ -240,11 +241,11 @@ namespace UAS_MES_NEW.Make
|
|
|
}
|
|
|
//插入返工工单
|
|
|
sql.Clear();
|
|
|
- sql.Append("insert into MakeSerial(ms_id,ms_code,ms_sncode,ms_prodcode,ms_indate,ms_wccode");
|
|
|
+ sql.Append("insert into MakeSerial(ms_id,ms_code,ms_sncode,ms_bomversion,ms_prodcode,ms_indate,ms_wccode");
|
|
|
sql.Append(",ms_craftcode,ms_craftname,ms_nextstepcode,ms_status,ms_makecode,ms_linecode");
|
|
|
sql.Append(",ms_sourcecode,ms_maid,ms_firstsn,ms_salecode,ms_mac,ms_bt,ms_othcode1,ms_othcode2,");
|
|
|
sql.Append("ms_othcode3,ms_netcode,ms_imei1,ms_imei2,ms_imei3,ms_meid,ms_othid1,ms_othid2,ms_othid3)");
|
|
|
- sql.Append("values(MakeSerial_seq.nextval,'" + Sn + "','" + Sn + "','" + pr_code.Text + "',");
|
|
|
+ sql.Append("values(MakeSerial_seq.nextval,'" + Sn + "','" + Sn + "','"+ma_bomversion+"','" + pr_code.Text + "',");
|
|
|
sql.Append("sysdate,'" + workcenter + "','" + craftcode + "','" + craftname + "','" + User.CurrentStepCode + "',");
|
|
|
sql.Append("'0','" + ma_code.Text + "','" + User.UserLineCode + "','" + User.UserSourceCode + "','" + ma_id.Text + "',");
|
|
|
sql.Append("'" + firstsn + "','" + salecode + "','" + mac + "','" + bt + "','" + othcode1 + "','" + othcode2 + "','" + othcode3 + "',");
|
callm