NG料bug修改

source/DeviceLibrary/server/BoxInfo.cs

@@ -76,6 +76,6 @@ namespace OnlineStore.DeviceLibrary
         /// <summary>
         /// <summary>
         /// 当前出入库的库位号
         /// 当前出入库的库位号
         /// </summary>
         /// </summary>
-        public string CurrPosId { get; set; }
+        public string CurrPosId = "";
     }
     }
 }
 }

source/DeviceLibrary/server/LineServer.cs

@@ -99,7 +99,9 @@ namespace OnlineStore.DeviceLibrary
                     if (runs.Equals(LineRunStatus.Busy))
                     if (runs.Equals(LineRunStatus.Busy))
                     {
                     {
                         bool isOutP = status.Equals(LineStatus.OutStoreExecute) || status.Equals(LineStatus.OutStoreBoxEnd);
                         bool isOutP = status.Equals(LineStatus.OutStoreExecute) || status.Equals(LineStatus.OutStoreBoxEnd);
-                        if ((isOutP && box.CurrPosId.Equals(posId)) || box.WaitInStoreList.Contains(posId))
+                        if ((isOutP && box.CurrPosId.Equals(posId)) ||
+                            (isOutP && String.IsNullOrEmpty(posId) && String.IsNullOrEmpty(box.CurrPosId)) ||
+                            box.WaitInStoreList.Contains(posId))
                         {
                         {
                             return true;
                             return true;
                         }
                         }