1

source/ACPackingStore/FrmBox.cs

@@ -17,6 +17,7 @@ using OnlineStore.DeviceLibrary;
 using System.IO.Ports;
 using System.IO.Ports;
 using OnlineStore.LoadCSVLibrary;
 using OnlineStore.LoadCSVLibrary;
 using CodeLibrary;
 using CodeLibrary;
+using System.Security.Cryptography;
 
 
 namespace OnlineStore.ACPackingStore
 namespace OnlineStore.ACPackingStore
 {
 {

source/DeviceLibrary/PackingStore/AC_BOX_Bean_AutoInOutTest.cs

@@ -397,6 +397,7 @@ namespace OnlineStore.DeviceLibrary
             AutoInOutPosTest = true;
             AutoInOutPosTest = true;
             StopAutoInOut = false;
             StopAutoInOut = false;
             CurPosIdx = 0;
             CurPosIdx = 0;
+            curPosIdxs.Clear();
             AddTestReel(out posId);
             AddTestReel(out posId);
             InOutParam param = new InOutParam();
             InOutParam param = new InOutParam();
             param.PosID = posId;
             param.PosID = posId;

source/DeviceLibrary/PackingStore/AC_BOX_Bean_OutStore.cs

@@ -415,18 +415,18 @@ namespace OnlineStore.DeviceLibrary
                     //    if (IsRightShelfId(CurrShelfID, MoveInfo.MoveParam.realRfid))
                     //    if (IsRightShelfId(CurrShelfID, MoveInfo.MoveParam.realRfid))
                     if (MoveInfo.MoveParam.rfid.Equals(LastRfidID))
                     if (MoveInfo.MoveParam.rfid.Equals(LastRfidID))
                     {
                     {
-                        if(MoveInfo.MoveParam.cutReel || MoveInfo.MoveParam.urgentReel)
-                        {
-                            //重新记录
-                            LogRunStepInfo($"【LastRfidID={LastRfidID}】【{MoveInfo.MoveParam.rfid}】 同料架，紧急料或者分盘料只放一个位置，送出当前料架，稍后重新出库");
-                            waitOutStoreList.Enqueue(MoveInfo.MoveParam);
-                            //   MoveInfo.MoveParam.rfid = LastRfidID;
-                            MoveInfo.NewMove(StoreMoveType.OutStore, LastOutParam);
-                            //送出料架，并且记录出库信息，等会重新出库
-                            StartShelfOut();
-                            return;
-                        }
-                        else
+                        //if(MoveInfo.MoveParam.cutReel || MoveInfo.MoveParam.urgentReel)
+                        //{
+                        //    //重新记录
+                        //    LogRunStepInfo($"【LastRfidID={LastRfidID}】【{MoveInfo.MoveParam.rfid}】 同料架，紧急料或者分盘料只放一个位置，送出当前料架，稍后重新出库");
+                        //    waitOutStoreList.Enqueue(MoveInfo.MoveParam);
+                        //    //   MoveInfo.MoveParam.rfid = LastRfidID;
+                        //    MoveInfo.NewMove(StoreMoveType.OutStore, LastOutParam);
+                        //    //送出料架，并且记录出库信息，等会重新出库
+                        //    StartShelfOut();
+                        //    return;
+                        //}
+                        //else
                         {
                         {
                             LogRunStepInfo($"【LastRfidID={LastRfidID}】【{MoveInfo.MoveParam.rfid}】 同料架，开始取料");
                             LogRunStepInfo($"【LastRfidID={LastRfidID}】【{MoveInfo.MoveParam.rfid}】 同料架，开始取料");
                             SO_03_ToBagPosition();
                             SO_03_ToBagPosition();

source/LoadCVSLibrary/position/CSVPositionReader.cs

@@ -187,11 +187,13 @@ namespace OnlineStore.LoadCSVLibrary
                 {
                 {
                     var result = AllPositionMap[tname][positionNum];
                     var result = AllPositionMap[tname][positionNum];
                     if (result == null) return null;
                     if (result == null) return null;
-                    int idx = AllPositionMap[tname].Values.ToList().FindIndex(s => s.PositionNum.Equals(positionNum) && s.BagWidth == result.BagWidth && s.BagHigh == result.BagHigh);//s => s.BagWidth == result.BagWidth && s.BagHigh == result.BagHigh
+                    var allsameSize = AllPositionMap[tname].Values.ToList().FindAll(s => s.BagWidth == result.BagWidth && s.BagHigh == result.BagHigh);//s => s.BagWidth == result.BagWidth && s.BagHigh == result.BagHigh
                     List<T> allPos = new List<T>();
                     List<T> allPos = new List<T>();
-                    for (int i = idx; i < AllPositionMap[tname].Values.Count; i++)
+                    if (allsameSize == null || allsameSize.Count == 0) { return null; }
+                    int idx = allsameSize.FindIndex(s => s.PositionNum.Equals(positionNum));
+                    for (int i = idx; i < allsameSize.Count; i++)
                     {
                     {
-                        allPos.Add(AllPositionMap[tname].Values.ToArray()[i]);
+                        allPos.Add(allsameSize.ToArray()[i]);
                     }
                     }
                     return allPos;
                     return allPos;
                 }
                 }