修改栈板称重界面

UAS_MES_YDCY/FunctionCode/Make/Make_PalletWeigh.Designer.cs

@@ -426,9 +426,9 @@
             this.Confirm.Name = "Confirm";
             this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
             this.Confirm.Power = null;
-            this.Confirm.Size = new System.Drawing.Size(100, 48);
+            this.Confirm.Size = new System.Drawing.Size(140, 48);
             this.Confirm.TabIndex = 152;
-            this.Confirm.Text = "打印";
+            this.Confirm.Text = "打印标签";
             this.Confirm.UseVisualStyleBackColor = true;
             this.Confirm.Click += new System.EventHandler(this.Confirm_Click);
             // 
@@ -597,9 +597,9 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.彩盒称重_FormClosing);
             this.Load += new System.EventHandler(this.Make_ColorBoxWeigh_Load);
             this.SizeChanged += new System.EventHandler(this.彩盒称重_SizeChanged);
-            this.panel4.ResumeLayout(false);
+            this.panel4.ResumeLayout(true);
             this.panel4.PerformLayout();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YDCY/FunctionCode/Make/Make_PalletWeigh.cs

@@ -116,104 +116,14 @@ namespace UAS_MES_NEW.Make
         {
             if (e.KeyCode == Keys.Enter)
             {
-                if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
-                {
-                    string oMakeCode = "";
-                    string oMsID = "";
-                    dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei1='" + sncode.Text + "' order by ms_id desc", "select");
-                    if (dt.Rows.Count > 0)
-                    {
-                        sncode.Text = dt.Rows[0]["ms_sncode"].ToString();
-                    }
-                    else
-                    {
-                        dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + sncode.Text + "' order by ms_id desc", "select");
-                        if (dt.Rows.Count > 0)
-                        {
-                            sncode.Text = dt.Rows[0]["ms_sncode"].ToString();
-                        }
-                    }
-
-                    sql.Clear();
-                    sql.Append("select ms_makecode ma_code,ma_qty,ma_salecode,pr_detail pr_spec,pr_colorboxunit,pr_code,pr_colorboxgw,");
-                    sql.Append("pr_colorboxunit,pr_colorboxmaxw,pr_colorboxminw,nvl(PR_CHECKCOLORBOXW,'0') PR_CHECKCOLORBOXW,nvl(pr_sendchecktype,'LineCode')");
-                    sql.Append("pr_sendchecktype from makeserial left join make on ms_makecode=ma_code left join product on ");
-                    sql.Append("ms_prodcode=pr_code where ms_sncode='" + sncode.Text + "' order by ms_id desc");
-                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                    if (dt.Rows.Count > 0)
-                    {
-                        //重量的临时变量
-                        pr_code.Text = dt.Rows[0]["pr_code"].ToString();
-                        string _weight = dt.Rows[0]["pr_colorboxgw"].ToString();
-                        string _maxweight = dt.Rows[0]["pr_colorboxmaxw"].ToString();
-                        string _minweight = dt.Rows[0]["pr_colorboxminw"].ToString();
-                        string pr_colorunit = dt.Rows[0]["pr_colorboxunit"].ToString();
-                        string ma_salecode_text = dt.Rows[0]["ma_salecode"].ToString();
-                        string PR_CHECKCOLORBOXW = dt.Rows[0]["PR_CHECKCOLORBOXW"].ToString();
-                        //赋值重量单位
-                        Weight = double.Parse(_weight == "" ? "0" : _weight);
-                        MaxWeight = double.Parse(_maxweight == "" ? "0" : _maxweight);
-                        MinWeight = double.Parse(_minweight == "" ? "0" : _minweight);
-                        ma_salecode.Text = dt.Rows[0]["ma_salecode"].ToString();
-                        BaseUtil.SetFormValue(this.Controls, dt);
-                        //重量信息若需要检测则必须符合检测要求才更新
-                        double ActualWeight = double.Parse(weight.Text == "" ? "0" : weight.Text.Replace("kg", "").Replace("g", "").Trim());
-                        if (PR_CHECKCOLORBOXW != "0")
-                        {
-                            if (MinWeight == 0 || MaxWeight == 0)
-                            {
-                                OperateResult.AppendText(">>产品" + pr_code.Text + "未维护彩盒重量范围\n", Color.Red);
-                                return;
-                            }
-                            if ((ActualWeight >= MinWeight) && (ActualWeight <= MaxWeight))
-                            {
-                                OperateResult.AppendText(">>彩盒" + sncode.Text + "重量检测检测合格\n", Color.Green);
-                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒称重:" + weight.Text, "称量合格", sncode.Text, "");
-                                LogicHandler.RecordProdWeight(sncode.Text, "SN", float.Parse(ActualWeight.ToString()), "kg", User.UserLineCode, pr_code.Text, User.UserSourceCode, User.UserName);
-                                dh.ExecuteSql("update makeserial set ms_grossw='" + ActualWeight + "' where ms_id='" + oMsID + "'", "update");
-                            }
-                            else
-                            {
-                                OperateResult.AppendText(">>彩盒" + sncode.Text + "重量检测未通过\n", Color.Red);
-                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒称重:" + weight.Text, "称量不合格", sncode.Text, "");
-                                LogicHandler.RecordProdWeight(sncode.Text, "SN", float.Parse(ActualWeight.ToString()), "kg", User.UserLineCode, pr_code.Text, User.UserSourceCode, User.UserName);
-                                return;
-                            }
-                        }
-                        else
-                        {
-                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒称重:" + weight.Text, "称量完成", sncode.Text, "");
-                            LogicHandler.RecordProdWeight(sncode.Text, "SN", float.Parse(ActualWeight.ToString()), "kg", User.UserLineCode, pr_code.Text, User.UserSourceCode, User.UserName);
-                            dh.ExecuteSql("update makeserial set ms_grossw='" + ActualWeight + "' where ms_id='" + oMsID + "'", "update");
-                        }
-                        ListViewItem lsi = new ListViewItem();
-                        lsi.SubItems.Add(sncode.Text);
-                        lsi.SubItems.Add(ActualWeight.ToString());
-                        lsi.SubItems.Add(System.DateTime.Now.ToString());
-                        WeighRecord.Items.Add(lsi);
-                        WeighRecord.Items[this.WeighRecord.Items.Count - 1].EnsureVisible();
-                        OperateResult.AppendText(">>彩盒" + sncode.Text + "称重完成\n", Color.Green);
-                        //显示最近的三个称量记录
-                        if (LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "彩盒称量", "称量合格", User.UserCode, out ErrorMessage))
-                        {
-                            //提示正确返回时传递的信息
-                            if (ErrorMessage.Contains("AFTERSUCCESS"))
-                                OperateResult.AppendText(">>" + ErrorMessage + "\n");
-                            //记录送检前的最后一个序列号
-                            LastSncode = sncode.Text;
-                            if (AutoPrint.Checked)
-                            {
-                                OperateResult.AppendText(">>打印条码号" + sncode.Text + "\n", Color.Green);
-                                Confirm.PerformClick();
-                            }
-                            Remark.Clear();
-                        }
-                        else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
-                        sncode.Clear();
-                    }
-                    else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, sncode);
-                }
-                else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, sncode);
+                double ActualWeight = double.Parse(weight.Text == "" ? "0" : weight.Text.Replace("kg", "").Replace("g", "").Trim());
+                ListViewItem lsi = new ListViewItem();
+                lsi.SubItems.Add(sncode.Text);
+                lsi.SubItems.Add(ActualWeight.ToString());
+                lsi.SubItems.Add(System.DateTime.Now.ToString());
+                WeighRecord.Items.Add(lsi);
+                WeighRecord.Items[this.WeighRecord.Items.Count - 1].EnsureVisible();
+                OperateResult.AppendText(">>彩盒" + sncode.Text + "称重完成\n", Color.Green);
             }
         }
 
@@ -283,15 +193,21 @@ namespace UAS_MES_NEW.Make
                 SystemInf.OpenPort.Remove(serialPort1.PortName);
                 thread.Interrupt();
             }
-            //thread.Abort();
         }
 
         private void Confirm_Click(object sender, EventArgs e)
         {
+            if (ma_code.Text == "")
+            {
+                OperateResult.AppendText(">>请先选择工单号\n", Color.Red);
+                return;
+            }
+            sncode.Text = LogicHandler.GetOutBoxCode1("PALLETCODE", ma_code.Text, pr_code.Text, User.UserCode);
+
             if (PrintLabel.Items.Count != 0)
             {
                 string oErrorMessage;
-                if (!Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, sncode.Text, int.Parse(PrintNum.Text), ma_code.Text, pr_code.Text, "彩盒标", "0", out oErrorMessage))
+                if (!Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, sncode.Text, int.Parse(PrintNum.Text), ma_code.Text, pr_code.Text, "卡板标", "0", out oErrorMessage))
                 {
                     OperateResult.AppendText(oErrorMessage + "\n", Color.Red);
                 }
@@ -339,7 +255,7 @@ namespace UAS_MES_NEW.Make
 
         private void pr_code_TextChanged(object sender, EventArgs e)
         {
-            DataTable _dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='彩盒标' and la_statuscode='AUDITED' order by la_isdefault", "select");
+            DataTable _dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault from label where la_templatetype='卡板标' and la_statuscode='AUDITED' order by la_isdefault", "select");
             PrintLabel.DataSource = _dt;
             PrintLabel.DisplayMember = "la_url";
             PrintLabel.ValueMember = "la_id";