特殊报表导出修改

UAS_MES_LGDZ/DataOperate/ExcelHandler.cs

@@ -159,7 +159,7 @@ namespace UAS_MES_NEW.DataOperate
                     sheet1.AddMergedRegion(cellRangeAddress10);
                     row4.CreateCell(0); row4.CreateCell(1); row4.Cells[0].SetCellValue("程序名称");
                     row4.Cells[0].CellStyle = style; row4.Cells[1].CellStyle = style;
-                    row4.CreateCell(2); row4.CreateCell(3); row4.Cells[2].SetCellValue(DataTable.Rows[i]["STF_CODE"].ToString() + "");
+                    row4.CreateCell(2); row4.CreateCell(3); row4.Cells[2].SetCellValue(machinename);
                     row4.Cells[2].CellStyle = style; row4.Cells[3].CellStyle = style;
                     row4.CreateCell(4); row4.CreateCell(5); row4.Cells[4].SetCellValue("面别:    "+ tableab + "");
                     row4.Cells[4].CellStyle = style; row4.Cells[5].CellStyle = style;
@@ -192,9 +192,9 @@ namespace UAS_MES_NEW.DataOperate
                     sheet1.AddMergedRegion(cellRangeAddress17);
                     sheet1.AddMergedRegion(cellRangeAddress18);
                     sheet1.AddMergedRegion(cellRangeAddress19);
-                    row6.CreateCell(0); row6.CreateCell(1); row6.Cells[0].SetCellValue("制作:"+ mademan);
+                    row6.CreateCell(0); row6.CreateCell(1); row6.Cells[0].SetCellValue("制作:" );
                     row6.Cells[0].CellStyle = style; row6.Cells[1].CellStyle = style;
-                    row6.CreateCell(2); row6.CreateCell(3); row6.Cells[2].SetCellValue(User.CurrentStepName);
+                    row6.CreateCell(2); row6.CreateCell(3); row6.Cells[2].SetCellValue(mademan);
                     row6.Cells[2].CellStyle = style; row6.Cells[3].CellStyle = style;
                     row6.CreateCell(4); row6.CreateCell(5); row6.Cells[4].SetCellValue("QA审核:");
                     row6.Cells[4].CellStyle = style; row6.Cells[5].CellStyle = style;

UAS_MES_LGDZ/FunctionCode/Make/Make_ColorBoxLabelPrint_WN.cs

@@ -20,12 +20,12 @@ namespace UAS_MES_NEW.Make
         DataTable dt;
         LogStringBuilder sql = new LogStringBuilder();
         AutoSizeFormClass asc = new AutoSizeFormClass();
-        //保存StepProduct查询出来的数据
+        // Save StepProduct query data
         DataTable ListA = new DataTable();
-        //制造单号
+        // Manufacturing order number
         string macode;
-        //当前提示的索引
-        //保存TSN编号
+        // Current prompt index
+        // Save TSN number
         string ms_id = null;
 
         string PR_CHECKCARTONW = "0";
@@ -49,20 +49,20 @@ namespace UAS_MES_NEW.Make
             sncode.Focus();
             asc.controllInitializeSize(this);
             InitPrint = new Thread(InPrint);
-            SetLoadingWindow stw = new SetLoadingWindow(InitPrint, "初始化打印程序");
+            SetLoadingWindow stw = new SetLoadingWindow(InitPrint, "Initializing print program");
             BaseUtil.SetFormCenter(stw);
             stw.ShowDialog();
-            //设置锁定工单
+            // Set locked work order
             LockMakeCode.GetMakeCodeCtl(ma_code);
             ma_code.SetLockCheckBox(LockMakeCode);
-            //工单号放大镜配置
+            // Work order number magnifier configuration
             ma_code.TableName = "make left join product on ma_prodcode=pr_code";
-            ma_code.SelectField = "ma_code # 工单号,pr_code # 产品编号,pr_detail # 产品名称";
+            ma_code.SelectField = "ma_code # Work Order,pr_code # Product Code,pr_detail # Product Name";
             ma_code.FormName = Name;
             ma_code.SetValueField = new string[] { "ma_code", "pr_code", "pr_detail" };
             ma_code.Condition = "ma_statuscode='STARTED'";
             ma_code.DbChange += Ma_code_DbChange;
-            OperateResult.AppendText(">>请输入TSN\n", Color.Black);
+            OperateResult.AppendText(">>Please enter TSN\n", Color.Black);
             dh = SystemInf.dh;
             StepCount.StepCode = User.CurrentStepCode;
             StepCount.Source = User.UserSourceCode;
@@ -75,7 +75,7 @@ namespace UAS_MES_NEW.Make
         {
             Dbfind = ma_code.ReturnData;
             BaseUtil.SetFormValue(this.Controls, Dbfind);
-            //获取工单的其他信息
+            // Get other information of the work order
             sql.Clear();
             sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode as pr_code ,pr_detail,");
             sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on ");
@@ -95,7 +95,7 @@ namespace UAS_MES_NEW.Make
             }
             catch (Exception)
             {
-                OperateResult.AppendText("未正确安装BarTender软件\n", Color.Red);
+                OperateResult.AppendText("BarTender software is not installed correctly\n", Color.Red);
             }
         }
 
@@ -107,8 +107,8 @@ namespace UAS_MES_NEW.Make
                 {
                     if (sncode.Text == "")
                     {
-                        OperateResult.AppendText(">>TSN不能为空\n", Color.Red);
-                        OperateResult.AppendText(">>请输入TSN\n", Color.Black);
+                        OperateResult.AppendText(">>TSN cannot be empty\n", Color.Red);
+                        OperateResult.AppendText(">>Please enter TSN\n", Color.Black);
                         return;
                     }
                     OperateResult.AppendText(">>" + sncode.Text + "\n", Color.Black);
@@ -119,19 +119,19 @@ namespace UAS_MES_NEW.Make
                     {
                         ms_id = dt.Rows[0][0].ToString();
                         sncode.Focus();
-                        OperateResult.AppendText(">>请输入SN\n", Color.Black, sncode);
+                        OperateResult.AppendText(">>Please enter SN\n", Color.Black, sncode);
                         return;
                     }
                     else
                     {
-                        OperateResult.AppendText(">>TSN" + sncode.Text + "错误,不存在\n", Color.Red, sncode);
-                        OperateResult.AppendText(">>请输入TSN\n", Color.Black);
+                        OperateResult.AppendText(">>TSN" + sncode.Text + "is incorrect, does not exist\n", Color.Red, sncode);
+                        OperateResult.AppendText(">>Please enter TSN\n", Color.Black);
                         return;
                     }
                 }
                 if (sncode.Text == "")
                 {
-                    OperateResult.AppendText(">>序列号不能为空\n", Color.Red);
+                    OperateResult.AppendText(">>Serial number cannot be empty\n", Color.Red);
                     return;
                 }
                 OperateResult.AppendText(">>" + sncode.Text + "\n", Color.Black);
@@ -142,12 +142,12 @@ namespace UAS_MES_NEW.Make
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     if (dt.Rows.Count > 0)
                     {
-                        OperateResult.AppendText(">>TSN和SN一致\n", Color.Green);
+                        OperateResult.AppendText(">>TSN and SN match\n", Color.Green);
                     }
                     else
                     {
-                        OperateResult.AppendText(">>TSN和SN不一致\n", Color.Red, sncode);
-                        OperateResult.AppendText(">>请输入TSN\n", Color.Black);
+                        OperateResult.AppendText(">>TSN and SN do not match\n", Color.Red, sncode);
+                        OperateResult.AppendText(">>Please enter TSN\n", Color.Black);
                         ms_id = null;
                         return;
                     }
@@ -157,8 +157,8 @@ namespace UAS_MES_NEW.Make
                 string oMakeCode;
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
                 {
-                    //判断界面工单是否为空时的序列号是否自动归属工单
-                    // 获取工单归属工单下一工序是否正确
+                    // Check if the serial number automatically belongs to the work order when the work order is empty
+                    // Check if the next process of the work order is correct
                     string status = "";
                     dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_code='" + sncode.Text + "' or ms_imei1='" + sncode.Text + "' order by ms_id desc", "select");
                     if (dt.Rows.Count > 0)
@@ -196,15 +196,15 @@ namespace UAS_MES_NEW.Make
                         if (nextstepcode != User.CurrentStepCode)
                         {
                             string stname = dh.getFieldDataByCondition("step", "st_name", "st_code='" + nextstepcode + "'").ToString();
-                            OperateResult.AppendText("<<序列号:" + sncode.Text + "下一工序是" + stname + ",不是当前岗位的工序\n", Color.Red, sncode);
+                            OperateResult.AppendText("<<Serial number:" + sncode.Text + "next process is" + stname + ", not the current process\n", Color.Red, sncode);
                             return;
                         }
                         if (locksalecode.Checked && ma_code.Text != "" && ma_code.Text != oMakeCode)
                         {
-                            OperateResult.AppendText(">>序列号" + sncode.Text + "所属工单号" + oMakeCode + "与界面工单号" + ma_code.Text + "不同,无法采集\n", Color.Red, sncode);
+                            OperateResult.AppendText(">>Serial number" + sncode.Text + "belongs to work order" + oMakeCode + "which is different from the interface work order" + ma_code.Text + ", cannot collect\n", Color.Red, sncode);
                             return;
                         }
-                        //获取工单的其他信息
+                        // Get other information of the work order
                         sql.Clear();
                         sql.Append("select ma_code,nvl(ma_unlimitin,0)ma_unlimitin,pr_code,pr_detail,pr_spec from  ");
                         sql.Append("make left join product on pr_code=ma_prodcode where ma_code='" + oMakeCode + "'");
@@ -214,21 +214,21 @@ namespace UAS_MES_NEW.Make
                             PR_CHECKCARTONW = dh.getFieldDataByCondition("craftdetail left join craft on cr_id=cd_crid left join makeserial on ms_craftcode =cr_code and cr_prodcode = ms_prodcode", "nvl(cd_ifweigh,'0') cd_ifweigh", "ms_sncode='" + sncode.Text + "' and ms_makecode='" + oMakeCode + "' and cd_stepcode = '" + User.CurrentStepCode + "'").ToString();
                             if (PR_CHECKCARTONW != "0")
                             {
-                                OperateResult.AppendText(">>彩盒" + sncode.Text + "当前处于称重工序，无法在此界面采集，需去彩盒称重界面进行采集\n", Color.Black, sncode);
+                                OperateResult.AppendText(">>Color box" + sncode.Text + "is currently in the weighing process, cannot be collected in this interface, please go to the color box weighing interface for collection\n", Color.Black, sncode);
                                 return;
                             }
                             BaseUtil.SetFormValue(this.Controls, dt);
                             LockMakeCode.Checked = true;
-                            //提示用户“<<工单号：取ma_makecode”
-                            OperateResult.AppendText("<<工单号：" + ma_code.Text + "\n", Color.Black);
-                            //提示用户“<< 序列号：XXXX”
-                            OperateResult.AppendText("<<序列号：" + sncode.Text + "\n", Color.Black);
+                            // Prompt user "<<Work order: take ma_makecode"
+                            OperateResult.AppendText("<<Work order:" + ma_code.Text + "\n", Color.Black);
+                            // Prompt user "<< Serial number: XXXX"
+                            OperateResult.AppendText("<<Serial number:" + sncode.Text + "\n", Color.Black);
                             if (pr_change)
                             {
-                                String dialog = MessageBox.Show("是否使用当前标签模板", "提示", MessageBoxButtons.OKCancel).ToString();
+                                String dialog = MessageBox.Show("Do you want to use the current label template?", "Prompt", MessageBoxButtons.OKCancel).ToString();
                                 if (dialog != "OK")
                                 {
-                                    OperateResult.AppendText(">>请重新选择标签模板\n", Color.Green);
+                                    OperateResult.AppendText(">>Please reselect the label template\n", Color.Green);
                                     return;
                                 }
                                 else pr_change = false;
@@ -236,42 +236,42 @@ namespace UAS_MES_NEW.Make
                         }
                         else
                         {
-                            OperateResult.AppendText(">>无序列号" + sncode.Text + "对应工单信息\n", Color.Red, sncode);
+                            OperateResult.AppendText(">>No serial number" + sncode.Text + "corresponding work order information\n", Color.Red, sncode);
                             sncode.Focus();
                             return;
                         }
                         //if (int.Parse(mcd_remainqty.Text) <= 0 && dt.Rows[0]["ma_unlimitin"].ToString() == "0")
                         //{
                         //    macode = ma_code.Text;
-                        //    ErrorMessage = "工单" + macode + "打印结束\n>请输入SN";
+                        //    ErrorMessage = "Work order" + macode + "print completed\n>Please enter SN";
                         //    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
                         //    sncode.Focus();
                         //}
                         //else
                         //{
-                        //所选标签不为空
+                        // Selected label is not empty
                         if (PrintLabel.SelectedValue != null)
                         {
-                            //如果打印张数为空，返回
+                            // If the number of prints is empty, return
                             if (PrintNum.Text == "" || int.Parse(PrintNum.Text) == 0)
                             {
-                                OperateResult.AppendText(">>打印张数不可空或者为0\n", Color.Red, sncode);
-                                //清空输入框的值，聚焦
+                                OperateResult.AppendText(">>Number of prints cannot be empty or 0\n", Color.Red, sncode);
+                                // Clear the input box value, focus
                                 sncode.Focus();
-                                //提示用户“>>请输入SN”
-                                OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                                // Prompt user ">>Please enter SN"
+                                OperateResult.AppendText(">>Please enter SN\n", Color.Black);
                                 return;
                             }
-                            //更新至下一步工序
-                            if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, sncode.Text, "彩盒打印", "彩盒打印成功", User.UserCode, out ErrorMessage))
+                            // Update to the next process
+                            if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, sncode.Text, "Color box print", "Color box print successful", User.UserCode, out ErrorMessage))
                             {
-                                //提示正确返回时传递的信息
+                                // Prompt correct return information
                                 if (ErrorMessage.Contains("AFTERSUCCESS"))
                                     OperateResult.AppendText(">>" + ErrorMessage + "\n");
-                                if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, pr_code.Text, "彩盒标", "0", out ErrorMessage))
+                                if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, pr_code.Text, "Color box label", "0", out ErrorMessage))
                                 {
-                                    //提示用户打印成功
-                                    OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);
+                                    // Prompt user print successful
+                                    OperateResult.AppendText(">>Serial number:" + sncode.Text + "print completed\n", Color.Green);
                                 }
                                 else
                                 {
@@ -279,9 +279,9 @@ namespace UAS_MES_NEW.Make
                                 }
                                 if (PrintSecond.Checked)
                                 {
-                                    if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel1.Text, PrintLabel1.SelectedValue.ToString(), PrintList1.Text, sncode.Text, int.Parse(PrintNum1.Text), oMakeCode, pr_code.Text, "彩盒标", "0", out ErrorMessage))
+                                    if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel1.Text, PrintLabel1.SelectedValue.ToString(), PrintList1.Text, sncode.Text, int.Parse(PrintNum1.Text), oMakeCode, pr_code.Text, "Color box label", "0", out ErrorMessage))
                                     {
-                                        OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);
+                                        OperateResult.AppendText(">>Serial number:" + sncode.Text + "print completed\n", Color.Green);
                                     }
                                     else
                                     {
@@ -292,8 +292,8 @@ namespace UAS_MES_NEW.Make
                                 {
                                     LogicHandler.CollectRemarkInf(sncode.Text, "", "", oMakeCode, pr_code.Text, Remark.Text);
                                 }
-                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒打印", "彩盒打印成功", sncode.Text, "");
-                                //刷新打印数量和剩余数量
+                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "Color box print", "Color box print successful", sncode.Text, "");
+                                // Refresh print quantity and remaining quantity
                                 dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty,mcd_okqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
                                 BaseUtil.SetFormValue(Controls, dt);
                                 sncode.Text = "";
@@ -309,16 +309,16 @@ namespace UAS_MES_NEW.Make
                         }
                         else
                         {
-                            OperateResult.AppendText(">>产品编号:" + pr_code.Text + "未维护彩盒标签\n", Color.Red, sncode);
+                            OperateResult.AppendText(">>Product code:" + pr_code.Text + "has no color box label maintained\n", Color.Red, sncode);
                             return;
                         }
                         if (CheckTSN.Checked == true)
                         {
-                            OperateResult.AppendText(">>请输入TSN\n", Color.Black);
+                            OperateResult.AppendText(">>Please enter TSN\n", Color.Black);
                             ms_id = null;
                         }
                         else
-                            OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                            OperateResult.AppendText(">>Please enter SN\n", Color.Black);
                         //}
                     }
                     else
@@ -326,11 +326,11 @@ namespace UAS_MES_NEW.Make
                         OperateResult.AppendText(ErrorMessage + "\n", Color.Red, sncode);
                         if (CheckTSN.Checked == true)
                         {
-                            OperateResult.AppendText(">>请输入TSN\n", Color.Black);
+                            OperateResult.AppendText(">>Please enter TSN\n", Color.Black);
                             ms_id = null;
                         }
                         else
-                            OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                            OperateResult.AppendText(">>Please enter SN\n", Color.Black);
                     }
                 }
                 else
@@ -338,27 +338,27 @@ namespace UAS_MES_NEW.Make
                     OperateResult.AppendText(ErrorMessage + "\n", Color.Red, sncode);
                     if (CheckTSN.Checked == true)
                     {
-                        OperateResult.AppendText(">>请输入TSN\n", Color.Black);
+                        OperateResult.AppendText(">>Please enter TSN\n", Color.Black);
                         ms_id = null;
                     }
                     else
-                        OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                        OperateResult.AppendText(">>Please enter SN\n", Color.Black);
                 }
             }
         }
         DataTable _dt;
-        //根据产品编号获取打印模板
+        // Get print template based on product code
         private void pr_code_TextChanged(object sender, EventArgs e)
         {
-            _dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault,replace(LA_SOFTTYPE,';',',')LA_SOFTTYPE from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='彩盒标' and la_statuscode='AUDITED' order by la_isdefault", "select");
+            _dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault,replace(LA_SOFTTYPE,';',',')LA_SOFTTYPE from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='Color box label' and la_statuscode='AUDITED' order by la_isdefault", "select");
             if (_dt.Rows.Count == 0)
             {
-                _dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault,replace(LA_SOFTTYPE,';',',')LA_SOFTTYPE from label where la_prodcode is null and la_templatetype='彩盒标' and la_statuscode='AUDITED' order by la_isdefault", "select");
+                _dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault,replace(LA_SOFTTYPE,';',',')LA_SOFTTYPE from label where la_prodcode is null and la_templatetype='Color box label' and la_statuscode='AUDITED' order by la_isdefault", "select");
             }
             if (_dt.Rows.Count > 0)
             {
                 string la_id = _dt.Rows[0]["la_id"].ToString();
-                _dt = (DataTable)dh.ExecuteSql("select fp_name la_url,'" + la_id + "' la_id from FILEPATH where fp_id in (select *  from table(select parsestring(LA_SOFTTYPE,';') from label where la_templatetype='彩盒标' and la_id='" + la_id + "') where COLUMN_VALUE is not null)", "select");
+                _dt = (DataTable)dh.ExecuteSql("select fp_name la_url,'" + la_id + "' la_id from FILEPATH where fp_id in (select *  from table(select parsestring(LA_SOFTTYPE,';') from label where la_templatetype='Color box label' and la_id='" + la_id + "') where COLUMN_VALUE is not null)", "select");
                 PrintLabel.DataSource = _dt;
                 PrintLabel.DisplayMember = "la_url";
                 PrintLabel.ValueMember = "la_id";
@@ -390,7 +390,7 @@ namespace UAS_MES_NEW.Make
         {
             if (ma_code.Text.Length > 4)
             {
-                //获取工单的其他信息
+                // Get other information of the work order
                 sql.Clear();
                 sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode as pr_code ,pr_detail,");
                 sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on ");
@@ -412,15 +412,15 @@ namespace UAS_MES_NEW.Make
             if (CheckTSN.Checked == true)
             {
                 ms_id = null;
-                OperateResult.AppendText(">>切换至检查TSN\n", Color.Green);
-                OperateResult.AppendText(">>请输入TSN\n", Color.Black, sncode);
+                OperateResult.AppendText(">>Switched to check TSN\n", Color.Green);
+                OperateResult.AppendText(">>Please enter TSN\n", Color.Black, sncode);
                 sncode.Focus();
             }
             else
             {
                 ms_id = null;
-                OperateResult.AppendText(">>切换至不检查TSN\n", Color.Green);
-                OperateResult.AppendText(">>请输入SN\n", Color.Black, sncode);
+                OperateResult.AppendText(">>Switched to not check TSN\n", Color.Green);
+                OperateResult.AppendText(">>Please enter SN\n", Color.Black, sncode);
                 sncode.Focus();
             }
         }

UAS_MES_LGDZ/FunctionCode/Special/Special_ChangeMakeCodeBySN.cs

@@ -69,7 +69,7 @@ namespace UAS_MES_NEW.Special
                 pr_detail1.Text = dt.Rows[0]["pr_detail"].ToString();
             }
         }
-
+                                            
         private void Confirm_Click(object sender, EventArgs e)
         {
 
@@ -77,14 +77,14 @@ namespace UAS_MES_NEW.Special
             string sncode = "";
             if (dt.Rows.Count == 0)
             {
-                OperateResult.AppendText("S\n" + ms_sncode.Text + "不存在\n");
+                OperateResult.AppendText("" + ms_sncode.Text + "不存在\n");
                 return;
             }
             else
             {
                 if (dt.Rows[0]["ms_makecode"].ToString() != ma_code.Text)
                 {
-                    OperateResult.AppendText("S\n" + ms_sncode.Text + "不存在工单" + ma_code.Text + "\n");
+                    OperateResult.AppendText("" + ms_sncode.Text + "不存在工单" + ma_code.Text + "\n");
                     return;
                 }
                 sncode = dt.Rows[0]["ms_sncode"].ToString();