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

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -392,21 +392,24 @@ namespace UAS_MES.Make
             SPID.Add(sp_id);
             OperateResult.AppendText(">>物料" + sp_soncode + "采集成功\n");
             code.Clear();
+            string fsoncode = "";
             //如果+1后不小于B序列的长度，则已采集完成，不需要进行提示了
             if (RemainIndex < RemainList.Length)
+                fsoncode = dt1.Rows[RemainIndex]["sp_fsoncode"].ToString();
+            if (RemindItem.Contains(fsoncode))
             {
-                string fsoncode = dt1.Rows[RemainIndex]["sp_fsoncode"].ToString();
-                if (RemindItem.Contains(fsoncode))
-                {
-                    RemainIndex = RemainIndex + 1;
-                }
+                RemainIndex = RemainIndex + 1;
+            }
+            if (RemainIndex < RemainList.Length)
+            {
+                fsoncode = dt1.Rows[RemainIndex]["sp_fsoncode"].ToString();
+                string prdetail = dt1.Rows[RemainIndex]["pr_detail"].ToString();
                 string soncode = "";
                 for (int i = 0; i < dt1.Rows.Count; i++)
                 {
                     if (fsoncode == dt1.Rows[i]["sp_fsoncode"].ToString())
                         soncode += dt1.Rows[i]["sp_soncode"].ToString() + ",";
                 }
-                string prdetail = dt1.Rows[RemainIndex]["pr_detail"].ToString();
                 if (!RemindItem.Contains(fsoncode))
                 {
                     RemindItem.Add(fsoncode);

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

@@ -135,7 +135,7 @@
             this.columnHeader4,
             this.columnHeader5});
             this.showResult.Font = new System.Drawing.Font("宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.showResult.Location = new System.Drawing.Point(542, 271);
+            this.showResult.Location = new System.Drawing.Point(412, 272);
             this.showResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.showResult.Name = "showResult";
             this.showResult.Size = new System.Drawing.Size(654, 309);
@@ -178,7 +178,7 @@
             this.panel4.Controls.Add(this.pr_cartonunit);
             this.panel4.Controls.Add(this.label22);
             this.panel4.Controls.Add(this.weight);
-            this.panel4.Location = new System.Drawing.Point(681, 18);
+            this.panel4.Location = new System.Drawing.Point(540, 18);
             this.panel4.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.panel4.Name = "panel4";
             this.panel4.Size = new System.Drawing.Size(515, 156);
@@ -244,7 +244,7 @@
             this.sncode.Location = new System.Drawing.Point(127, 72);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;
-            this.sncode.Size = new System.Drawing.Size(196, 31);
+            this.sncode.Size = new System.Drawing.Size(187, 31);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -258,7 +258,7 @@
             this.confirm.DownImage = ((System.Drawing.Image)(resources.GetObject("confirm.DownImage")));
             this.confirm.Image = null;
             this.confirm.IsShowBorder = true;
-            this.confirm.Location = new System.Drawing.Point(197, 552);
+            this.confirm.Location = new System.Drawing.Point(127, 552);
             this.confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("confirm.MoveImage")));
             this.confirm.Name = "confirm";
             this.confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("confirm.NormalImage")));
@@ -275,7 +275,7 @@
             this.OperateResult.Location = new System.Drawing.Point(21, 272);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(455, 254);
+            this.OperateResult.Size = new System.Drawing.Size(333, 254);
             this.OperateResult.TabIndex = 226;
             this.OperateResult.Text = "";
             // 
@@ -283,7 +283,7 @@
             // 
             this.ComList.AutoSize = true;
             this.ComList.CutLength = null;
-            this.ComList.Location = new System.Drawing.Point(1085, 232);
+            this.ComList.Location = new System.Drawing.Point(954, 228);
             this.ComList.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ComList.MaximumSize = new System.Drawing.Size(225, 0);
             this.ComList.Name = "ComList";
@@ -297,7 +297,7 @@
             this.BaudRate.AllPower = null;
             this.BaudRate.BackColor = System.Drawing.Color.White;
             this.BaudRate.ID = null;
-            this.BaudRate.Location = new System.Drawing.Point(1088, 198);
+            this.BaudRate.Location = new System.Drawing.Point(961, 194);
             this.BaudRate.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.BaudRate.Name = "BaudRate";
             this.BaudRate.Negative = false;
@@ -316,7 +316,7 @@
             this.stopWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("stopWeigh.DownImage")));
             this.stopWeigh.Image = null;
             this.stopWeigh.IsShowBorder = true;
-            this.stopWeigh.Location = new System.Drawing.Point(943, 198);
+            this.stopWeigh.Location = new System.Drawing.Point(816, 194);
             this.stopWeigh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.stopWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("stopWeigh.MoveImage")));
             this.stopWeigh.Name = "stopWeigh";
@@ -335,7 +335,7 @@
             this.startWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("startWeigh.DownImage")));
             this.startWeigh.Image = null;
             this.startWeigh.IsShowBorder = true;
-            this.startWeigh.Location = new System.Drawing.Point(789, 198);
+            this.startWeigh.Location = new System.Drawing.Point(662, 194);
             this.startWeigh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.startWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("startWeigh.MoveImage")));
             this.startWeigh.Name = "startWeigh";
@@ -372,7 +372,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1222, 615);
+            this.ClientSize = new System.Drawing.Size(1094, 615);
             this.Controls.Add(this.label1);
             this.Controls.Add(this.sncode);
             this.Controls.Add(this.confirm);
@@ -395,7 +395,7 @@
             this.Name = "Packing_ProdWeightSet";
             this.Tag = "Packing!ProdWeightSet";
             this.Text = "Packing_ProdWeightSet";
-            this.AutoSizeChanged += new System.EventHandler(this.Packing_ProdWeightSet_AutoSizeChanged);
+            this.Load += new System.EventHandler(this.Packing_ProdWeightSet_Load);
             this.SizeChanged += new System.EventHandler(this.Packing_ProdWeightSet_SizeChanged);
             this.panel4.ResumeLayout(true);
             this.panel4.PerformLayout();