|
|
@@ -928,7 +928,7 @@ namespace UAS_MES.PublicMethod
|
|
|
sql.Append("select MakeProcess_seq.nextval, ma_code,ma_id,ms_code,ms_sncode,mcd_stepcode,mcd_stepname,");
|
|
|
sql.Append("ma_craftcode,ma_craftname,'" + iMPKind + "','" + result + "',sysdate,'" + iUserName + "',ma_wccode,ma_linecode,'"+ iSourceCode + "'");
|
|
|
sql.Append("from make left join makecraftdetail on mcd_macode=ma_code left join makeserial on ms_makecode=ma_code ");
|
|
|
- sql.Append("where ms_sncode='" + iSnCode + "' and ma_code='" + iMakeCode + "' mcd_stepcode='"+ CurrentStep + "'");
|
|
|
+ sql.Append("where ms_sncode='" + iSnCode + "' and ma_code='" + iMakeCode + "' and mcd_stepcode='"+ CurrentStep + "'");
|
|
|
//插入makeprocess
|
|
|
dh.ExecuteSql(sql.ToString(), "insert");
|
|
|
sql.Clear();
|
|
|
@@ -1106,8 +1106,6 @@ namespace UAS_MES.PublicMethod
|
|
|
//dh.UpdateByCondition("makecraftdetail", "mcd_inqty=mcd_inqty+1,mcd_outqty = mcd_outqty + 1", "mcd_macode='" + iMakeCode + "' and mcd_stepcode='" + StepCode + "'");
|
|
|
//更新序列号已经采集的工序 ms_paststep 已采集数据，更新下一工序
|
|
|
dh.UpdateByCondition("makeserial", "ms_paststep = ms_paststep ||'," + StepCode + "'", "ms_sncode='" + iSnCode + "'");
|
|
|
- //记录操作日志
|
|
|
- InsertMakeProcess(iSnCode, iMakeCode, iSourceCode, "不良采集", iResult, iUserCode);
|
|
|
//判断当前采集点是否为扣料工序cd_ifreduce =-1 则为扣料工序
|
|
|
//之前保存的不良就不再调用
|
|
|
Console.WriteLine("ms_status"+ ms_status);
|
|
|
@@ -1311,7 +1309,6 @@ namespace UAS_MES.PublicMethod
|
|
|
/// <returns></returns>
|
|
|
public static bool UpdateMakeMessage(string iSnCode, string iMakeCode, string iMPKind, string iSourceCode, string iUserName, string iResult, out string oErrorMessage)
|
|
|
{
|
|
|
- InsertMakeProcess(iSnCode, iMakeCode, iSourceCode, iMPKind, iResult, iUserName);
|
|
|
return SetStepFinish(iMakeCode, iSourceCode, iSnCode, iMPKind, iResult, iUserName, out oErrorMessage);
|
|
|
}
|
|
|
|
章政