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

UAS-MES/FunctionCode/Make/Make_LabelCheck.cs

@@ -24,17 +24,23 @@ namespace UAS_MES.Make
 
         DataTable info;
 
-        string imei1 = "";
+        DataTable checkItemInfo;//存储需要核对的所有信息列表
 
-        bool isImei1 = false;
+        string needCheckedInfo = "";
+
+        bool isCheckItem = false;
 
         string oErrorMessage = "";
 
         string SN = "";
 
+        string TSN = "";//存TSN
+
         string omakeCode = "";
 
         string oMsid = "";
+
+        int checkIndex = 0;//记录核对的当前位置，从0开始
         public Make_LabelCheck()
         {
             InitializeComponent();
@@ -66,65 +72,60 @@ namespace UAS_MES.Make
                     return;
                 }
                 //输入的是SN
-                if (!isImei1)
+                if (!isCheckItem)
                 {
                     OperateResult.AppendText("<<"+sncode.Text+"\n", Color.Black);
                     //查询是否存在该ms_id
                     sql.Clear();
-                    sql.Append("select max(MS_id) ms_id from makeserial where ms_sncode='"+sncode.Text+"' or ms_firstsn in (select firstsn from makesnrelation where beforesn='"+sncode.Text+"')");
+                    sql.Append("select ms_id,ms_prodcode,ms_makecode,ms_craftcode,ms_beforesn from makeserial where ms_id in (select max(MS_id) ms_id from makeserial where ms_sncode='" + sncode.Text+"' or ms_firstsn in (select firstsn from makesnrelation where beforesn='"+sncode.Text+"'))");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                    
                     if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
                     {
                         //SN错误,不存在
                         //请输入SN
                         OperateResult.AppendText("<<SN错误，序列号" + sncode.Text + "不存在\n", Color.Red, sncode);
                         OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                        return;
                     }
-                    //存在该SN号
-                    else
+                    //存在该SN号,查询相关需要核对的信息
+                    sql.Clear();
+                    sql.Append("select checkitem,fsoncode,type,detno from (select psr_type checkitem ,'' fsoncode,'MS' type ,");
+                    sql.Append("ROW_NUMBER() OVER (order by psr_detno asc )detno from productsnrelation where psr_prodcode='"+ dt.Rows[0]["ms_prodcode"].ToString() + "' and nvl(psr_iflabelcheck,0)<>0");
+                    sql.Append(" UNION ALL select wm_concat(sp_soncode)checkitem,sp_fsoncode fsoncode ,'SP' type,");
+                    sql.Append(" ROW_NUMBER()OVER(order by min(sp_detno)asc) detno from make inner join stepbom on sb_bomversion=ma_bomversion and sb_prodcode=ma_prodcode");
+                    sql.Append(" inner join stepproduct on sp_sbid=sb_id where ma_code='"+ dt.Rows[0]["ms_makecode"].ToString() + "' and sb_craftcode='"+ dt.Rows[0]["ms_craftcode"].ToString() + "' and nvl(sp_iflabelcheck,0)<>0");
+                    sql.Append(" GROUP BY sp_fsoncode) order by type,detno");
+                    checkItemInfo = (DataTable)dh.ExecuteSql(sql.GetString(),"select");
+                    //判断是否无需要核对的项
+                    if (checkItemInfo.Rows.Count==0)
                     {
-                        //根据该ms_id查询ms_imei1,ms_makecode信息
-                        sql.Clear();
-                        sql.Append("select ms_imei1 from  makeserial  where ms_id='"+ dt.Rows[0]["ms_id"].ToString() + "'");
-                        info = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                        if (info.Rows.Count > 0)
-                        {
-                            //不为null 并且不为””才继续
-                            if (info.Rows[0]["ms_imei1"].ToString() == null || info.Rows[0]["ms_imei1"].ToString() == "")
-                            {
-                                // SN对应的IMEI不存在
-                                //>> 请输入SN
-                                OperateResult.AppendText("<<序列号" + sncode.Text + "对应的IMEI不存在\n", Color.Red, sncode);
-                                OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                            }
-                            else
-                            //存在该imei信息
-                            {
-                                //用变量记录imei1和makecode
-                                imei1 = info.Rows[0]["ms_imei1"].ToString();
-                                SN = sncode.Text;
-                                //>>SN对应的IMEI号为:xxxxxxxxx
-                                //>> 请输入彩盒上的IMEI
-                                OperateResult.AppendText("<<序列号"+sncode.Text+"对应的IMEI号为:" + imei1 + "\n", Color.Green);
-                                OperateResult.AppendText(">>请输入彩盒上的IMEI\n", Color.Black, sncode);
-                                //设定要输入imei1
-                                isImei1 = true;
-                            }
-                        }
-                        else
-                        {
-                            OperateResult.AppendText("<<SN:" + sncode.Text + "对应的IMEI不存在\n", Color.Red, sncode);
-                            OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                        }
+                        OperateResult.AppendText("<<序列号" + sncode.Text + "没有需要核对的项\n", Color.Red, sncode);
+                        OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                        return;
                     }
+                    //记录SN
+                    SN = sncode.Text;
+                    TSN = dt.Rows[0]["ms_beforesn"].ToString();
+                    //查询第一个需要核对的信息
+                    getNextInfo(checkIndex);
+                    //设定要输入核对信息
+                    isCheckItem = true;
                 }
                 //输入的是imei1
                 else
                 {
                     OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
-                    if (imei1 == sncode.Text)
+                    if (needCheckedInfo == sncode.Text)
                     {
-                        //说明输入的imei1对比一致
+                        checkIndex += 1;//序号+1，进入下一步
+                        //输入一致则进入下一个
+                        getNextInfo(checkIndex);
+                        if (checkIndex < checkItemInfo.Rows.Count-1)
+                        {
+                            return;
+                        }
+                        //说明输入的核对信息对比一致
                         //判断工序属性attribute
                         if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out oErrorMessage))
                         {
@@ -150,7 +151,7 @@ namespace UAS_MES.Make
                                     LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode,ma_code.Text,User.UserLineCode,User.UserSourceCode,"标签核对","标签核对成功",SN,"");
                                     //IMEI核对成功
                                     //>> 请输入SN
-                                    OperateResult.AppendText("<<IMEI核对成功\n", Color.Green, sncode);
+                                    OperateResult.AppendText("<<核对成功\n", Color.Green, sncode);
                                     OperateResult.AppendText(">>请输入SN\n", Color.Black);
                                 }
                                 else
@@ -177,15 +178,15 @@ namespace UAS_MES.Make
                     //说明比对不一致
                     else
                     {
-                        //清空imei1变量的值
-                        imei1 = "";
-                        //IMEI核对失败
+                        //清空核对变量的值
+                        needCheckedInfo = "";
+                        //信息核对失败
                         //>> 请输入SN
-                        OperateResult.AppendText(">>IMEI核对失败,不一致\n", Color.Red, sncode);
+                        OperateResult.AppendText(">>上料信息或序列号采集信息"+needCheckedInfo+"核对失败,不一致\n", Color.Red, sncode);
                         OperateResult.AppendText(">>请输入SN\n", Color.Black);
                     }
                     //imei1校对结束，下次输入的是SN
-                    isImei1 = false;
+                    isCheckItem = false;
                 }
             }
         }
@@ -210,7 +211,26 @@ namespace UAS_MES.Make
             omakeCode = "";
             oMsid = "";
             SN = "";
-            imei1 = "";
+            needCheckedInfo = "";
+        }
+        private void getNextInfo(int index)
+        {
+            //判断为上料或者采集信息
+            //为采集信息
+            if (checkItemInfo.Rows[index]["TYPE"].ToString() == "MS")
+            {
+                //从makeserial表中查询对应字段的值
+                needCheckedInfo = dh.getFieldDataByCondition("makeserial","ms_"+ checkItemInfo.Rows[index]["checkitem"].ToString(),"ms_id ='"+ dt.Rows[0]["ms_id"].ToString() + "'").ToString();
+                OperateResult.AppendText("<<序列号" + SN + "对应的"+ checkItemInfo.Rows[index]["checkitem"].ToString() + "为:" + needCheckedInfo + "\n", Color.Green);
+                OperateResult.AppendText(">>请输入"+ checkItemInfo.Rows[index]["checkitem"].ToString() + "\n", Color.Black, sncode);
+            }
+            else//为上料信息
+            {
+                //从craftmaterial中查询上料记录
+                needCheckedInfo = dh.getFieldDataByCondition("craftmaterial", "cm_barcode", "cm_makecode='"+ dt.Rows[0]["ms_makecode"].ToString() + "' and cm_sncode in ('"+SN+"'"+(TSN==""?"":(",'"+TSN+"'"))+") and cm_fsoncode='"+checkItemInfo.Rows[index]["fsoncode"].ToString()+"' and cm_status=0").ToString();
+                OperateResult.AppendText("<<序列号" + SN + "上料物料:"+ checkItemInfo.Rows[index]["checkitem"].ToString() + "的条码号为:" + needCheckedInfo + "\n", Color.Green);
+                OperateResult.AppendText(">>请输入物料"+ checkItemInfo.Rows[index]["checkitem"].ToString() + "条码\n", Color.Black, sncode);
+            }
         }
     }
 }

UAS-MES/FunctionCode/Packing/Packing_CartonTransfer.Designer.cs

@@ -34,6 +34,7 @@
             this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.groupBoxWithBorder2 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.ALLMOVE = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.pa_standardqty = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.pa_currentqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.label4 = new System.Windows.Forms.Label();
@@ -43,6 +44,7 @@
             this.newpack = new System.Windows.Forms.RadioButton();
             this.movepack = new System.Windows.Forms.RadioButton();
             this.groupBoxWithBorder1 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.ms_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.pa_packtype = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pa_type = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pa_custcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
@@ -59,8 +61,6 @@
             this.pr_code_label = new System.Windows.Forms.Label();
             this.pr_outboxinnerqty_label = new System.Windows.Forms.Label();
             this.pa_code_label = new System.Windows.Forms.Label();
-            this.ALLMOVE = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ms_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.groupBoxWithBorder2.SuspendLayout();
             this.groupBoxWithBorder1.SuspendLayout();
             this.SuspendLayout();
@@ -112,6 +112,7 @@
             // groupBoxWithBorder2
             // 
             this.groupBoxWithBorder2.BorderColor = System.Drawing.Color.Black;
+            this.groupBoxWithBorder2.Controls.Add(this.ALLMOVE);
             this.groupBoxWithBorder2.Controls.Add(this.pa_standardqty);
             this.groupBoxWithBorder2.Controls.Add(this.pa_currentqty);
             this.groupBoxWithBorder2.Controls.Add(this.label4);
@@ -131,6 +132,24 @@
             this.groupBoxWithBorder2.Text = "转移箱";
             this.groupBoxWithBorder2.TextColor = System.Drawing.Color.Black;
             // 
+            // ALLMOVE
+            // 
+            this.ALLMOVE.AllPower = null;
+            this.ALLMOVE.BackColor = System.Drawing.Color.Transparent;
+            this.ALLMOVE.DownImage = ((System.Drawing.Image)(resources.GetObject("ALLMOVE.DownImage")));
+            this.ALLMOVE.Image = null;
+            this.ALLMOVE.IsShowBorder = true;
+            this.ALLMOVE.Location = new System.Drawing.Point(273, 115);
+            this.ALLMOVE.MoveImage = ((System.Drawing.Image)(resources.GetObject("ALLMOVE.MoveImage")));
+            this.ALLMOVE.Name = "ALLMOVE";
+            this.ALLMOVE.NormalImage = ((System.Drawing.Image)(resources.GetObject("ALLMOVE.NormalImage")));
+            this.ALLMOVE.Power = null;
+            this.ALLMOVE.Size = new System.Drawing.Size(70, 25);
+            this.ALLMOVE.TabIndex = 179;
+            this.ALLMOVE.Text = "全部移箱";
+            this.ALLMOVE.UseVisualStyleBackColor = false;
+            this.ALLMOVE.Click += new System.EventHandler(this.ALLMOVE_Click);
+            // 
             // pa_standardqty
             // 
             this.pa_standardqty.AllPower = null;
@@ -151,7 +170,7 @@
             // 
             this.pa_currentqty.AutoSize = true;
             this.pa_currentqty.CutLength = null;
-            this.pa_currentqty.Location = new System.Drawing.Point(351, 62);
+            this.pa_currentqty.Location = new System.Drawing.Point(348, 59);
             this.pa_currentqty.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_currentqty.Name = "pa_currentqty";
             this.pa_currentqty.Size = new System.Drawing.Size(0, 21);
@@ -160,7 +179,7 @@
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(277, 62);
+            this.label4.Location = new System.Drawing.Point(272, 61);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(74, 21);
             this.label4.TabIndex = 6;
@@ -169,7 +188,7 @@
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(36, 116);
+            this.label3.Location = new System.Drawing.Point(33, 113);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(74, 21);
             this.label3.TabIndex = 5;
@@ -178,7 +197,7 @@
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(36, 62);
+            this.label2.Location = new System.Drawing.Point(33, 59);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(74, 21);
             this.label2.TabIndex = 4;
@@ -203,7 +222,7 @@
             // newpack
             // 
             this.newpack.AutoSize = true;
-            this.newpack.Location = new System.Drawing.Point(140, 27);
+            this.newpack.Location = new System.Drawing.Point(137, 24);
             this.newpack.Name = "newpack";
             this.newpack.Size = new System.Drawing.Size(60, 25);
             this.newpack.TabIndex = 1;
@@ -215,7 +234,7 @@
             // movepack
             // 
             this.movepack.AutoSize = true;
-            this.movepack.Location = new System.Drawing.Point(40, 27);
+            this.movepack.Location = new System.Drawing.Point(37, 24);
             this.movepack.Name = "movepack";
             this.movepack.Size = new System.Drawing.Size(60, 25);
             this.movepack.TabIndex = 0;
@@ -255,11 +274,26 @@
             this.groupBoxWithBorder1.Text = "原箱信息";
             this.groupBoxWithBorder1.TextColor = System.Drawing.Color.Black;
             // 
+            // ms_outboxcode
+            // 
+            this.ms_outboxcode.AllPower = null;
+            this.ms_outboxcode.BackColor = System.Drawing.Color.White;
+            this.ms_outboxcode.ID = null;
+            this.ms_outboxcode.Location = new System.Drawing.Point(72, 38);
+            this.ms_outboxcode.Name = "ms_outboxcode";
+            this.ms_outboxcode.Power = null;
+            this.ms_outboxcode.Size = new System.Drawing.Size(110, 29);
+            this.ms_outboxcode.Str = null;
+            this.ms_outboxcode.Str1 = null;
+            this.ms_outboxcode.Str2 = null;
+            this.ms_outboxcode.TabIndex = 180;
+            this.ms_outboxcode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ms_outboxcode_KeyDown);
+            // 
             // pa_packtype
             // 
             this.pa_packtype.AutoSize = true;
             this.pa_packtype.CutLength = null;
-            this.pa_packtype.Location = new System.Drawing.Point(116, 12);
+            this.pa_packtype.Location = new System.Drawing.Point(113, 9);
             this.pa_packtype.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_packtype.Name = "pa_packtype";
             this.pa_packtype.Size = new System.Drawing.Size(0, 21);
@@ -270,7 +304,7 @@
             // 
             this.pa_type.AutoSize = true;
             this.pa_type.CutLength = null;
-            this.pa_type.Location = new System.Drawing.Point(404, 18);
+            this.pa_type.Location = new System.Drawing.Point(401, 15);
             this.pa_type.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_type.Name = "pa_type";
             this.pa_type.Size = new System.Drawing.Size(0, 21);
@@ -281,7 +315,7 @@
             // 
             this.pa_custcode.AutoSize = true;
             this.pa_custcode.CutLength = null;
-            this.pa_custcode.Location = new System.Drawing.Point(360, 20);
+            this.pa_custcode.Location = new System.Drawing.Point(357, 17);
             this.pa_custcode.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_custcode.Name = "pa_custcode";
             this.pa_custcode.Size = new System.Drawing.Size(0, 21);
@@ -292,7 +326,7 @@
             // 
             this.pa_salecode.AutoSize = true;
             this.pa_salecode.CutLength = null;
-            this.pa_salecode.Location = new System.Drawing.Point(285, 12);
+            this.pa_salecode.Location = new System.Drawing.Point(282, 9);
             this.pa_salecode.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_salecode.Name = "pa_salecode";
             this.pa_salecode.Size = new System.Drawing.Size(0, 21);
@@ -303,7 +337,7 @@
             // 
             this.pa_level.AutoSize = true;
             this.pa_level.CutLength = null;
-            this.pa_level.Location = new System.Drawing.Point(108, 12);
+            this.pa_level.Location = new System.Drawing.Point(105, 9);
             this.pa_level.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_level.Name = "pa_level";
             this.pa_level.Size = new System.Drawing.Size(0, 21);
@@ -314,7 +348,7 @@
             // 
             this.lastsccode.AutoSize = true;
             this.lastsccode.CutLength = null;
-            this.lastsccode.Location = new System.Drawing.Point(326, 116);
+            this.lastsccode.Location = new System.Drawing.Point(323, 113);
             this.lastsccode.MaximumSize = new System.Drawing.Size(200, 0);
             this.lastsccode.Name = "lastsccode";
             this.lastsccode.Size = new System.Drawing.Size(0, 21);
@@ -324,7 +358,7 @@
             // 
             this.ms_msmakecode.AutoSize = true;
             this.ms_msmakecode.CutLength = null;
-            this.ms_msmakecode.Location = new System.Drawing.Point(326, 80);
+            this.ms_msmakecode.Location = new System.Drawing.Point(323, 77);
             this.ms_msmakecode.MaximumSize = new System.Drawing.Size(200, 0);
             this.ms_msmakecode.Name = "ms_msmakecode";
             this.ms_msmakecode.Size = new System.Drawing.Size(0, 21);
@@ -334,7 +368,7 @@
             // 
             this.laststepcode.AutoSize = true;
             this.laststepcode.CutLength = null;
-            this.laststepcode.Location = new System.Drawing.Point(111, 116);
+            this.laststepcode.Location = new System.Drawing.Point(108, 113);
             this.laststepcode.MaximumSize = new System.Drawing.Size(200, 0);
             this.laststepcode.Name = "laststepcode";
             this.laststepcode.Size = new System.Drawing.Size(0, 21);
@@ -344,7 +378,7 @@
             // 
             this.ms_prodcode.AutoSize = true;
             this.ms_prodcode.CutLength = null;
-            this.ms_prodcode.Location = new System.Drawing.Point(111, 80);
+            this.ms_prodcode.Location = new System.Drawing.Point(108, 77);
             this.ms_prodcode.MaximumSize = new System.Drawing.Size(200, 0);
             this.ms_prodcode.Name = "ms_prodcode";
             this.ms_prodcode.Size = new System.Drawing.Size(0, 21);
@@ -354,7 +388,7 @@
             // 
             this.pa_qty.AutoSize = true;
             this.pa_qty.CutLength = null;
-            this.pa_qty.Location = new System.Drawing.Point(326, 41);
+            this.pa_qty.Location = new System.Drawing.Point(323, 38);
             this.pa_qty.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_qty.Name = "pa_qty";
             this.pa_qty.Size = new System.Drawing.Size(0, 21);
@@ -364,7 +398,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(214, 40);
+            this.label1.Location = new System.Drawing.Point(211, 37);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(74, 21);
             this.label1.TabIndex = 171;
@@ -374,7 +408,7 @@
             // 
             this.pa_currentqty_label.AutoSize = true;
             this.pa_currentqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty_label.Location = new System.Drawing.Point(214, 116);
+            this.pa_currentqty_label.Location = new System.Drawing.Point(211, 113);
             this.pa_currentqty_label.Name = "pa_currentqty_label";
             this.pa_currentqty_label.Size = new System.Drawing.Size(106, 21);
             this.pa_currentqty_label.TabIndex = 95;
@@ -384,7 +418,7 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(214, 80);
+            this.pr_detail_label.Location = new System.Drawing.Point(211, 77);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(81, 21);
             this.pr_detail_label.TabIndex = 80;
@@ -394,7 +428,7 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(5, 80);
+            this.pr_code_label.Location = new System.Drawing.Point(2, 77);
             this.pr_code_label.Name = "pr_code_label";
             this.pr_code_label.Size = new System.Drawing.Size(74, 21);
             this.pr_code_label.TabIndex = 81;
@@ -404,7 +438,7 @@
             // 
             this.pr_outboxinnerqty_label.AutoSize = true;
             this.pr_outboxinnerqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(5, 116);
+            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(2, 113);
             this.pr_outboxinnerqty_label.Name = "pr_outboxinnerqty_label";
             this.pr_outboxinnerqty_label.Size = new System.Drawing.Size(106, 21);
             this.pr_outboxinnerqty_label.TabIndex = 97;
@@ -414,51 +448,17 @@
             // 
             this.pa_code_label.AutoSize = true;
             this.pa_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_code_label.Location = new System.Drawing.Point(5, 41);
+            this.pa_code_label.Location = new System.Drawing.Point(2, 38);
             this.pa_code_label.Name = "pa_code_label";
             this.pa_code_label.Size = new System.Drawing.Size(58, 21);
             this.pa_code_label.TabIndex = 113;
             this.pa_code_label.Text = "原箱号";
             // 
-            // ALLMOVE
-            // 
-            this.ALLMOVE.AllPower = null;
-            this.ALLMOVE.BackColor = System.Drawing.Color.Transparent;
-            this.ALLMOVE.DownImage = ((System.Drawing.Image)(resources.GetObject("ALLMOVE.DownImage")));
-            this.ALLMOVE.Image = null;
-            this.ALLMOVE.IsShowBorder = true;
-            this.ALLMOVE.Location = new System.Drawing.Point(339, 464);
-            this.ALLMOVE.MoveImage = ((System.Drawing.Image)(resources.GetObject("ALLMOVE.MoveImage")));
-            this.ALLMOVE.Name = "ALLMOVE";
-            this.ALLMOVE.NormalImage = ((System.Drawing.Image)(resources.GetObject("ALLMOVE.NormalImage")));
-            this.ALLMOVE.Power = null;
-            this.ALLMOVE.Size = new System.Drawing.Size(75, 28);
-            this.ALLMOVE.TabIndex = 179;
-            this.ALLMOVE.Text = "全部移箱";
-            this.ALLMOVE.UseVisualStyleBackColor = false;
-            this.ALLMOVE.Click += new System.EventHandler(this.ALLMOVE_Click);
-            // 
-            // ms_outboxcode
-            // 
-            this.ms_outboxcode.AllPower = null;
-            this.ms_outboxcode.BackColor = System.Drawing.Color.White;
-            this.ms_outboxcode.ID = null;
-            this.ms_outboxcode.Location = new System.Drawing.Point(72, 38);
-            this.ms_outboxcode.Name = "ms_outboxcode";
-            this.ms_outboxcode.Power = null;
-            this.ms_outboxcode.Size = new System.Drawing.Size(110, 29);
-            this.ms_outboxcode.Str = null;
-            this.ms_outboxcode.Str1 = null;
-            this.ms_outboxcode.Str2 = null;
-            this.ms_outboxcode.TabIndex = 180;
-            this.ms_outboxcode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ms_outboxcode_KeyDown);
-            // 
             // Packing_CartonTransfer
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(910, 502);
-            this.Controls.Add(this.ALLMOVE);
             this.Controls.Add(this.清除);
             this.Controls.Add(this.sn_code);
             this.Controls.Add(this.sn_code_label);
@@ -466,7 +466,7 @@
             this.Controls.Add(this.groupBoxWithBorder2);
             this.Controls.Add(this.groupBoxWithBorder1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.Margin = new System.Windows.Forms.Padding(2);
             this.Name = "Packing_CartonTransfer";
             this.Tag = "Packing!CartonTransfer";
             this.Text = "卡通箱转移";

UAS-MES/PublicMethod/ftpOperater.cs

@@ -287,7 +287,7 @@ namespace UAS_MES.PublicMethod
                 File.Copy(sourceFile, destFile, true);
             }
             catch {
-                MessageBox.Show("标签文件下载失败，检查文件是否存在于指定路径或网络是否通畅");
+                MessageBox.Show("标签文件不在指定维护路径"+ URL + "中","提示",MessageBoxButtons.OK,MessageBoxIcon.Warning);
             }
             return destFile;
         }