章政 6 vuotta sitten
vanhempi
commit
5f0c39ad37
1 muutettua tiedostoa jossa 4 lisäystä ja 5 poistoa
  1. 4 5
      UAS-出货标签管理/UAS_出货标签管理.cs

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

@@ -2570,7 +2570,6 @@ namespace UAS_LabelMachine
         private void OPPOPlate_Click(object sender, EventArgs e)
         {
             StringBuilder strUpnList = new StringBuilder();
-            string date = System.DateTime.Now.ToString("yyMdd");
             for (int i = 0; i < LabelInf.Rows.Count; i++)
             {
                 if (i % PageCount == 0)
@@ -2581,23 +2580,23 @@ 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 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 = cuprodcode + "-" + "JW9591" + "-" + date + "-" + serial;
-                strUpnList.Append(@"{""upn_qr"":""@upn*@time*@MSD*@DC*@LN*@QC*@qty*@hd*@sw*@madein"",").Replace("@upn", cuprodcode + "-" + "JW9591" + "-" + date + "-" + serial)
+                string barcode = LabelInf.Rows[i].Cells["pib_custbarcode"].Value.ToString();
+                strUpnList.Append(@"{""upn_qr"":""@upn*@time*@MSD*@DC*@LN*@QC*@qty*@hd*@sw*@madein"",").Replace("@upn", barcode)
                     .Replace("@time", System.DateTime.Now.ToString("yyyyMMddhhmmssff")).Replace("@MSD", "").Replace("@DC", dc).Replace("@LN", ln)
                     .Replace("@QC", "").Replace("@qty", qty).Replace("@hd", "").Replace("@sw", "").Replace("@madein", madein);
                 strUpnList.Append(@"""upn"":""@upn"",").Replace("@upn", barcode);
                 strUpnList.Append(@"""vendor_code"":""JW9591"",");
                 strUpnList.Append(@"""mat_id"":""@mat_id"",").Replace("@mat_id", cuprodcode);
                 strUpnList.Append(@"""vendor_spec"":""@vendor_spec"",").Replace("@vendor_spec", vendprodcode);
-                strUpnList.Append(@"""wafer_factory"":""@wafer_factory"",").Replace("@wafer_factory", madein);
+                strUpnList.Append(@"""wafer_factory"":""@wafer_factory"",").Replace("@wafer_factory", wafer_factory);
                 strUpnList.Append(@"""pack_factory"":""@pack_factory"",").Replace("@pack_factory", madein);
                 strUpnList.Append(@"""dc"":""@dc"",").Replace("@dc", dc);
                 strUpnList.Append(@"""ln"":""@ln"",").Replace("@ln", ln);
                 strUpnList.Append(@"""qty"":@qty}").Replace("@qty", qty);
-                LabelInf.Rows[i].Cells["pib_custbarcode"].Value = barcode;
                 if (!((i != 0 && (i + 1) % PageCount == 0) || i == LabelInf.Rows.Count - 1))
                 {
                     strUpnList.Append(",");