对接VIVO接口调整BUG

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

@@ -2463,9 +2463,11 @@ namespace UAS_LabelMachine
                             string LotNo = LabelInf.Rows[i].Cells["pib_lotno"].Value.ToString();
                             string OrderCode = LabelInf.Rows[i].Cells["pr_vendprodcode"].Value.ToString();
                             string custprodcode = LabelInf.Rows[i].Cells["pd_custprodcode"].Value.ToString();
+                            string brand = LabelInf.Rows[i].Cells["pib_brand"].Value.ToString();
                             //通过接口获取Vivo料盘号
                             //string custbarcode = getPlateID.getCompID(Createcode, "", custprodcode, VenderCode, LotNo, DateCode, amount, OrderCode, "", "").Replace("T-", "");
-                            string custbarcode = BaseUtil.ToDictionary(getPlateID.getCompID_20190403("", custprodcode, VenderCode, "", amount, "新条码", OrderCode, LotNo, DateCode, VenderCode, pwd),"")["return_result"].ToString();
+                            string custbarcode = BaseUtil.ToDictionary(getPlateID.getCompID_20190403("", custprodcode, VenderCode, brand, amount, "新条码", OrderCode, LotNo, DateCode, VenderCode, pwd), "")["return_result"].ToString();
+                            getPlateID.SaveMrn_20190403("", custbarcode, LotNo, DateCode, OrderCode, "", VenderCode, pwd);
                             LabelInf.Rows[i].Cells["pib_cusbarcode"].Value = custbarcode;
                             //如果下一行的外箱号和当前行不一致
                             bool NextBoxDiff = false;