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

UAS-出货标签管理(吉利通)/ParamSetting.Designer.cs

@@ -117,7 +117,6 @@
             this.label33 = new System.Windows.Forms.Label();
             this.label32 = new System.Windows.Forms.Label();
             this.label31 = new System.Windows.Forms.Label();
-            this.normalButton1 = new UAS_LabelMachine.CustomControl.NormalButton();
             this.GP.SuspendLayout();
             this.GP5.SuspendLayout();
             this.GP4.SuspendLayout();
@@ -678,7 +677,7 @@
             // DeviceStop
             // 
             this.DeviceStop.ID = null;
-            this.DeviceStop.Location = new System.Drawing.Point(676, 76);
+            this.DeviceStop.Location = new System.Drawing.Point(676, 75);
             this.DeviceStop.Name = "DeviceStop";
             this.DeviceStop.Size = new System.Drawing.Size(95, 21);
             this.DeviceStop.Str = null;
@@ -711,7 +710,7 @@
             // DeviceStart
             // 
             this.DeviceStart.ID = null;
-            this.DeviceStart.Location = new System.Drawing.Point(676, 41);
+            this.DeviceStart.Location = new System.Drawing.Point(676, 42);
             this.DeviceStart.Name = "DeviceStart";
             this.DeviceStart.Size = new System.Drawing.Size(95, 21);
             this.DeviceStart.Str = null;
@@ -751,7 +750,7 @@
             // BackDataPass
             // 
             this.BackDataPass.ID = null;
-            this.BackDataPass.Location = new System.Drawing.Point(421, 139);
+            this.BackDataPass.Location = new System.Drawing.Point(421, 141);
             this.BackDataPass.Name = "BackDataPass";
             this.BackDataPass.Size = new System.Drawing.Size(95, 21);
             this.BackDataPass.Str = null;
@@ -780,7 +779,7 @@
             // label25
             // 
             this.label25.AutoSize = true;
-            this.label25.Location = new System.Drawing.Point(272, 82);
+            this.label25.Location = new System.Drawing.Point(272, 79);
             this.label25.Name = "label25";
             this.label25.Size = new System.Drawing.Size(143, 12);
             this.label25.TabIndex = 3;
@@ -798,7 +797,7 @@
             // BackDataDelete
             // 
             this.BackDataDelete.ID = null;
-            this.BackDataDelete.Location = new System.Drawing.Point(421, 112);
+            this.BackDataDelete.Location = new System.Drawing.Point(421, 109);
             this.BackDataDelete.Name = "BackDataDelete";
             this.BackDataDelete.Size = new System.Drawing.Size(95, 21);
             this.BackDataDelete.Str = null;
@@ -818,7 +817,7 @@
             // label26
             // 
             this.label26.AutoSize = true;
-            this.label26.Location = new System.Drawing.Point(272, 113);
+            this.label26.Location = new System.Drawing.Point(272, 112);
             this.label26.Name = "label26";
             this.label26.Size = new System.Drawing.Size(143, 12);
             this.label26.TabIndex = 4;
@@ -845,7 +844,7 @@
             // label30
             // 
             this.label30.AutoSize = true;
-            this.label30.Location = new System.Drawing.Point(542, 113);
+            this.label30.Location = new System.Drawing.Point(542, 114);
             this.label30.Name = "label30";
             this.label30.Size = new System.Drawing.Size(59, 12);
             this.label30.TabIndex = 8;
@@ -854,7 +853,7 @@
             // FrontDataPass
             // 
             this.FrontDataPass.ID = null;
-            this.FrontDataPass.Location = new System.Drawing.Point(421, 77);
+            this.FrontDataPass.Location = new System.Drawing.Point(421, 75);
             this.FrontDataPass.Name = "FrontDataPass";
             this.FrontDataPass.Size = new System.Drawing.Size(95, 21);
             this.FrontDataPass.Str = null;
@@ -885,7 +884,7 @@
             // label29
             // 
             this.label29.AutoSize = true;
-            this.label29.Location = new System.Drawing.Point(542, 82);
+            this.label29.Location = new System.Drawing.Point(542, 79);
             this.label29.Name = "label29";
             this.label29.Size = new System.Drawing.Size(59, 12);
             this.label29.TabIndex = 7;
@@ -919,7 +918,7 @@
             // SplitBack
             // 
             this.SplitBack.ID = null;
-            this.SplitBack.Location = new System.Drawing.Point(755, 105);
+            this.SplitBack.Location = new System.Drawing.Point(755, 106);
             this.SplitBack.Name = "SplitBack";
             this.SplitBack.Size = new System.Drawing.Size(53, 21);
             this.SplitBack.Str = null;
@@ -963,7 +962,7 @@
             // SplitFront
             // 
             this.SplitFront.ID = null;
-            this.SplitFront.Location = new System.Drawing.Point(467, 14);
+            this.SplitFront.Location = new System.Drawing.Point(467, 29);
             this.SplitFront.Name = "SplitFront";
             this.SplitFront.Size = new System.Drawing.Size(104, 21);
             this.SplitFront.Str = null;
@@ -996,7 +995,7 @@
             // ProdcodeFront
             // 
             this.ProdcodeFront.ID = null;
-            this.ProdcodeFront.Location = new System.Drawing.Point(166, 14);
+            this.ProdcodeFront.Location = new System.Drawing.Point(166, 29);
             this.ProdcodeFront.Name = "ProdcodeFront";
             this.ProdcodeFront.Size = new System.Drawing.Size(142, 21);
             this.ProdcodeFront.Str = null;
@@ -1034,7 +1033,7 @@
             // label36
             // 
             this.label36.AutoSize = true;
-            this.label36.Location = new System.Drawing.Point(318, 115);
+            this.label36.Location = new System.Drawing.Point(318, 110);
             this.label36.Name = "label36";
             this.label36.Size = new System.Drawing.Size(143, 12);
             this.label36.TabIndex = 7;
@@ -1052,7 +1051,7 @@
             // label1212
             // 
             this.label1212.AutoSize = true;
-            this.label1212.Location = new System.Drawing.Point(320, 17);
+            this.label1212.Location = new System.Drawing.Point(320, 32);
             this.label1212.Name = "label1212";
             this.label1212.Size = new System.Drawing.Size(131, 12);
             this.label1212.TabIndex = 5;
@@ -1079,28 +1078,17 @@
             // label31
             // 
             this.label31.AutoSize = true;
-            this.label31.Location = new System.Drawing.Point(5, 17);
+            this.label31.Location = new System.Drawing.Point(5, 32);
             this.label31.Name = "label31";
             this.label31.Size = new System.Drawing.Size(155, 12);
             this.label31.TabIndex = 2;
             this.label31.Text = "货品型号数据列(前端采集):";
             // 
-            // normalButton1
-            // 
-            this.normalButton1.Image = ((System.Drawing.Image)(resources.GetObject("normalButton1.Image")));
-            this.normalButton1.Location = new System.Drawing.Point(18, 531);
-            this.normalButton1.Name = "normalButton1";
-            this.normalButton1.Size = new System.Drawing.Size(93, 23);
-            this.normalButton1.TabIndex = 5;
-            this.normalButton1.Text = "刷新条码规则";
-            this.normalButton1.UseVisualStyleBackColor = true;
-            // 
             // ParamSetting
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(847, 561);
-            this.Controls.Add(this.normalButton1);
+            this.ClientSize = new System.Drawing.Size(847, 532);
             this.Controls.Add(this.GPD2);
             this.Controls.Add(this.GPD1);
             this.Controls.Add(this.Save);
@@ -1180,7 +1168,6 @@
         private System.Windows.Forms.Label label19;
         private System.Windows.Forms.Label label18;
         private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder GPD2;
-        private CustomControl.NormalButton normalButton1;
         private System.Windows.Forms.Label SplitFro;
         private System.Windows.Forms.Label label37;
         private System.Windows.Forms.Label label36;

UAS-出货标签管理(吉利通)/ParamSetting.resx

@@ -128,18 +128,6 @@
         w4gTK17MuLHjow0iS55MubLly5gza958lIHnz6BDix5NurTp06iPGljNurXr17Bjy55Nu/bRALhz697N
         u7fv38CDCz9aoLjx48iTK1/OvLnz50cBSJ9Ovbr169iza9/O/eiA7+DDi0EfT768+fPo0x+FwL69+/fw
         48ufT7++/fX28+vfzz/+UQIABijggAQWaOCBCCao4FEaNejggxBG1NCEFFZoIUIBAQA7
-</value>
-  </data>
-  <data name="normalButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhUgAXAIQAAK/G1qjB1dzn6bTK2MfZ46rE1arD1/D4+/n//d/o7/X6/ez1/K7D1tLj6+Pt9ubx
-        877S3fT09DxZeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQAAAAAACwAAAAAUgAXAAAI/wAlCBxIsKDBgwgTKlzIsGCEhxAjSpxIsaLFixgzPhQY
-        AYHHjyBDihxJsqTJkygjcFTAsqXLlzBjypxJs6ZNlRIiHNjJs6fPn0CDCh1KtCjOCAuSKl3KtKnTp1Cj
-        Sp169IHVq1izat3KtavXr2Crgh1LtqzZrUcdqF3Ltq3bt3Djyp1L92iCu3jz6t3Lt6/fv4ADHxVAuLDh
-        w4gTK17MuLHjow0iS55MubLly5gza958lIHnz6BDix5NurTp06iPGljNurXr17Bjy55Nu/bRALhz697N
-        u7fv38CDCz9aoLjx48iTK1/OvLnz50cBSJ9Ovbr169iza9/O/eiA7+DDi0EfT768+fPo0x+FwL69+/fw
-        48ufT7++/fX28+vfzz/+UQIABijggAQWaOCBCCao4FEaNejggxBG1NCEFFZoIUIBAQA7
 </value>
   </data>
 </root>

UAS-出货标签管理(吉利通)/UAS_出货标签管理.cs

@@ -355,18 +355,6 @@ namespace UAS_LabelMachine
                 if (MidLabelAutoPrint.Checked)
                     AutoPrintMidLabel();
             }
-            //采集未通过的时候
-            else
-            {
-                //如果自动采集采集未成功需要移动到下一行
-                if (!AutoMatch.Checked)
-                    SetRowIndexToCollectRow();
-            }
-            //未勾选自动匹配，设置到下一个未采集的行
-            if (!AutoMatch.Checked)
-                SetRowIndexToCollectRow();
-            //提醒用户需要采集的数据
-            RemindUser();
             RefreshProcessData();
             MessageLog.AppendText(">>扫描到数据" + BackCheck.Text + "\n", Color.Blue);
             //如果所采集的行的物料不一样的话，重新计算箱内容量
@@ -377,21 +365,6 @@ namespace UAS_LabelMachine
             }
         }
 
-        //设置行的索引到当前需要采集的行
-        private void SetRowIndexToCollectRow()
-        {
-            //获取当前需要采集的行
-            for (int i = CurrentRowIndex; i < LabelInf.RowCount; i++)
-            {
-                if (LabelInf.Rows[i].Cells["pib_ifpick"].FormattedValue.ToString() != "True")
-                {
-                    griddetno.Text = LabelInf.Rows[i].Cells["pib_pdno"].FormattedValue.ToString();
-                    CurrentRowIndex = LabelInf.Rows[i].Cells["pib_prodcode"].RowIndex;
-                    break;
-                }
-            }
-        }
-
         private void AutoPrintSingleLabel()
         {
             //用标签本身的变量作为最外层的循环条件去匹配;
@@ -424,14 +397,6 @@ namespace UAS_LabelMachine
             LabelInf.Rows[CurrentRowIndex].Cells["pib_ifprint"].Value = true;
         }
 
-        /// <summary>
-        /// 提醒用户当前采集的项目
-        /// </summary>
-        private void RemindUser()
-        {
-            SetRowIndexToCollectRow();
-        }
-
         //
         /// <summary>
         /// 设置外箱号
@@ -1115,13 +1080,10 @@ namespace UAS_LabelMachine
                     if (LabelInf.Rows[CurrentRowIndex].Cells["pib_outboxcode1"].Value.ToString() == LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString())
                         CurrentMidBoxTotalCount++;
                 }
-                Capacity.Text = "可装" + CurrentMidBoxTotalCount + "盘";
-                Installed.Text = "已装" + CurrentMidBoxCollectedCount + "盘";
                 //设置当前的箱号和盒号
                 Process_outboxcode.Text = LabelInf.Rows[CurrentRowIndex].Cells["pib_outboxcode2"].Value.ToString();
                 Process_midboxcode.Text = LabelInf.Rows[CurrentRowIndex].Cells["pib_outboxcode1"].Value.ToString();
                 //设置当前总数和已采集数量
-                TotalCount.Text = LabelInf.RowCount.ToString();
                 CollectedCount.Text = Count.ToString();
             }
         }
@@ -1158,8 +1120,6 @@ namespace UAS_LabelMachine
             }
             MidSource.DataSource = dt;
             BaseUtil.FillDgvWithDataTable(LabelInf, (DataTable)MidSource.DataSource);
-            //有数据的话默认取第一条的品牌去取采集策略
-            TotalCount.Text = LabelInf.RowCount.ToString();
             if (LabelInf.RowCount > 0)
             {
                 Brand = LabelInf.Rows[0].Cells["pib_brand"].FormattedValue.ToString();
@@ -1189,8 +1149,6 @@ namespace UAS_LabelMachine
             {
                 if (LabelInf.Rows[i].Cells["pib_ifpick"].FormattedValue.ToString() != "True")
                 {
-                    griddetno.Text = LabelInf.Rows[i].Cells["pib_pdno"].FormattedValue.ToString();
-                    pib_id.Text = LabelInf.Rows[i].Cells["pib_id1"].FormattedValue.ToString();
                     CurrentRowIndex = LabelInf.Rows[i].Cells["pib_prodcode"].RowIndex;
                     break;
                 }
@@ -1281,34 +1239,6 @@ namespace UAS_LabelMachine
             pi_inoutno_KeyDown(sender, e2);
         }
 
-        /// <summary>
-        /// 采集明细切换
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void griddetno_KeyDown(object sender, KeyEventArgs e)
-        {
-            if (Keys.Enter == e.KeyData)
-            {
-                bool FindDetno = false;
-                for (int i = 0; i < LabelInf.RowCount; i++)
-                {
-                    if (LabelInf.Rows[i].Cells["pib_pdno"].Value.ToString() == griddetno.Text && LabelInf.Rows[i].Cells["pib_ifpick"].FormattedValue.ToString() != "True")
-                    {
-                        FindDetno = true;
-                        CurrentRowIndex = i;
-                        RemindUser();
-                        break;
-                    }
-                }
-                if (!FindDetno)
-                {
-                    MessageBox.Show("不存在未采集的明细序号" + griddetno.Text);
-                    return;
-                }
-            }
-        }
-
         private void AutoPrintMidLabel()
         {
             bool FullBox = true;

UAS-出货标签管理(吉利通)/UAS_出货标签管理.resx

@@ -117,14 +117,14 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="RefreshDBConnect.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
+  <metadata name="ExportFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>294, 17</value>
   </metadata>
   <metadata name="MidSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>179, 17</value>
   </metadata>
-  <metadata name="ExportFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>294, 17</value>
+  <metadata name="RefreshDBConnect.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
   </metadata>
   <metadata name="pib_ifmodify.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
@@ -159,12 +159,12 @@
   <metadata name="pr_spec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="FrontendCheck.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>442, 17</value>
-  </metadata>
   <metadata name="BackendCheck.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>584, 18</value>
   </metadata>
+  <metadata name="FrontendCheck.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>442, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>