Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_SeqTransform.Designer.cs

@@ -103,7 +103,7 @@
             this.ChangeResult.AutoSize = true;
             this.ChangeResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ChangeResult.Location = new System.Drawing.Point(543, 772);
-            this.ChangeResult.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.ChangeResult.Margin = new System.Windows.Forms.Padding(5);
             this.ChangeResult.Name = "ChangeResult";
             this.ChangeResult.Size = new System.Drawing.Size(209, 40);
             this.ChangeResult.TabIndex = 70;
@@ -196,7 +196,7 @@
             this.ma_code.Size = new System.Drawing.Size(298, 37);
             this.ma_code.TabIndex = 92;
             this.ma_code.TableName = null;
-            this.ma_code.TextBoxEnable = false;
+            this.ma_code.TextBoxEnable = true;
             this.ma_code.UserControlTextChanged += new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox.OnTextChange(this.ms_makecode_UserControlTextChanged);
             // 
             // changenum
@@ -394,7 +394,7 @@
             this.Controls.Add(this.pr_detail_label);
             this.Controls.Add(this.ma_prodcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Margin = new System.Windows.Forms.Padding(5);
             this.Name = "Make_SeqTransform";
             this.Tag = "Make!SeqTransform";
             this.Text = " ";

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -50,149 +50,146 @@ namespace UAS_MES.Make
             {
                 if (sncode.Text != "")
                 {
-                    if (LogicHandler.CheckStepAttribute(Tag.ToString(),User.UserSourceCode,out errorMessage))
+                    if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out errorMessage))
                     {
                         OperateResult.AppendText(">>序列号：" + sncode.Text + " , 发送请求\n", Color.Green);
                         //如果用户没有输入工单号自行去后台查询
-                        string macode;
-                        //如果用户填写了工单号 
-                        if (ma_code.Text != "")
+                        //通过工单序列号关系验证
+                        //bsncode为空，就说明是输入转换之前的序列号
+                        if (bsncode == "")
                         {
-                            macode = ma_code.Text;
-                            //通过工单序列号关系验证
-                            //bsncode为空，就说明是输入转换之前的序列号
-                            if (bsncode == "")
+                            //定义传入方法的变量
+                            string oMakeCode = "";
+                            string oMsId = "";
+                            //用户填写了工单号，那么序列号必须要是该工单的，否则提示错误
+                            if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsId, out errorMessage))
                             {
-                                //定义传入方法的变量
-                                string oMakeCode = "";
-                                string oMsId = "";
-                                //用户填写了工单号，那么序列号必须要是该工单的，否则提示错误
-                                if (LogicHandler.CheckStepSNAndMacode(macode, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsId, out errorMessage))
-                                {
-                                    //判断用户是否锁定输入转换前序列号长度，
-                                    if (!checkLengthOrPre(beforeTransSNLength_checkBox, beforeTransSNLength, "长度"))
-                                        return;
-                                    //判断用户是否锁定输入转换前序列号前缀，
-                                    if (!checkLengthOrPre(beforeTransSNPre_checkBox, beforeTransSNPre, "前缀"))
-                                        return;
-                                    switch (ChangeResult.CheckState)
+                                //如果用户没有选择工单号
+                                if (ma_code.Text=="") {
+                                    dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,pr_detail,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "'", "select");
+                                    if (dt.Rows.Count > 0)
                                     {
-                                        //勾选是修改已转换的序列，矫正修改错了的序列号
-                                        case CheckState.Checked:
-                                            if (dh.CheckExist("MakeSerial", "ms_beforesn='" + sncode.Text + "'"))
-                                            {
-                                                bsncode = sncode.Text;
-                                                sncode.Text = "";
-                                                OperateResult.AppendText("<<请输入转换后的序列号\n", Color.Green);
-                                            }
-                                            else
-                                            {
-                                                OperateResult.AppendText(">>不存在该已转序列号\n" + sncode.Text + "\n");
-                                                sncode.Text = "";
-                                                OperateResult.AppendText("<<请重新输入序列号\n", Color.Green);
-                                            }
-                                            break;
-                                        case CheckState.Unchecked:
-
-                                            string beforesn = dh.getFieldDataByCondition("makeserial", "ms_beforesn", "ms_sncode='" + sncode.Text + "'").ToString().Trim();
-                                            //为空，就说明，没有进行过序列号的转换
-                                            if (beforesn == "" || beforesn == null)
-                                            {
-                                                //记录转换前的序列号
-                                                bsncode = sncode.Text;
-                                                sncode.Text = "";
-                                                OperateResult.AppendText("<<请输入转换后的序列号\n", Color.Green);
-                                            }
-                                            else
-                                            //不为空，进行过转换。不勾选修改结果，就不能再修改
-                                            {
-                                                OperateResult.AppendText(">>序列号" + sncode.Text + "已进行了转换\n", Color.Red);
-                                                sncode.Text = "";
-                                                OperateResult.AppendText("<<请重新输入序列号\n", Color.Green);
-                                            }
-                                            break;
-                                        default:
-                                            break;
+                                        BaseUtil.SetFormValue(this.Controls, dt);
+                                        ms_makecode_lock.Checked = true;
                                     }
                                 }
-                                else {
-                                    OperateResult.AppendText(">>" + errorMessage + "\n", Color.Red);
-                                    sncode.Text = "";
-                                }
-                            }
-                            //bsncode不为空,说明输入的是转换后的序列号
-                            else
-                            {
-                                //判断用户是否锁定输入转换后序列号长度，
-                                if (!checkLengthOrPre(afterTransSNLength_checkBox, afterTransSNLength, "长度"))
+                                //判断用户是否锁定输入转换前序列号长度，
+                                if (!checkLengthOrPre(beforeTransSNLength_checkBox, beforeTransSNLength, "长度"))
                                     return;
-                                //判断用户是否锁定输入转换后序列号前缀，
-                                if (!checkLengthOrPre(afterTransSNPre_checkBox, afterTransSNPre, "前缀"))
+                                //判断用户是否锁定输入转换前序列号前缀，
+                                if (!checkLengthOrPre(beforeTransSNPre_checkBox, beforeTransSNPre, "前缀"))
                                     return;
-                                //如果两次输入的序列号相同进行提示，不相同则进行下一步
-                                if (bsncode != sncode.Text)
+                                switch (ChangeResult.CheckState)
                                 {
-                                    //勾选了修改转换结果
-                                    if (ChangeResult.Checked)
-                                    {
-                                        if (!dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "'"))
+                                    //勾选是修改已转换的序列，矫正修改错了的序列号
+                                    case CheckState.Checked:
+                                        if (dh.CheckExist("MakeSerial", "ms_beforesn='" + sncode.Text + "'"))
                                         {
-                                            //查询ms_firstsn
-                                            string firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_beforesn='" + bsncode + "'").ToString();
-                                            //记录本次修改，存入makesnrelation表中
-                                            string updateSql = "update makeserial set ms_sncode='" + sncode.Text + "' where ms_beforesn='" + bsncode + "'";
-                                            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(">>转换成功");
-                                            //写入日志
-                                            LogManager.DoLog("修改序列号：" + bsncode + "为" + sncode.Text + "成功！" + "操作人：" + User.UserCode);
-                                            OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Green);
-                                            //置空
-                                            bsncode = "";
-                                            //更新数量
-                                            changenum.Text = int.Parse(changenum.Text) + 1 + "";
+                                            bsncode = sncode.Text;
+                                            sncode.Text = "";
+                                            OperateResult.AppendText("<<请输入转换后的序列号\n", Color.Green);
                                         }
                                         else
-                                            OperateResult.AppendText(">>序列号" + sncode.Text + "已存在，请输入其他序列号\n", Color.Red);
-                                    }
-                                    //未勾选修改转换结果
-                                    else
-                                    {
-                                        if (!dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "'"))
                                         {
-                                            //查询ms_firstsn
-                                            string firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_sncode='" + bsncode + "'").ToString();
-                                            //记录本次修改，存入makesnrelation表中
-                                            string updateSql = "update makeserial set ms_sncode='" + sncode.Text + "', ms_beforesn='" + bsncode + "' where ms_sncode='" + bsncode + "'";
-                                            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);
-                                            //写入日志
-                                            LogManager.DoLog("修改序列号：" + bsncode + "为" + sncode.Text + "成功！" + "操作人：" + User.UserCode);
-                                            OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Green);
-                                            //置空
-                                            bsncode = "";
-                                            //更新数量
-                                            changenum.Text = int.Parse(changenum.Text) + 1 + "";
+                                            OperateResult.AppendText(">>不存在该已转序列号\n" + sncode.Text + "\n");
+                                            sncode.Text = "";
+                                            OperateResult.AppendText("<<请重新输入序列号\n", Color.Green);
+                                        }
+                                        break;
+                                    case CheckState.Unchecked:
+
+                                        string beforesn = dh.getFieldDataByCondition("makeserial", "ms_beforesn", "ms_sncode='" + sncode.Text + "'").ToString().Trim();
+                                        //为空，就说明，没有进行过序列号的转换
+                                        if (beforesn == "" || beforesn == null)
+                                        {
+                                            //记录转换前的序列号
+                                            bsncode = sncode.Text;
+                                            sncode.Text = "";
+                                            OperateResult.AppendText("<<请输入转换后的序列号\n", Color.Green);
                                         }
                                         else
-                                            OperateResult.AppendText(">>序列号" + sncode.Text + "已存在，请输入其他序列号\n", Color.Red);
-                                    }
+                                        //不为空，进行过转换。不勾选修改结果，就不能再修改
+                                        {
+                                            OperateResult.AppendText(">>序列号" + sncode.Text + "已进行了转换\n", Color.Red);
+                                            sncode.Text = "";
+                                            OperateResult.AppendText("<<请重新输入序列号\n", Color.Green);
+                                        }
+                                        break;
+                                    default:
+                                        break;
                                 }
-                                else
-                                    OperateResult.AppendText(">>相同序列号不能进行转换\n", Color.Red);
+                            }
+                            else
+                            {
+                                OperateResult.AppendText(">>" + errorMessage + "\n", Color.Red);
+                                sncode.Text = "";
                             }
                         }
+                        //bsncode不为空,说明输入的是转换后的序列号
                         else
                         {
-                            macode = dh.getFieldDataByCondition("makeserial", "ms_makecode", "ms_sncode='" + sncode.Text + "' or ms_beforesn='" + sncode.Text + "'").ToString();
-                            if (macode == "")
+                            //判断用户是否锁定输入转换后序列号长度，
+                            if (!checkLengthOrPre(afterTransSNLength_checkBox, afterTransSNLength, "长度"))
+                                return;
+                            //判断用户是否锁定输入转换后序列号前缀，
+                            if (!checkLengthOrPre(afterTransSNPre_checkBox, afterTransSNPre, "前缀"))
+                                return;
+                            //如果两次输入的序列号相同进行提示，不相同则进行下一步
+                            if (bsncode != sncode.Text)
                             {
-                                OperateResult.AppendText(">>无该序列号对应工单！\n", Color.Red);
+                                //勾选了修改转换结果
+                                if (ChangeResult.Checked)
+                                {
+                                    if (!dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "'"))
+                                    {
+                                        //查询ms_firstsn
+                                        string firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_beforesn='" + bsncode + "'").ToString();
+                                        //记录本次修改，存入makesnrelation表中
+                                        string updateSql = "update makeserial set ms_sncode='" + sncode.Text + "' where ms_beforesn='" + bsncode + "'";
+                                        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(">>转换成功");
+                                        //写入日志
+                                        LogManager.DoLog("修改序列号：" + bsncode + "为" + sncode.Text + "成功！" + "操作人：" + User.UserCode);
+                                        OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Green);
+                                        //置空
+                                        bsncode = "";
+                                        //更新数量
+                                        changenum.Text = int.Parse(changenum.Text) + 1 + "";
+                                    }
+                                    else
+                                        OperateResult.AppendText(">>序列号" + sncode.Text + "已存在，请输入其他序列号\n", Color.Red);
+                                }
+                                //未勾选修改转换结果
+                                else
+                                {
+                                    if (!dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "'"))
+                                    {
+                                        //查询ms_firstsn
+                                        string firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_sncode='" + bsncode + "'").ToString();
+                                        //记录本次修改，存入makesnrelation表中
+                                        string updateSql = "update makeserial set ms_sncode='" + sncode.Text + "', ms_beforesn='" + bsncode + "' where ms_sncode='" + bsncode + "'";
+                                        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);
+                                        //写入日志
+                                        LogManager.DoLog("修改序列号：" + bsncode + "为" + sncode.Text + "成功！" + "操作人：" + User.UserCode);
+                                        OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Green);
+                                        //置空
+                                        bsncode = "";
+                                        //更新数量
+                                        changenum.Text = int.Parse(changenum.Text) + 1 + "";
+                                    }
+                                    else
+                                        OperateResult.AppendText(">>序列号" + sncode.Text + "已存在，请输入其他序列号\n", Color.Red);
+                                }
                             }
+                            else
+                                OperateResult.AppendText(">>相同序列号不能进行转换\n", Color.Red);
                         }
                     }
-                    else {
+                    else
+                    {
                         OperateResult.AppendText(">>" + errorMessage + "\n", Color.Red);
                         sncode.Text = "";
                     }

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.cs

@@ -83,7 +83,7 @@ namespace UAS_MES.OQC
                 GetBatch.PerformClick();
                 if (CheckSnCode())
                 {
-                    dt = (DataTable)dh.ExecuteSql("select or_id,or_badcode bc_code, or_description bc_name from OQCNGReason where or_checkno='" + ob_checkno.Text + "' and or_sncode='" + sncode.Text + "'", "select");
+                    dt = (DataTable)dh.ExecuteSql("select or_id,or_badcode bc_code,or_description bc_name,or_bgcode bg_code from OQCNGReason where or_checkno='" + ob_checkno.Text + "' and or_sncode='" + sncode.Text + "'", "select");
                     BaseUtil.FillDgvWithDataTable(ChoosedDGV, dt);
                     GetBatchTypeGridData();
                 }
@@ -270,7 +270,7 @@ namespace UAS_MES.OQC
                             sql.Clear();
                             sql.Append("insert into OQCNGReason(or_id, or_checkno, or_makecode, or_sncode, or_badcode, or_description, or_remark,or_bgcode)");
                             sql.Append("values (OQCNGReason_seq.nextval,'" + ob_checkno.Text + "','" + ob_makecode.Text + "','" + sncode.Text + "',:a,:b,'" + ob_remark.Text + "',:c)");
-                            dh.BatchInsert(sql.GetString(), new string[] { "a", "b","c" }, bc_code.ToArray(), bc_name.ToArray(), bg_code.ToArray());
+                            dh.BatchInsert(sql.GetString(), new string[] { "a", "b", "c" }, bc_code.ToArray(), bc_name.ToArray(), bg_code.ToArray());
                         }
                         //更新项目编号中的抽检数、不合格数，根据采样项目记录
                         sql.Clear();
@@ -378,12 +378,26 @@ namespace UAS_MES.OQC
 
         private void ChooseedReject_Click(object sender, EventArgs e)
         {
-            DataTable dt = (DataTable)WaitChooseDGV.DataSource;
-            dt = BaseUtil.filterDataTable(dt, "ChooseAll<>0");
-            if (dt.Rows.Count > 0)
+            DataTable wait = BaseUtil.filterDataTable((DataTable)WaitChooseDGV.DataSource, "ChooseAll<>0");
+            DataTable choose = (ChoosedDGV.DataSource as DataTable);
+            List<string> Chooseed = new List<string>();
+            for (int i = 0; i < choose.Rows.Count; i++)
             {
-                (ChoosedDGV.DataSource as DataTable).Merge(dt);
-                //BaseUtil.FillDgvWithDataTable(ChoosedDGV, dt);
+                Chooseed.Add(choose.Rows[i]["bc_code"].ToString());
+            }
+            if (wait.Rows.Count > 0)
+            {
+                for (int i = 0; i < wait.Rows.Count; i++)
+                {
+                    if (!Chooseed.Contains( wait.Rows[i]["bc_code"].ToString()))
+                    {
+                        DataRow dr1 = choose.NewRow();
+                        dr1["bc_code"] = wait.Rows[i]["bc_code"];
+                        dr1["bc_name"] = wait.Rows[i]["bc_name"];
+                        dr1["bg_code"] = wait.Rows[i]["bg_code"];
+                        choose.Rows.Add(dr1);
+                    }
+                }
             }
             else OperateResult.AppendText(">>请勾选不良明细\n", Color.Red);
         }