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

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -86,7 +86,7 @@ namespace UAS_MES.Make
                     if (!LogicHandler.GetMakeInfo(sncode.Text, out oMakeCode, out oErrorMessage))
                     {
                         OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red);
-                        OperateResult.AppendText(">>请输入序列号\n", Color.Black,sncode);
+                        OperateResult.AppendText(">>请输入序列号\n", Color.Black, sncode);
                         return;
                     }
                     //调用公共方法CheckStepSNAndMacode判断工序是否正确
@@ -110,12 +110,17 @@ namespace UAS_MES.Make
                                 OperateResult.AppendText("<<工单号：" + ma_code.Text + "\n", Color.Black);
                                 //提示用户“<< 序列号：XXXX”
                                 OperateResult.AppendText("<<序列号：" + sncode.Text + "\n", Color.Black);
+                                if (PrintLabel.SelectedValue == null)
+                                {
+                                    OperateResult.AppendText(">>产品编号:" + ma_prodcode.Text + "未维护机身标签\n", Color.Red, sncode);
+                                    return;
+                                }
                                 if (pr_change)
                                 {
                                     pr_change = false;
                                     if (MessageBox.Show("是否使用默认标签", "提示", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
                                     {
-                                        OperateResult.AppendText(">>请选择标签模板\n", Color.Green);
+                                        OperateResult.AppendText(">>请选择标签模板\n", Color.Green,sncode);
                                         return;
                                     }
                                 }
@@ -132,7 +137,7 @@ namespace UAS_MES.Make
                             //如果打印张数为空，返回
                             if (PrintNum.Text == "" || int.Parse(PrintNum.Text) == 0)
                             {
-                                OperateResult.AppendText(">>打印张数不可空或者为0\n", Color.Red,sncode);
+                                OperateResult.AppendText(">>打印张数不可空或者为0\n", Color.Red, sncode);
                                 //清空输入框的值，聚焦
                                 sncode.Focus();
                                 //提示用户“>>请输入SN”
@@ -145,7 +150,7 @@ namespace UAS_MES.Make
                             //提示用户打印成功
                             OperateResult.AppendText(">>序列号:" + sncode.Text + "打印成功\n", Color.Green);
                             //记录日志
-                            LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode,oMakeCode,User.UserLineCode,User.UserSourceCode, "机身标打印","机身标打印成功", sncode.Text,"");
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "机身标打印", "机身标打印成功", sncode.Text, "");
                             //更新打印的数据
                             LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "机身标打印", "机身标打印成功", User.UserCode, out oErrorMessage);
                             //清空输入框的值，聚焦
@@ -172,17 +177,17 @@ namespace UAS_MES.Make
                         //标签为空
                         else
                         {
-                            OperateResult.AppendText(">>产品编号:" + ma_prodcode.Text + "未维护机身标签\n", Color.Red,sncode);
+                            OperateResult.AppendText(">>产品编号:" + ma_prodcode.Text + "未维护机身标签\n", Color.Red, sncode);
                         }
                     }
                     else
                     {
-                        OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red,sncode);
+                        OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
                     }
                 }
                 else
                 {
-                    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red,sncode);
+                    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
                 }
             }
         }
@@ -191,7 +196,7 @@ namespace UAS_MES.Make
             dt = (DataTable)dh.ExecuteSql("select pl_labelcode ||':'||pl_labelname pl_name,pl_labelname,pl_labelcode, pl_indate,pl_labelurl from productlabel where pl_prodcode='" + ma_prodcode.Text + "'and PL_LABELTYPE='机身标' order by pl_isdefault desc", "select");
             if (dt.Rows.Count == 0)
             {
-                OperateResult.AppendText(">>产品:" + ma_prodcode.Text + "未维护机身标标签模板\n", Color.Red);
+                return;
             }
             PrintLabel.DataSource = dt;
             PrintLabel.DisplayMember = "pl_name";

UAS-MES/FunctionCode/OQC/OQC_BatchResultJudge.cs

@@ -37,7 +37,7 @@ namespace UAS_MES.OQC
         {
             if (CheckStep())
             {
-                DataTable temp = dh.getFieldsDataByCondition("makeserial", new string[] { "nvl(ms_ifrework,0)ms_ifrework", "ms_reworkcheckno" }, "upper(ms_sncode)='" + ms_sncode.Text.ToUpper() + "'");
+                DataTable temp = dh.getFieldsDatasByCondition("makeserial", new string[] { "nvl(ms_ifrework,0)ms_ifrework", "ms_reworkcheckno" }, "upper(ms_sncode)='" + ms_sncode.Text.ToUpper() + "' order by ms_id desc");
                 if (temp.Rows.Count > 0)
                 {
                     if (temp.Rows[0]["ms_ifrework"].ToString() != "0")
@@ -308,47 +308,6 @@ namespace UAS_MES.OQC
             }
         }
 
-        ////记录操作日志
-        //private void DoLog(string Kind, string Result, string Type)
-        //{
-        //    LogicHandler.InsertMessageLog(User.UserName, Kind, Result, "OQCBATCH|ob_id=" + ob_id.Text + "", ob_checkno.Text);
-        //    if (ob_source.Text == "工序")
-        //    {
-        //        //如果是撤销操作则更新回上一工序
-        //        if (Type == "撤销")
-        //        {
-        //            List<string> sql = new List<string>();
-        //            //该序列号的批次数量
-        //            string batchqty = dh.getFieldDataByCondition("oqcbatch", "ob_nowcheckqty", "ob_checkno='" + ob_checkno.Text + "'").ToString();
-        //            //撤销时如果没有下一工序表示工单已经完工了,此时撤销需要将完工数减掉一个批次
-        //            if (dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_sncode='" + ms_sncode.Text + "'").ToString() == "")
-        //            {
-        //                sql.Add("update make set ma_madeqty=ma_madeqty-" + batchqty + " where ma_code='" + ob_makecode.Text + "'");
-        //            }
-        //            //获取上一步执行的工序
-        //            string PastCode = dh.getFieldDataByCondition("makeserial", "SUBSTR(ms_paststep,0,INSTR(ms_paststep,',', -1, 1)-1) ms_paststep", "ms_checkno='" + ob_checkno.Text + "' and ms_status<>3").ToString();
-        //            string[] LastStepCode = PastCode.Split(',');
-        //            sql.Add("update makeserial set ms_paststep=(select distinct SUBSTR(ms_paststep,0,INSTR(ms_paststep,',', -1, 1)-1)  from makeserial where ms_checkno='" + ob_checkno.Text + "' and ms_status<>3 and rownum=1) where ms_checkno='" + ob_checkno.Text + "' and ms_status<>3 ");
-        //            sql.Add("update makeserial set ms_stepcode='" + LastStepCode[LastStepCode.Length - 1] + "',ms_nextstepcode='" + User.CurrentStepCode + "',ms_status=1 where ms_checkno='" + ob_checkno.Text + "'");
-        //            sql.Add("update makecraftdetail set mcd_inqty=mcd_inqty-" + batchqty + ",mcd_outqty = mcd_outqty - " + batchqty + ",mcd_okqty = mcd_okqty -" + batchqty + " where mcd_macode='" + ob_makecode.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
-        //            dh.ExecuteSQLTran(sql.ToArray());
-        //        }
-        //        else if (Type == "通过")
-        //        {
-        //            //更新下一工序
-        //            LogicHandler.UpdateOQCMessage(ms_sncode.Text, ob_checkno.Text, ob_makecode.Text, Kind, User.UserSourceCode, User.UserName, Result, out ErrorMessage);
-        //            sql.Clear();
-        //            sql.Append("insert into MakeProcess(mp_id,mp_makecode,mp_maid, mp_mscode,mp_sncode,mp_stepcode,mp_stepname,");
-        //            sql.Append("mp_craftcode,mp_craftname,mp_kind,mp_result,mp_indate,mp_inman,mp_wccode,mp_linecode,mp_sourcecode,mp_snstatus,mp_sncheckno,mp_snoutboxcode)");
-        //            sql.Append("select MakeProcess_seq.nextval, ma_code,ma_id,ms_code,ms_sncode,st_code,st_name,");
-        //            sql.Append("ma_craftcode,ma_craftname,'" + Kind + "','" + Result + "',sysdate,'" + User.UserCode + "',ma_wccode,'" + User.UserLineCode + "','" + User.UserSourceCode + "',");
-        //            sql.Append("ms_status,ms_checkno,ms_outboxcode from make left join makeserial on ms_makecode=ma_code left join step on st_code=ms_stepcode ");
-        //            sql.Append("where  ms_checkno='" + ob_checkno.Text + "' and st_code='" + User.CurrentStepCode + "'");
-        //            dh.ExecuteSql(sql.GetString(), "insert");
-        //        }
-        //    }
-        //}
-
         private void 抽检批维护_SizeChanged(object sender, EventArgs e)
         {
             asc.controlAutoSize(this);

UAS-MES/FunctionCode/OQC/OQC_CheckNoSplit.cs

@@ -63,41 +63,46 @@ namespace UAS_MES.OQC
                 choosedsn.Text = "0";
                 totalsn.Text = OutBoxDGV.Rows.Count.ToString();
             }
-            else OperateResult.AppendText(">>"+ErrorMessage+"\n", Color.Red);
+            else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
         }
 
         private void SplitCheckNo_Click(object sender, EventArgs e)
         {
             if (choosedsn.Text != "0")
             {
-                if (dh.getFieldDataByCondition("oqcbatch", "ob_status", "ob_checkno='" + ob_checkno.Text + "'").ToString() == "UNCHECK")
+                dt = dh.getFieldsDataByCondition("oqcbatch", new string[] { "ob_status", "ob_makecode" }, "ob_checkno='" + ob_checkno.Text + "'");
+                if (dt.Rows.Count > 0)
                 {
-                    string[] sqls = new string[5];
-                    //插入新批次的主表
-                    string ob_id = dh.GetSEQ("oqcbatch_seq");
-                    sql.Clear();
-                    sql.Append("insert into oqcbatch(ob_id,ob_checkno,ob_indate,ob_checkman,ob_oldcheckno,ob_source,");
-                    sql.Append("ob_batchqty,ob_status,ob_prodcode, ob_sourcecode,ob_reworkcode,ob_orgcheckno,");
-                    sql.Append("OB_CRAFTCODE,OB_STEPCODE,OB_MAKECODE,oB_WCCODE,OB_FACTORY,OB_PROJECTCODE,OB_DESCRIPTION,");
-                    sql.Append("OB_AQLCODE,OB_REMARK) select '" + ob_id + "','" + new_checkno.Text + "',sysdate,'" + User.UserCode + "',");
-                    sql.Append("'" + ob_checkno.Text + "',ob_source,ob_batchqty,ob_status,ob_prodcode, ob_sourcecode,");
-                    sql.Append("ob_reworkcode,ob_orgcheckno,OB_CRAFTCODE, OB_STEPCODE,OB_MAKECODE,oB_WCCODE,OB_FACTORY,");
-                    sql.Append("OB_PROJECTCODE,OB_DESCRIPTION,OB_AQLCODE,OB_REMARK from oqcbatch where ob_checkno='" + ob_checkno.Text + "'");
-                    sqls[0] = sql.GetString();
-                    //插入新批次的从表
-                    sql.Clear();
-                    sql.Append("insert into oqcbatchdetail(OBD_ID,OBD_OBID,OBD_CHECKNO,OBD_SNCODE,obd_outboxcode,OBD_MAKECODE");
-                    sql.Append(",OBD_BUILDDATE,obd_prodcode) SELECT oqcbatchdetail_seq.nextval,'" + ob_id + "','" + new_checkno.Text + "',OBD_SNCODE,obd_outboxcode");
-                    sql.Append(",OBD_MAKECODE,sysdate,obd_prodcode from oqcbatchdetail where obd_checkno='" + ob_checkno.Text + "' and obd_sncode in(" + CheckSn + ")");
-                    sqls[1] = sql.GetString();
-                    sqls[2] = "update OQCBatch set ob_nowcheckqty=(select count(1) from oqcbatchdetail where obd_checkno='" + new_checkno.Text + "') where ob_checkno='" + new_checkno.Text + "'";
-                    sqls[3] = "delete from oqcbatchdetail where obd_checkno='" + ob_checkno.Text + "' and obd_sncode in (" + CheckSn + ")";
-                    sqls[4] = "update OQCBatch set ob_nowcheckqty=(select count(1) from oqcbatchdetail where obd_checkno='" + ob_checkno.Text + "') where ob_checkno='" + ob_checkno.Text + "'";
-                    dh.ExecuteSQLTran(sqls);
-                    GetBatch.PerformClick();
-                    OperateResult.AppendText(">>批次" + ob_checkno.Text + "拆解成功\n ", Color.Green);
+                    string ob_makecode = dt.Rows[0]["ob_makecode"].ToString();
+                    if (dt.Rows[0]["ob_status"].ToString() == "UNCHECK")
+                    {
+                        string[] sqls = new string[5];
+                        //插入新批次的主表
+                        string ob_id = dh.GetSEQ("oqcbatch_seq");
+                        sql.Clear();
+                        sql.Append("insert into oqcbatch(ob_id,ob_checkno,ob_indate,ob_checkman,ob_oldcheckno,ob_source,");
+                        sql.Append("ob_batchqty,ob_status,ob_prodcode, ob_sourcecode,ob_reworkcode,ob_orgcheckno,");
+                        sql.Append("OB_CRAFTCODE,OB_STEPCODE,OB_MAKECODE,oB_WCCODE,OB_FACTORY,OB_PROJECTCODE,OB_DESCRIPTION,");
+                        sql.Append("OB_AQLCODE,OB_REMARK) select '" + ob_id + "','" + new_checkno.Text + "',sysdate,'" + User.UserCode + "',");
+                        sql.Append("'" + ob_checkno.Text + "',ob_source,ob_batchqty,ob_status,ob_prodcode, ob_sourcecode,");
+                        sql.Append("ob_reworkcode,ob_orgcheckno,OB_CRAFTCODE, OB_STEPCODE,OB_MAKECODE,oB_WCCODE,OB_FACTORY,");
+                        sql.Append("OB_PROJECTCODE,OB_DESCRIPTION,OB_AQLCODE,OB_REMARK from oqcbatch where ob_checkno='" + ob_checkno.Text + "'");
+                        sqls[0] = sql.GetString();
+                        //插入新批次的从表
+                        sql.Clear();
+                        sql.Append("insert into oqcbatchdetail(OBD_ID,OBD_OBID,OBD_CHECKNO,OBD_SNCODE,obd_outboxcode,OBD_MAKECODE");
+                        sql.Append(",OBD_BUILDDATE,obd_prodcode) SELECT oqcbatchdetail_seq.nextval,'" + ob_id + "','" + new_checkno.Text + "',OBD_SNCODE,obd_outboxcode");
+                        sql.Append(",OBD_MAKECODE,sysdate,obd_prodcode from oqcbatchdetail where obd_checkno='" + ob_checkno.Text + "' and obd_sncode in(" + CheckSn + ")");
+                        sqls[1] = sql.GetString();
+                        sqls[2] = "update OQCBatch set ob_nowcheckqty=(select count(1) from oqcbatchdetail where obd_checkno='" + new_checkno.Text + "') where ob_checkno='" + new_checkno.Text + "'";
+                        sqls[3] = "delete from oqcbatchdetail where obd_checkno='" + ob_checkno.Text + "' and obd_sncode in (" + CheckSn + ") and obd_makecode='"+ ob_makecode + "'";
+                        sqls[4] = "update OQCBatch set ob_nowcheckqty=(select count(1) from oqcbatchdetail where obd_checkno='" + ob_checkno.Text + "') where ob_checkno='" + ob_checkno.Text + "'";
+                        dh.ExecuteSQLTran(sqls);
+                        GetBatch.PerformClick();
+                        OperateResult.AppendText(">>批次" + ob_checkno.Text + "拆解成功\n ", Color.Green);
+                    }
+                    else OperateResult.AppendText(">>批次状态必须是待检验\n", Color.Red);
                 }
-                else OperateResult.AppendText(">>批次状态必须是待检验\n", Color.Red);
             }
             else OperateResult.AppendText(">>请勾选需要拆解的序列号\n", Color.Red);
         }

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.cs

@@ -70,7 +70,7 @@ namespace UAS_MES.OQC
         {
             if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
             {
-                DataTable temp = dh.getFieldsDataByCondition("makeserial", new string[] { "nvl(ms_ifrework,0)ms_ifrework", "ms_reworkcheckno" }, "upper(ms_sncode)='" + ms_sncode.Text.ToUpper() + "'");
+                DataTable temp = dh.getFieldsDatasByCondition("makeserial", new string[] { "nvl(ms_ifrework,0)ms_ifrework", "ms_reworkcheckno" }, "upper(ms_sncode)='" + ms_sncode.Text.ToUpper() + "' order by ms_id desc");
                 if (temp.Rows.Count > 0)
                 {
                     if (temp.Rows[0]["ms_ifrework"].ToString() != "0")

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.cs

@@ -49,7 +49,7 @@ namespace UAS_MES.OQC
         {
             if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
             {
-                DataTable temp = dh.getFieldsDataByCondition("makeserial", new string[] { "nvl(ms_ifrework,0)ms_ifrework", "ms_reworkcheckno", "ms_reworkstatus" }, "upper(ms_sncode)='" + sncode.Text.ToUpper() + "'");
+                DataTable temp = dh.getFieldsDatasByCondition("makeserial", new string[] { "nvl(ms_ifrework,0)ms_ifrework", "ms_reworkcheckno", "ms_reworkstatus" }, "upper(ms_sncode)='" + sncode.Text.ToUpper() + "' order by ms_id desc");
                 if (temp.Rows.Count > 0)
                 {
                     if (temp.Rows[0]["ms_reworkstatus"].ToString() == "3")