|
|
@@ -41,7 +41,7 @@ namespace BenQGuru.eMES.DLLService
|
|
|
//用于存放批量执行的SQL
|
|
|
List<string> sqls = new List<string>();
|
|
|
//系统默认的的连接字符串
|
|
|
- private string ConnectionStrings = "Data Source=192.168.230.200/orcl;User ID=MES;PassWord=select!#%*(;";
|
|
|
+ private string ConnectionStrings = "Data Source=117.25.180.218/orcl;User ID=MES_TEST;PassWord=select!#%*(;";
|
|
|
//用户选择的数据库的连接字符串
|
|
|
private OracleConnection connection;
|
|
|
//用户选择的数据库的连接字符串
|
|
|
@@ -72,7 +72,7 @@ namespace BenQGuru.eMES.DLLService
|
|
|
string[] ParamName = new string[] { "v_i_macode", "v_i_sourcecode", "v_i_sncode", "v_i_usercode", "v_o_macode", "v_o_msid", "v_o_errmsg" };
|
|
|
CallProcedure("CS_CHECKSTEPSNANDMACODE", ParamName, ref param);
|
|
|
oErrMessage = param[6];
|
|
|
- DataTable dt = (DataTable)ExecuteSql("select ms_status,ms_stepcode,ms_nextstepcode from makeserial where ms_id=(select max(ms_id) from makeserial where ms_sncode='" + iSN + "')", "select");
|
|
|
+ DataTable dt = (DataTable)ExecuteSql("select ms_status,ms_stepcode,ms_nextstepcode from makeserial where ms_id=( select max(ms_id) from makeserial where ms_sncode in ( select '" + iSN + "' from dual union select sn from makesnrelation where beforesn='" + iSN + "' and sn<>' ' union select beforesn from makesnrelation where sn='" + iSN + "' and beforesn<>' '))", "select");
|
|
|
string ms_status = "";
|
|
|
string ms_stepcode = "";
|
|
|
string ms_nextstepcode = "";
|
|
|
@@ -83,6 +83,11 @@ namespace BenQGuru.eMES.DLLService
|
|
|
ms_nextstepcode = dt.Rows[0]["ms_nextstepcode"].ToString();
|
|
|
}
|
|
|
string stepcode = GetStepCodeBySource(iResCode);
|
|
|
+ if (ms_nextstepcode != "" && ms_nextstepcode != stepcode)
|
|
|
+ {
|
|
|
+ oErrMessage = "当前序列号下一工序" + ms_nextstepcode;
|
|
|
+ return false;
|
|
|
+ }
|
|
|
if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null" || (ms_status == "3" && stepcode == ms_stepcode))
|
|
|
{
|
|
|
if (ms_status == "3")
|
|
|
@@ -362,8 +367,8 @@ namespace BenQGuru.eMES.DLLService
|
|
|
}
|
|
|
oErrMessage = "";
|
|
|
sql.Clear();
|
|
|
- sql.Append("select max(ms_id) from makeserial where ms_sncode in (select '" + iSN + "' from dual union select ");
|
|
|
- sql.Append("beforesn from makesnrelation where sn='" + iSN + "' and beforesn<>' ')");
|
|
|
+ sql.Append("select max(ms_id) from makeserial where ms_sncode in (select '" + iSN + "' from dual union select sn from ");
|
|
|
+ sql.Append("makesnrelation where beforesn='" + iSN + "' and sn<>' ' union select beforesn from makesnrelation where sn='" + iSN + "' and beforesn<>' ')");
|
|
|
DataTable dt = (DataTable)ExecuteSql(sql.ToString(), "select");
|
|
|
string ms_id = dt.Rows[0][0].ToString();
|
|
|
oMoCode = getFieldDataByCondition("MakeSerial", "ms_makecode", "ms_id='" + ms_id + "'").ToString();
|
章政