|
|
@@ -602,8 +602,8 @@ namespace UAS_MES.PublicMethod
|
|
|
sql.Clear();
|
|
|
sql.Append("merge into makeserial using mes_package_view on (v_outboxcode='" + iOutBoxCode + "' ");
|
|
|
sql.Append("and ms_sncode=v_barcode and ms_makecode=v_makecode) when matched then update ");
|
|
|
- sql.Append(" set ms_stepcode='',ms_stepname='" + CurrentStepName + "',ms_status=2,");
|
|
|
- sql.Append("ms_nextstepcode='" + nextstepcode + "', ms_sccode = '" + iSourceCode + "',ms_paststep = ");
|
|
|
+ sql.Append(" set ms_stepcode='" + CurrentStep + "',ms_stepname='" + CurrentStepName + "',ms_status=2,");
|
|
|
+ sql.Append("ms_nextstepcode='', ms_sccode = '" + iSourceCode + "',ms_paststep = ");
|
|
|
sql.Append("ms_paststep || case when " + ifpast + " > 0 then ',' || '" + ifpast + "' end");
|
|
|
ExeSQL.Add(sql.ToString());
|
|
|
//更新完工数量
|