传入工单参数处理

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -43,8 +43,6 @@ namespace UAS_MES.Make
         StringBuilder s1 = new StringBuilder();
         //存放工单中数量
         int ma_qty;
-        //存放第一步查询出来的工单号，判断是否更换了工单
-        string makecode="";
         //存放所有关联信息的类型和录入的值
         Hashtable hs;
         string startNo = "";//起始序列
@@ -96,10 +94,10 @@ namespace UAS_MES.Make
                         {
                             OperateResult.AppendText(">>TSN号" + code.Text + "\n", Color.Black);
                             //核对工序
-                            if (LogicHandler.CheckStepSNAndMacode(makecode, User.UserSourceCode, code.Text, User.UserCode, out oMakecode, out oMsid, out errorMessage))
+                            if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, code.Text, User.UserCode, out oMakecode, out oMsid, out errorMessage))
                             {
                                 //如果用户没有选择工单号
-                                if (ms_macode.Text == "" || ms_macode.Text != makecode)
+                                if (ms_macode.Text == "" || ms_macode.Text != oMakecode)
                                 {
                                     //按照out出的工单号查出工单相关信息，并赋值到相关控件
                                     sql.Clear();

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -81,21 +81,8 @@ namespace UAS_MES.Make
                         //bsncode为空，就说明是输入转换之前的序列号
                         if (bsncode == "")
                         {
-                            ////定义传入方法的变量
-                            //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))
+                            if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsId, out errorMessage))
                             {
                                 //如果用户没有选择工单号
                                 if (ma_code.Text == "" || ma_code.Text != oMakeCode)
@@ -224,54 +211,54 @@ namespace UAS_MES.Make
                             //如果两次输入的序列号相同进行提示，不相同则进行下一步
                             //if (bsncode != sncode.Text)
                             //{
-                                if ((ChangeResult.Checked && dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "' and ms_id='" + oMsId + "'")) || !dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "'")||(!ChangeResult.Checked&&(bsncode==sncode.Text)))
+                            if ((ChangeResult.Checked && dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "' and ms_id='" + oMsId + "'")) || !dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "'") || (!ChangeResult.Checked && (bsncode == sncode.Text)))
+                            {
+                                string firstsn = "";
+                                string updateSql = "";
+                                //勾选了修改转换结果
+                                if (ChangeResult.Checked)
                                 {
-                                    string firstsn = "";
-                                    string updateSql = "";
-                                    //勾选了修改转换结果
-                                    if (ChangeResult.Checked)
-                                    {
-                                        //查询ms_firstsn
-                                        firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_beforesn='" + bsncode + "' and ms_id='" + oMsId + "'").ToString();
-                                        //记录本次修改，存入makesnrelation表中
-                                        updateSql = "update makeserial set ms_sncode='" + sncode.Text + "' where ms_beforesn='" + bsncode + "' and ms_id='" + oMsId + "'";
-                                        //删除最近一条转换记录
-                                        dh.ExecuteSql("delete from makesnrelation where BEFORESN='" + bsncode + "' and makecode='" + oMakeCode + "'", "delete");
-                                    }
-                                    //未勾选修改转换结果
-                                    else
-                                    {
-                                        //查询ms_firstsn
-                                        firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_sncode='" + bsncode + "' and ms_id='" + oMsId + "'").ToString();
-                                        //记录本次修改，存入makesnrelation表中
-                                        updateSql = "update makeserial set ms_sncode='" + sncode.Text + "', ms_beforesn='" + bsncode + "' where ms_sncode='" + bsncode + "' and ms_id='" + oMsId + "'";
-                                    }
-                                    string insertSql = "insert into  makesnrelation (BEFORESN,SN,FIRSTSN,MAKECODE,msr_indate, msr_inman)values('" + bsncode + "','" + sncode.Text + "','" + firstsn + "','" + ma_code.Text + "', sysdate ,'" + User.UserCode + "')";
-                                    dh.ExecuteSQLTran(updateSql, insertSql);
-                                    OperateResult.AppendText(">>转换成功\n", Color.Green);
-                                    //写入日志
-                                    LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "序列转换", "序列转换成功", User.UserCode, out errorMessage);
-                                    //记录日志
-                                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "序列转换", "转换成功", sncode.Text, "");
-                                    LogManager.DoLog("修改序列号：" + bsncode + "为" + sncode.Text + "成功！" + "操作人：" + User.UserCode);
-                                    OperateResult.AppendText(">>请输入TSN号\n", Color.Black);
-                                    //置空
-                                    bsncode = "";
-                                    show_sncode.Text = "";
-                                    //获取剩余数，刷新页面
-                                    sql.Clear();
-                                    sql.Append("select mcd_inqty from makecraftdetail where mcd_macode='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
-                                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                                    if (dt.Rows.Count > 0)
-                                    {
-                                        remain_qty.Text = ma_qty - int.Parse(dt.Rows[0]["mcd_inqty"].ToString()) + "";
-                                    }
-                                    //更新数量
-                                    changenum.Text = int.Parse(changenum.Text) + 1 + "";
-                                    ChangeResult.Enabled = true;
+                                    //查询ms_firstsn
+                                    firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_beforesn='" + bsncode + "' and ms_id='" + oMsId + "'").ToString();
+                                    //记录本次修改，存入makesnrelation表中
+                                    updateSql = "update makeserial set ms_sncode='" + sncode.Text + "' where ms_beforesn='" + bsncode + "' and ms_id='" + oMsId + "'";
+                                    //删除最近一条转换记录
+                                    dh.ExecuteSql("delete from makesnrelation where BEFORESN='" + bsncode + "' and makecode='" + oMakeCode + "'", "delete");
                                 }
+                                //未勾选修改转换结果
                                 else
-                                    OperateResult.AppendText(">>序列号" + sncode.Text + "已存在，请输入其他序列号\n", Color.Red);
+                                {
+                                    //查询ms_firstsn
+                                    firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_sncode='" + bsncode + "' and ms_id='" + oMsId + "'").ToString();
+                                    //记录本次修改，存入makesnrelation表中
+                                    updateSql = "update makeserial set ms_sncode='" + sncode.Text + "', ms_beforesn='" + bsncode + "' where ms_sncode='" + bsncode + "' and ms_id='" + oMsId + "'";
+                                }
+                                string insertSql = "insert into  makesnrelation (BEFORESN,SN,FIRSTSN,MAKECODE,msr_indate, msr_inman)values('" + bsncode + "','" + sncode.Text + "','" + firstsn + "','" + ma_code.Text + "', sysdate ,'" + User.UserCode + "')";
+                                dh.ExecuteSQLTran(updateSql, insertSql);
+                                OperateResult.AppendText(">>转换成功\n", Color.Green);
+                                //写入日志
+                                LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "序列转换", "序列转换成功", User.UserCode, out errorMessage);
+                                //记录日志
+                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "序列转换", "转换成功", sncode.Text, "");
+                                LogManager.DoLog("修改序列号：" + bsncode + "为" + sncode.Text + "成功！" + "操作人：" + User.UserCode);
+                                OperateResult.AppendText(">>请输入TSN号\n", Color.Black);
+                                //置空
+                                bsncode = "";
+                                show_sncode.Text = "";
+                                //获取剩余数，刷新页面
+                                sql.Clear();
+                                sql.Append("select mcd_inqty from makecraftdetail where mcd_macode='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
+                                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                                if (dt.Rows.Count > 0)
+                                {
+                                    remain_qty.Text = ma_qty - int.Parse(dt.Rows[0]["mcd_inqty"].ToString()) + "";
+                                }
+                                //更新数量
+                                changenum.Text = int.Parse(changenum.Text) + 1 + "";
+                                ChangeResult.Enabled = true;
+                            }
+                            else
+                                OperateResult.AppendText(">>序列号" + sncode.Text + "已存在，请输入其他序列号\n", Color.Red);
                             //}
                             //else
                             //{