|
|
@@ -53,6 +53,8 @@ namespace UAS_MES.Make
|
|
|
|
|
|
List<string> CollectDataSonCode = new List<string>();
|
|
|
|
|
|
+ List<string> SPID = new List<string>();
|
|
|
+
|
|
|
public Make_FeedingCollection()
|
|
|
{
|
|
|
InitializeComponent();
|
|
|
@@ -255,6 +257,7 @@ namespace UAS_MES.Make
|
|
|
if (!dh.CheckExist("Craftmaterial", "cm_makecode='" + ma_code.Text + "' and cm_soncode='" + make_prodcode + "' and cm_sncode='" + code.Text + "' and cm_status=0"))
|
|
|
{
|
|
|
CollectDataSonCode.Add(sp_soncode);
|
|
|
+ SPID.Add(sp_id);
|
|
|
CollectData.Add(code.Text);
|
|
|
sn_code.Text = code.Text;
|
|
|
OperateResult.AppendText(">>序列号" + code.Text + ",物料" + sp_soncode + "上料成功\n", Color.Green);
|
|
|
@@ -349,6 +352,7 @@ namespace UAS_MES.Make
|
|
|
RemainIndex = RemainIndex + 1;
|
|
|
OperateResult.SelectionColor = Color.Green;
|
|
|
CollectData.Add(code.Text);
|
|
|
+ SPID.Add(sp_id);
|
|
|
OperateResult.AppendText(">>物料" + sp_soncode + "采集成功\n");
|
|
|
code.Clear();
|
|
|
//如果+1后不小于B序列的长度，则已采集完成，不需要进行提示了
|
|
|
@@ -363,11 +367,11 @@ namespace UAS_MES.Make
|
|
|
sql.Append("insert into Craftmaterial (cm_id ,cm_makecode,cm_maid,cm_maprodcode, cm_soncode, cm_mscode, cm_sncode, cm_stepcode, cm_stepname,cm_fsoncode,");
|
|
|
sql.Append("cm_craftcode,cm_craftname,cm_barcode,cm_inqty,cm_indate,cm_inman,cm_linecode,cm_wccode,cm_sourcecode,cm_spid,cm_status,cm_materialtype,cm_firstsn)");
|
|
|
sql.Append("select Craftmaterial_seq.nextval, ma_code, ma_id, ma_prodcode,:soncode,ms_code,ms_sncode,mcd_stepcode,");
|
|
|
- sql.Append("mcd_stepname,sp_fsoncode,ma_craftcode,ma_craftname,:barcode,1,sysdate,'" + User.UserCode + "',ma_linecode,ma_wccode,");
|
|
|
- sql.Append("'" + User.UserSourceCode + "','" + sp_id + "',0,1,ms_firstsn from make left join makecraftdetail on mcd_macode=ma_code left join stepproduct on sp_stepcode=mcd_stepcode ");
|
|
|
+ sql.Append("mcd_stepname,sp_fsoncode,ma_craftcode,ma_craftname,:barcode,1,sysdate,'" + User.UserCode + "','" + User.UserLineCode + "',ma_wccode,");
|
|
|
+ sql.Append("'" + User.UserSourceCode + "',:sp_id,0,1,ms_firstsn from make left join makecraftdetail on mcd_macode=ma_code left join stepproduct on sp_stepcode=mcd_stepcode ");
|
|
|
sql.Append("and sp_craftcode=ma_craftcode and sp_mothercode = ma_prodcode left join makeserial on ms_makecode=ma_code ");
|
|
|
- sql.Append("where ma_code='" + make_code + "'and sp_id=" + sp_id + " and mcd_stepcode = '" + User.CurrentStepCode + "' and ms_sncode='" + ms_sncode + "'");
|
|
|
- dh.BatchInsert(sql.GetString(), new string[] { "soncode", "barcode" }, CollectDataSonCode.ToArray(), CollectData.ToArray());
|
|
|
+ sql.Append("where ma_code='" + make_code + "'and sp_id=:sp_id1 and mcd_stepcode = '" + User.CurrentStepCode + "' and ms_sncode='" + ms_sncode + "'");
|
|
|
+ dh.BatchInsert(sql.GetString(), new string[] { "soncode", "barcode", "sp_id", "sp_id1" }, CollectDataSonCode.ToArray(), CollectData.ToArray(), SPID.ToArray(), SPID.ToArray());
|
|
|
//更新序列号半成品已被使用
|
|
|
dh.ExecuteSql("update makeserial set ms_nextmacode='" + ma_code + "' where ms_id=(select max(ms_id) from makeserial where ms_sncode='" + sn_code.Text + "' and ms_makecode<>'" + ma_code + "')", "update");
|
|
|
if (ecn_label.Checked || softwareversion_label.Checked)
|
章政