|
|
@@ -81,15 +81,19 @@ namespace UAS_MES.Make
|
|
|
//bsncode为空，就说明是输入转换之前的序列号
|
|
|
if (bsncode == "")
|
|
|
{
|
|
|
- //定义传入方法的变量
|
|
|
- string ms_id = dh.getFieldDataByCondition("MakeSerial", "max(ms_id) ms_id", "ms_sncode='" + sncode.Text + "' or ms_firstsn in (select firstsn from makesnrelation where beforesn='" + sncode.Text + "')").ToString();
|
|
|
- oMakeCode = dh.getFieldDataByCondition("MakeSerial", "ms_makecode", "ms_id='" + ms_id + "'").ToString();
|
|
|
- if (oMakeCode == "")
|
|
|
- {
|
|
|
- OperateResult.AppendText(">>序列号:" + sncode.Text + "未归属工单\n", Color.Red);
|
|
|
- OperateResult.AppendText(">>请输入TSN号\n", Color.Black, sncode);
|
|
|
- return;
|
|
|
- }
|
|
|
+ ////定义传入方法的变量
|
|
|
+ //sql.Clear();
|
|
|
+ //sql.Append("select max(ms_id),ms_makecode from makeserial where ms_sncode='' or ms_firstsn in ");
|
|
|
+ //sql.Append("(select firstsn from makesnrelation where beforesn='" + sncode.Text + "')");
|
|
|
+ //dt = (DataTable)dh.ExecuteSql(sql.GetString(),"");
|
|
|
+ //string ms_id = dh.getFieldDataByCondition("MakeSerial", "max(ms_id) ms_id", "ms_sncode='" + sncode.Text + "' or ms_firstsn in (select firstsn from makesnrelation where beforesn='" + sncode.Text + "')").ToString();
|
|
|
+ //oMakeCode = dh.getFieldDataByCondition("MakeSerial", "ms_makecode", "ms_id='" + ms_id + "'").ToString();
|
|
|
+ //if (oMakeCode == "")
|
|
|
+ //{
|
|
|
+ // OperateResult.AppendText(">>序列号:" + sncode.Text + "未归属工单\n", Color.Red);
|
|
|
+ // OperateResult.AppendText(">>请输入TSN号\n", Color.Black, sncode);
|
|
|
+ // return;
|
|
|
+ //}
|
|
|
//用户填写了工单号，那么序列号必须要是该工单的，否则提示错误
|
|
|
if (LogicHandler.CheckStepSNAndMacode(oMakeCode, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsId, out errorMessage))
|
|
|
{
|
章政