Commit b6d40e83 LN

1

1 个父辈 8674874d
...@@ -30,7 +30,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -30,7 +30,7 @@ namespace OnlineStore.DeviceLibrary
public int autoPositionIndex = 0; public int autoPositionIndex = 0;
public string autoMsg = ""; public string autoMsg = "";
private static StoreMoveType lastMoveType = StoreMoveType.None; //private static StoreMoveType lastMoveType = StoreMoveType.None;
#endregion #endregion
...@@ -327,7 +327,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -327,7 +327,7 @@ namespace OnlineStore.DeviceLibrary
storeRunStatus = StoreRunStatus.Busy; storeRunStatus = StoreRunStatus.Busy;
storeStatus = StoreStatus.InStoreExecute; storeStatus = StoreStatus.InStoreExecute;
StoreMove.NewMove(StoreMoveType.InStore, param); StoreMove.NewMove(StoreMoveType.InStore, param);
lastMoveType = StoreMoveType.InStore; //lastMoveType = StoreMoveType.InStore;
StoreMove.IsBatchInOutStore = IsBatchWork; StoreMove.IsBatchInOutStore = IsBatchWork;
StoreMove.IsNeedInStore = isNeedInStore; StoreMove.IsNeedInStore = isNeedInStore;
if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0)) if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0))
...@@ -718,7 +718,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -718,7 +718,7 @@ namespace OnlineStore.DeviceLibrary
storeRunStatus = StoreRunStatus.Busy; storeRunStatus = StoreRunStatus.Busy;
storeStatus = StoreStatus.InStoreExecute; storeStatus = StoreStatus.InStoreExecute;
StoreMove.MoveParam = param; StoreMove.MoveParam = param;
lastMoveType = StoreMoveType.InStore; //lastMoveType = StoreMoveType.InStore;
StoreMove.IsBatchInOutStore = true; StoreMove.IsBatchInOutStore = true;
StoreMove.IsNeedInStore = true; StoreMove.IsNeedInStore = true;
...@@ -819,7 +819,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -819,7 +819,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info(LOGGER, StoreName + logMsg); LogUtil.info(LOGGER, StoreName + logMsg);
storeRunStatus = StoreRunStatus.Busy; storeRunStatus = StoreRunStatus.Busy;
StoreMove.NewMove(StoreMoveType.OutStore, param); StoreMove.NewMove(StoreMoveType.OutStore, param);
lastMoveType = StoreMoveType.OutStore; //lastMoveType = StoreMoveType.OutStore;
StoreMove.IsBatchInOutStore = IsBatchWork; StoreMove.IsBatchInOutStore = IsBatchWork;
if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0)) if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0))
{ {
......
...@@ -14,15 +14,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -14,15 +14,9 @@ namespace OnlineStore.DeviceLibrary
public class StoreManager public class StoreManager
{ {
public static bool HasDisableDoorControl = ConfigAppSettings.GetIntValue(Setting_Init.HasDisableDoorControl).Equals(1); public static bool HasDisableDoorControl = ConfigAppSettings.GetIntValue(Setting_Init.HasDisableDoorControl).Equals(1);
/// <summary>
/// 当前出入库的模式
/// </summary>
public static int CurrInOutType = 0;
private static string api_communication = "service/store/communication"; //流水线状态通信接口 private static string api_communication = "service/store/communication"; //流水线状态通信接口
private static string api_nextFeeder = "service/store/nextFeeder"; // 出库站位列表切换接口 //private static string api_nextFeeder = "service/store/nextFeeder"; // 出库站位列表切换接口
public static string api_inventory = "rest/api/v2/mes/inventory";//获取单个或全总SMD-BOX 中的实时库存信息 public static string api_inventory = "rest/api/v2/mes/inventory";//获取单个或全总SMD-BOX 中的实时库存信息
public static string api_stackOut = "rest/api/v2/mes/stackOut";//本接⼜提供物料出库功能,可⼀次性出单/多盘物料 public static string api_stackOut = "rest/api/v2/mes/stackOut";//本接⼜提供物料出库功能,可⼀次性出单/多盘物料
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!