1

source/AssemblyLineClient/FrmLineStore.cs

@@ -674,6 +674,7 @@ namespace OnlineStore.AssemblyLine
         {
         {
             CodeLibrary.FrmCodeDecode frm = new CodeLibrary.FrmCodeDecode();
             CodeLibrary.FrmCodeDecode frm = new CodeLibrary.FrmCodeDecode();
             frm.ShowDialog();
             frm.ShowDialog();
+            frm.Dispose();
         }
         }
 
 
         private void button1_Click(object sender, EventArgs e)
         private void button1_Click(object sender, EventArgs e)

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -706,6 +706,7 @@ namespace OnlineStore.DeviceLibrary
                         if (!result.Equals(""))
                         if (!result.Equals(""))
                         {
                         {
                             InOutParam param = new InOutParam(currTrayNum, code, "", LastHeight, LastWidth, true);
                             InOutParam param = new InOutParam(currTrayNum, code, "", LastHeight, LastWidth, true);
+                            param.rfid = CurrShelfId;
                             TrayManager.UpdateTrayInfo(currTrayNum, true, ReelType.InStore, param, result);
                             TrayManager.UpdateTrayInfo(currTrayNum, true, ReelType.InStore, param, result);
                             //  TrayManager.UpdateInStoreNG(currTrayNum, true, result);
                             //  TrayManager.UpdateInStoreNG(currTrayNum, true, result);
                             LogUtil.error(Name + "托盘【" + currTrayNum + "】" + result);
                             LogUtil.error(Name + "托盘【" + currTrayNum + "】" + result);