Jelajahi Sumber

生成条码加产地

章政 6 tahun lalu
induk
melakukan
8eafa0f570

+ 2 - 2
UAS-出货标签管理/PublicMethod/HttpCommand.cs

@@ -321,7 +321,7 @@ namespace UAS_LabelMachine.PublicMethod
         /// <param name="esbSecret"></param>
         /// <param name="strUpnlist"></param>
         /// <returns></returns>
-        public String deleteUpnInfo(string esbUrl, string appId, string esbSecret, string strUpnlist)
+        public String deleteUpnInfo(string esbUrl, string appId, string esbSecret, string strUpnlist,int num)
         {
             //string uri = "/mes/basics/wms_battery_info_insert";
             string uri = "/mes/extranet/mes_vendor_upn_inspection_to_del_insert";
@@ -345,7 +345,7 @@ namespace UAS_LabelMachine.PublicMethod
 
             parameters.Add("app_id", appId);
             //parameters.Add("timestamp", ConvertTimeStamp(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")));         
-            parameters.Add("upn_amount", "2");
+            parameters.Add("upn_amount", num.ToString());
             parameters.Add("upn_info", strUpnlist);    //inspection_info     test_info
             parameters.Add("timestamp", ConvertTimeStamp(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")));
 

+ 20 - 4
UAS-出货标签管理/UAS_出货标签管理.Designer.cs

@@ -180,6 +180,7 @@
             this.OutBoxLabelPrint = new System.Windows.Forms.Button();
             this.OutBoxLabelAutoPrint = new System.Windows.Forms.CheckBox();
             this.OutBoxCombox = new System.Windows.Forms.ComboBox();
+            this.CancelOPPOPlate = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.Si_ItemDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).BeginInit();
             this.groupBoxWithBorder1.SuspendLayout();
@@ -1407,6 +1408,7 @@
             // 
             // SingleLabel
             // 
+            this.SingleLabel.Controls.Add(this.CancelOPPOPlate);
             this.SingleLabel.Controls.Add(this.OPPOPlate);
             this.SingleLabel.Controls.Add(this.ViVoPlate);
             this.SingleLabel.Controls.Add(this.SingleLabelPrinter);
@@ -1427,12 +1429,12 @@
             // 
             this.OPPOPlate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.OPPOPlate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OPPOPlate.Location = new System.Drawing.Point(68, 132);
+            this.OPPOPlate.Location = new System.Drawing.Point(10, 138);
             this.OPPOPlate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OPPOPlate.Name = "OPPOPlate";
             this.OPPOPlate.Size = new System.Drawing.Size(80, 26);
             this.OPPOPlate.TabIndex = 42;
-            this.OPPOPlate.Text = "Oppo料盘";
+            this.OPPOPlate.Text = "上传Oppo";
             this.OPPOPlate.UseVisualStyleBackColor = true;
             this.OPPOPlate.Click += new System.EventHandler(this.OPPOPlate_Click);
             // 
@@ -1440,7 +1442,7 @@
             // 
             this.ViVoPlate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.ViVoPlate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ViVoPlate.Location = new System.Drawing.Point(68, 164);
+            this.ViVoPlate.Location = new System.Drawing.Point(7, 202);
             this.ViVoPlate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ViVoPlate.Name = "ViVoPlate";
             this.ViVoPlate.Size = new System.Drawing.Size(68, 26);
@@ -1462,7 +1464,7 @@
             // 
             this.SingleLabelPrint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.SingleLabelPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabelPrint.Location = new System.Drawing.Point(68, 199);
+            this.SingleLabelPrint.Location = new System.Drawing.Point(80, 202);
             this.SingleLabelPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.SingleLabelPrint.Name = "SingleLabelPrint";
             this.SingleLabelPrint.Size = new System.Drawing.Size(68, 26);
@@ -1765,6 +1767,19 @@
             this.OutBoxCombox.TabIndex = 78;
             this.OutBoxCombox.SelectedIndexChanged += new System.EventHandler(this.OutBoxCombox_SelectedIndexChanged);
             // 
+            // CancelOPPOPlate
+            // 
+            this.CancelOPPOPlate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.CancelOPPOPlate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.CancelOPPOPlate.Location = new System.Drawing.Point(10, 169);
+            this.CancelOPPOPlate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.CancelOPPOPlate.Name = "CancelOPPOPlate";
+            this.CancelOPPOPlate.Size = new System.Drawing.Size(80, 26);
+            this.CancelOPPOPlate.TabIndex = 43;
+            this.CancelOPPOPlate.Text = "取消Oppo";
+            this.CancelOPPOPlate.UseVisualStyleBackColor = true;
+            this.CancelOPPOPlate.Click += new System.EventHandler(this.CancelOPPOPlate_Click);
+            // 
             // UAS_出货标签打印
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1992,5 +2007,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode1;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode2;
         private CustomControl.SearchTextBox cu_code;
+        private System.Windows.Forms.Button CancelOPPOPlate;
     }
 }

+ 49 - 1
UAS-出货标签管理/UAS_出货标签管理.cs

@@ -232,9 +232,15 @@ namespace UAS_LabelMachine
                 pib_cusoutboxcode.Visible = false;
                 ViVoPlate.Visible = false;
                 OPPOPlate.Visible = false;
+                CancelOPPOPlate.Visible = false;
                 OutBoxLabelPackage.Visible = false;
                 //GetOutBoxCode.Visible = false;
             }
+            else
+            {
+                pib_barcode.HeaderText = "REEL ID";
+                pib_custbarcode.HeaderText = "UPN";
+            }
             asc.controllInitializeSize(this);
             asc.controlAutoSize(this);
             //实例化打印进程
@@ -2580,7 +2586,7 @@ namespace UAS_LabelMachine
                 string vendprodcode = LabelInf.Rows[i].Cells["pr_vendprodcode"].Value.ToString();
                 string madein = LabelInf.Rows[i].Cells["pib_madein"].Value.ToString();
                 string dc = LabelInf.Rows[i].Cells["pib_datecode"].Value.ToString();
-                string wafer_factory= LabelInf.Rows[i].Cells["pib_barcode"].Value.ToString();
+                string wafer_factory = LabelInf.Rows[i].Cells["pib_barcode"].Value.ToString();
                 string ln = LabelInf.Rows[i].Cells["pib_lotno"].Value.ToString();
                 string qty = LabelInf.Rows[i].Cells["pib_qty"].Value.ToString();
                 string serial = BaseUtil.lpad(5, (i + 1).ToString());
@@ -2624,5 +2630,47 @@ namespace UAS_LabelMachine
             if (!InitGetLabel)
                 GetInOutInfAndLabelFile();
         }
+
+        private void CancelOPPOPlate_Click(object sender, EventArgs e)
+        {
+            StringBuilder strUpnList = new StringBuilder();
+            for (int i = 0; i < LabelInf.Rows.Count; i++)
+            {
+                if (i % PageCount == 0)
+                {
+                    strUpnList.Append("[");
+                }
+                string cuprodcode = LabelInf.Rows[i].Cells["pd_custprodcode"].Value.ToString();
+                string vendprodcode = LabelInf.Rows[i].Cells["pr_vendprodcode"].Value.ToString();
+                string madein = LabelInf.Rows[i].Cells["pib_madein"].Value.ToString();
+                string dc = LabelInf.Rows[i].Cells["pib_datecode"].Value.ToString();
+                string wafer_factory = LabelInf.Rows[i].Cells["pib_barcode"].Value.ToString();
+                string ln = LabelInf.Rows[i].Cells["pib_lotno"].Value.ToString();
+                string qty = LabelInf.Rows[i].Cells["pib_qty"].Value.ToString();
+                string serial = BaseUtil.lpad(5, (i + 1).ToString());
+                string barcode = LabelInf.Rows[i].Cells["pib_custbarcode"].Value.ToString();
+                strUpnList.Append(@"{""upn"":""@upn"",").Replace("@upn", barcode);
+                strUpnList.Append(@"""vendor_code"":""JW9591""}");
+                if (!((i != 0 && (i + 1) % PageCount == 0) || i == LabelInf.Rows.Count - 1))
+                {
+                    strUpnList.Append(",");
+                }
+                if ((i != 0 && (i + 1) % PageCount == 0) || i == LabelInf.Rows.Count - 1)
+                {
+                    strUpnList.Append("]");
+                    string strmsginsert = hc.deleteUpnInfo("https://api.myoas.com", AppId, Secret, strUpnList.ToString(), (i + 1) % PageCount == 0 ? PageCount : (i + 1) % PageCount);
+                    Dictionary<string, object> dic = BaseUtil.ToDictionary(strmsginsert);
+                    if (dic["code"].ToString().Replace("\"", "") != "200")
+                    {
+                        MessageLog.AppendText(dic["msg"] + "\n", Color.Red);
+                    }
+                    else
+                    {
+                        MessageLog.AppendText("取消成功", Color.Green);
+                    }
+                    strUpnList.Clear();
+                }
+            }
+        }
     }
 }

+ 21 - 12
UAS-出货标签管理/生成条码.Designer.cs

@@ -35,6 +35,7 @@
             this.pr_kind_label = new System.Windows.Forms.Label();
             this.pr_kind = new System.Windows.Forms.ComboBox();
             this.MidCapacity_label = new System.Windows.Forms.Label();
+            this.ResetSerialNum = new UAS_LabelMachine.CustomControl.NormalButton();
             this.SetMidCapacity = new UAS_LabelMachine.CustomControl.NormalButton();
             this.MidCapacity = new UAS_LabelMachine.CustomControl.NumOnlyTextBox();
             this.ChooseAll = new UAS_LabelMachine.CustomControl.ChooseAllButton();
@@ -42,7 +43,6 @@
             this.Screen = new UAS_LabelMachine.CustomControl.NormalButton();
             this.ProdIoInfDGV = new UAS_LabelMachine.CustomControl.DataGridViewWithSerialNum();
             this.pi_inoutno = new UAS_LabelMachine.CustomControl.EnterTextBox();
-            this.ResetSerialNum = new UAS_LabelMachine.CustomControl.NormalButton();
             this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.pd_orderdetno = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -52,6 +52,7 @@
             this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_ordercode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_madein = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_unit = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_totalqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -125,6 +126,17 @@
             this.MidCapacity_label.TabIndex = 158;
             this.MidCapacity_label.Text = "中盘容量";
             // 
+            // ResetSerialNum
+            // 
+            this.ResetSerialNum.Image = ((System.Drawing.Image)(resources.GetObject("ResetSerialNum.Image")));
+            this.ResetSerialNum.Location = new System.Drawing.Point(529, 78);
+            this.ResetSerialNum.Name = "ResetSerialNum";
+            this.ResetSerialNum.Size = new System.Drawing.Size(64, 24);
+            this.ResetSerialNum.TabIndex = 161;
+            this.ResetSerialNum.Text = "流水重置";
+            this.ResetSerialNum.UseVisualStyleBackColor = true;
+            this.ResetSerialNum.Click += new System.EventHandler(this.ResetSerialNum_Click);
+            // 
             // SetMidCapacity
             // 
             this.SetMidCapacity.Image = ((System.Drawing.Image)(resources.GetObject("SetMidCapacity.Image")));
@@ -193,6 +205,7 @@
             this.pr_detail,
             this.pd_ordercode,
             this.pr_spec,
+            this.pr_madein,
             this.pr_brand,
             this.pr_unit,
             this.pd_totalqty,
@@ -223,17 +236,6 @@
             this.pi_inoutno.Tag = "cu_name";
             this.pi_inoutno.KeyDown += new System.Windows.Forms.KeyEventHandler(this.bi_inoutno_KeyDown);
             // 
-            // ResetSerialNum
-            // 
-            this.ResetSerialNum.Image = ((System.Drawing.Image)(resources.GetObject("ResetSerialNum.Image")));
-            this.ResetSerialNum.Location = new System.Drawing.Point(529, 78);
-            this.ResetSerialNum.Name = "ResetSerialNum";
-            this.ResetSerialNum.Size = new System.Drawing.Size(64, 24);
-            this.ResetSerialNum.TabIndex = 161;
-            this.ResetSerialNum.Text = "流水重置";
-            this.ResetSerialNum.UseVisualStyleBackColor = true;
-            this.ResetSerialNum.Click += new System.EventHandler(this.ResetSerialNum_Click);
-            // 
             // Choose
             // 
             this.Choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
@@ -297,6 +299,12 @@
             this.pr_spec.Name = "pr_spec";
             this.pr_spec.ReadOnly = true;
             // 
+            // pr_madein
+            // 
+            this.pr_madein.DataPropertyName = "pr_madein";
+            this.pr_madein.HeaderText = "产地";
+            this.pr_madein.Name = "pr_madein";
+            // 
             // pr_brand
             // 
             this.pr_brand.DataPropertyName = "pr_brand";
@@ -406,6 +414,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_detail;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_ordercode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_madein;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_brand;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_unit;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_totalqty;

+ 7 - 6
UAS-出货标签管理/生成条码.cs

@@ -189,6 +189,7 @@ namespace UAS_LabelMachine
                     string pd_pdno = ProdIoInfDGV.Rows[i].Cells["pd_pdno"].FormattedValue.ToString();
                     string pd_orderdetno = ProdIoInfDGV.Rows[i].Cells["pd_orderdetno"].FormattedValue.ToString();
                     string pr_brand = ProdIoInfDGV.Rows[i].Cells["pr_brand"].FormattedValue.ToString();
+                    string pr_madein = ProdIoInfDGV.Rows[i].Cells["pr_madein"].FormattedValue.ToString();
                     //总数
                     int pd_totalqty = int.Parse(ProdIoInfDGV.Rows[i].Cells["pd_totalqty"].FormattedValue.ToString());
                     //本次数量
@@ -248,9 +249,9 @@ namespace UAS_LabelMachine
                     {
                         //插入条码
                         sql.Clear();
-                        sql.Append("insert into prodiobarcode (PIB_ID,PIB_PRODCODE,PIB_INDATE,PIB_INOUTNO,PIB_PIID,pib_brand,PIB_BARCODE,PIB_CUSTBARCODE,PIB_PDNO,");
+                        sql.Append("insert into prodiobarcode (PIB_ID,PIB_PRODCODE,PIB_INDATE,PIB_MADEIN,PIB_INOUTNO,PIB_PIID,pib_brand,PIB_BARCODE,PIB_CUSTBARCODE,PIB_PDNO,");
                         sql.Append("PIB_PDID,PIB_PICLASS,PIB_QTY,PIB_PRODID,PIB_OUTBOXCODE1,PIB_IFPRINT,PIB_IFPICK,PIB_ORDERCODE,PIB_CUSTPO,pib_orderdetno)");
-                        sql.Append(" values (prodiobarcode_seq.nextval,'" + pd_prodcode + "',sysdate,'" + pi_inoutno.Text + "'," + pi_id + ",'" + pr_brand + "',:barcode,:custbarcode,'" + pd_pdno + "','" + pd_id + "',");
+                        sql.Append(" values (prodiobarcode_seq.nextval,'" + pd_prodcode + "',sysdate,'"+ pr_madein + "','" + pi_inoutno.Text + "'," + pi_id + ",'" + pr_brand + "',:barcode,:custbarcode,'" + pd_pdno + "','" + pd_id + "',");
                         sql.Append("'" + pi_class.Text + "',:pib_inqty,'" + pr_id + "',:midcode,0,0,'" + pd_ordercode + "','','" + pd_orderdetno + "')");
                         dh.BatchInsert(sql.ToString(), new string[] { "barcode", "custbarcode", "pib_inqty", "midcode" }, barcode.ToArray(), custbarcode.ToArray(), pib_inqty.ToArray(), midcode.ToArray());
                         //更新最大流水号
@@ -449,8 +450,8 @@ namespace UAS_LabelMachine
                 {
                     case "出货单":
                         sql.Clear();
-                        sql.Append("select pd_piid,pd_id,pr_id,pr_brand,pr_unit,pr_detail,pr_spec,pr_zxbzs,outqty pd_totalqty,pd_ordercode,pd_orderdetno,pd_pdno,pd_prodcode,");
-                        sql.Append("pd_piclass,pd_qty from (select pd_piid,pd_id,pr_id,pr_brand,pr_unit,pr_detail,pr_spec,pr_zxbzs,outqty,pd_ordercode,pd_orderdetno,pd_pdno,");
+                        sql.Append("select pd_piid,pd_id,pr_id,pr_brand,pr_madein,pr_unit,pr_detail,pr_spec,pr_zxbzs,outqty pd_totalqty,pd_ordercode,pd_orderdetno,pd_pdno,pd_prodcode,");
+                        sql.Append("pd_piclass,pd_qty from (select pd_piid,pd_id,pr_id,pr_brand,pr_madein,pr_unit,pr_detail,pr_spec,pr_zxbzs,outqty,pd_ordercode,pd_orderdetno,pd_pdno,");
                         sql.Append("pd_prodcode,pd_piclass,outqty-nvl((select sum(nvl(pib_qty,0)) from PRODIOBARCODE where PIB_PIID=pd_piid and pib_pdno=pd_pdno ),0)pd_qty ");
                         sql.Append("from (select pd_piid,min(pd_id) pd_id,sum(pd_outqty)outqty,pd_ordercode,pd_orderdetno,pd_pdno,max(pd_prodcode)pd_prodcode,max(pd_piclass)pd_piclass ");
                         sql.Append("from prodiodetail  group by pd_piid,pd_ordercode, pd_orderdetno,pd_pdno)T left join product ");
@@ -458,8 +459,8 @@ namespace UAS_LabelMachine
                         break;
                     case "完工入库单":
                         sql.Clear();
-                        sql.Append("select pd_piid,pd_id,pr_id,pr_brand,pr_unit,pr_detail,pr_spec,pr_zxbzs,inqty pd_totalqty,pd_ordercode,pd_orderdetno,pd_pdno,pd_prodcode,");
-                        sql.Append("pd_piclass,pd_qty from (select pd_piid,pd_id,pr_id,pr_brand,pr_unit,pr_detail,pr_spec,pr_zxbzs,inqty,pd_ordercode,pd_orderdetno,pd_pdno,");
+                        sql.Append("select pd_piid,pd_id,pr_id,pr_brand,pr_madein,pr_unit,pr_detail,pr_spec,pr_zxbzs,inqty pd_totalqty,pd_ordercode,pd_orderdetno,pd_pdno,pd_prodcode,");
+                        sql.Append("pd_piclass,pd_qty from (select pd_piid,pd_id,pr_id,pr_brand,pr_madein,pr_unit,pr_detail,pr_spec,pr_zxbzs,inqty,pd_ordercode,pd_orderdetno,pd_pdno,");
                         sql.Append("pd_prodcode,pd_piclass,inqty-nvl((select sum(nvl(pib_qty,0)) from PRODIOBARCODE where PIB_PIID=pd_piid and pib_pdno=pd_pdno ),0)pd_qty ");
                         sql.Append("from (select pd_piid,min(pd_id) pd_id,sum(pd_inqty)inqty,pd_ordercode,pd_orderdetno,pd_pdno,max(pd_prodcode)pd_prodcode,max(pd_piclass)pd_piclass ");
                         sql.Append("from prodiodetail  group by pd_piid,pd_ordercode, pd_orderdetno,pd_pdno)T left join product ");

+ 15 - 12
UAS-出货标签管理/生成条码.resx

@@ -118,6 +118,18 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="ResetSerialNum.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>
   <data name="SetMidCapacity.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
@@ -181,6 +193,9 @@
   <metadata name="pr_spec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pr_madein.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="pr_brand.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -205,16 +220,4 @@
   <metadata name="mid_remain.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <data name="ResetSerialNum.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>