palletweigh修改

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

@@ -1,4 +1,4 @@
-namespace UAS_MES.FunctionCode.Make
+namespace UAS_MES.Make
 {
     partial class Make_LabelCheck
     {
@@ -257,6 +257,7 @@
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Name = "Make_LabelCheck";
             this.Tag = "Make!LabelCheck";
+            this.Text = "标签核对";
             this.Load += new System.EventHandler(this.Make_LabelCheck_Load);
             this.SizeChanged += new System.EventHandler(this.Make_LabelCheck_SizeChanged);
             this.ResumeLayout(false);

UAS-MES/FunctionCode/Make/Make_LabelCheck.cs

@@ -10,7 +10,7 @@ using UAS_MES.DataOperate;
 using UAS_MES.Entity;
 using UAS_MES.PublicMethod;
 
-namespace UAS_MES.FunctionCode.Make
+namespace UAS_MES.Make
 {
     public partial class Make_LabelCheck : Form
     {
@@ -94,28 +94,37 @@ namespace UAS_MES.FunctionCode.Make
                         sql.Clear();
                         sql.Append("select ms_imei1 from  makeserial  where ms_id=:msid");
                         info = (DataTable)dh.ExecuteSql(sql.GetString(), "select", dt.Rows[0]["ms_id"].ToString());
-                        //不为null 并且不为””才继续
-                        if (info.Rows[0]["ms_imei1"].ToString() == null || info.Rows[0]["ms_imei1"].ToString() == "")
+                        if (info.Rows.Count > 0)
                         {
-                            // SN对应的IMEI不存在
-                            //>> 请输入SN
-                            OperateResult.AppendText("<<SN" + sncode.Text + "对应的IMEI不存在\n", Color.Red);
-                            sncode.Text = "";
-                            OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                            //不为null 并且不为””才继续
+                            if (info.Rows[0]["ms_imei1"].ToString() == null || info.Rows[0]["ms_imei1"].ToString() == "")
+                            {
+                                // SN对应的IMEI不存在
+                                //>> 请输入SN
+                                OperateResult.AppendText("<<SN" + sncode.Text + "对应的IMEI不存在\n", Color.Red);
+                                sncode.Text = "";
+                                OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                            }
+                            else
+                            //存在该imei信息
+                            {
+                                //用变量记录imei1和makecode
+                                imei1 = info.Rows[0]["ms_imei1"].ToString();
+                                SN = sncode.Text;
+                                //>>SN对应的IMEI号为:xxxxxxxxx
+                                //>> 请输入彩盒上的IMEI
+                                OperateResult.AppendText("<<SN对应的IMEI号为:" + imei1 + "\n", Color.Green);
+                                OperateResult.AppendText(">>请输入彩盒上的IMEI\n", Color.Green);
+                                sncode.Text = "";
+                                //设定要输入imei1
+                                isImei1 = true;
+                            }
                         }
                         else
-                        //存在该imei信息
                         {
-                            //用变量记录imei1和makecode
-                            imei1 = info.Rows[0]["ms_imei1"].ToString();
-                            SN = sncode.Text;
-                            //>>SN对应的IMEI号为:xxxxxxxxx
-                            //>> 请输入彩盒上的IMEI
-                            OperateResult.AppendText("<<SN对应的IMEI号为:" + imei1 + "\n", Color.Green);
-                            OperateResult.AppendText(">>请输入彩盒上的IMEI\n", Color.Green);
+                            OperateResult.AppendText("<<SN" + sncode.Text + "对应的IMEI不存在\n", Color.Red);
                             sncode.Text = "";
-                            //设定要输入imei1
-                            isImei1 = true;
+                            OperateResult.AppendText(">>请输入SN\n", Color.Green);
                         }
                     }
                 }

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

@@ -1,4 +1,4 @@
-namespace UAS_MES.FunctionCode.Make
+namespace UAS_MES.Make
 {
     partial class Make_PalletWeigh
     {
@@ -533,9 +533,9 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_PalletWeigh_FormClosing);
             this.Load += new System.EventHandler(this.Make_PalletWeigh_Load);
             this.SizeChanged += new System.EventHandler(this.Make_PalletWeigh_SizeChanged);
-            this.panel4.ResumeLayout(false);
+            this.panel4.ResumeLayout(true);
             this.panel4.PerformLayout();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-MES/FunctionCode/Make/Make_PalletWeigh.cs

@@ -16,7 +16,7 @@ using UAS_MES.Entity;
 using UAS_MES.PublicForm;
 using UAS_MES.PublicMethod;
 
-namespace UAS_MES.FunctionCode.Make
+namespace UAS_MES.Make
 {
     public partial class Make_PalletWeigh : Form
     {
@@ -84,7 +84,7 @@ namespace UAS_MES.FunctionCode.Make
                 //校验栈板号
                 sql.Clear();
                 sql.Append("select pa_id,pa_prodcode,pr_spec ||','|| pr_detail pr_detailspec,pa_makecode,pa_salecode,pa_totalqty,");
-                sql.Append("pa_packageqty from package left join product on pr_code=pa_prodcode where");
+                sql.Append("pa_packageqty from package left join product on pr_code=pa_prodcode where ");
                 sql.Append("pa_outboxcode=:code and pa_type='3'");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(),"select",palletcode.Text);
                 if (dt.Rows.Count == 0)