入库时不判断料盘检测。出库放到仓门口时，如果没有料盘，发送取消任务给服务器。

source/ACSingleStore/记录.txt

@@ -44,3 +44,10 @@
 
 入库时，回到仓门后在检测叉子上是否有料盘。
 
+20200924
+大料盘定位时，第二次定位需要压紧轴放松，在压紧。
+
+
+20201009
+入库时暂不判断是否有料盘
+出库时不判断叉子上是否有料盘，待料盘放到仓门口时，如果没有料盘，发送提示信息到服务器，并调用取消任务接口

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -1579,19 +1579,23 @@ namespace OnlineStore.DeviceLibrary
             lineOperation.msg = WarnMsg;
 
             if (WarnMsg.Equals(""))
-            {
-                boxStatus.msg = CodeMsg;
-                lineOperation.msg = CodeMsg;
-            }
-            if (CodeMsg.Equals(""))
-            {
-                if (storeRunStatus.Equals(StoreRunStatus.Runing) && IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
+            { 
+                if (CodeMsg.Equals(""))
+                {
+                    if (storeRunStatus.Equals(StoreRunStatus.Runing) && IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
+                    {
+                        boxStatus.msg = "叉子料盘检测有料，请检查";
+                        lineOperation.msg = "叉子料盘检测有料，请检查";
+                    }
+                }
+                else
                 {
-                    boxStatus.msg = "叉子料盘检测有料，请检查";
-                    lineOperation.msg = "叉子料盘检测有料，请检查";
+                    boxStatus.msg = CodeMsg;
+                    lineOperation.msg = CodeMsg;
+                    LogUtil.info("给服务器发送报警：" + CodeMsg);
+                    CodeMsg = "";
                 }
             }
-            CodeMsg = "";
             //WarnMsg = ""; 
             //状态
             boxStatus.status = (int)storeStatus;

source/DeviceLibrary/acSingleStore/StoreManager.cs

@@ -218,5 +218,51 @@ namespace OnlineStore.DeviceLibrary
             }
             return false;
         }
+
+
+        //        取消出库任务地址:   /cancelOutTask      //参数: barcode
+        private static string Addr_cancelPutInTask = "/rest/api/qisda/device/cancelOutTask";
+        public static string cancelOutTask(  string barcode)
+        {
+            string msg = "";
+            try
+            {
+                Dictionary<string, string> paramMap = new Dictionary<string, string>();
+                paramMap.Add("barcode", barcode);
+
+                string server = GetAddr(Addr_cancelPutInTask, paramMap);
+                DateTime startTime = DateTime.Now;
+                string resultStr = HttpHelper.Post(server, "");
+                LogUtil.info("cancelOutTask    " + FormUtil.GetSpanStr(DateTime.Now - startTime) + "  【" + server + "】【" + resultStr + "】");
+
+                ResultData data = JsonHelper.DeserializeJsonToObject<ResultData>(resultStr);
+
+                if (data == null)
+                {
+                    return msg = " cancelOutTask【 " + barcode + "】 没有收到服务器反馈";
+                }
+                else if (data.code.Equals(0).Equals(false))
+                {
+                    return msg =  " cancelOutTask【 " + barcode + "】   ：" + data.msg;
+                }
+
+                return "";
+            }
+            catch (Exception ex)
+            {
+                LogUtil.error(" cancelOutTask error :" + ex.ToString());
+            }
+            return msg;
+        }
+
+    }
+    public class ResultData
+    {
+        //{"code":0,"msg":"ok","data":"7"} 
+        public int code { get; set; }
+
+        public string msg { get; set; }
+
+        public Dictionary<string, string> data { get; set; }
     }
 }

source/DeviceLibrary/store/StoreStep.cs

@@ -279,17 +279,21 @@ namespace OnlineStore.DeviceLibrary
         /// </summary>
         SO_25_InoutToP1,
         /// <summary>
+        /// 料仓出库，，升降轴返回，，  轴2至P1（ 待机点）,关闭仓门
+        /// </summary>
+        SO_26_CloseDoor,
+        /// <summary>
         /// 料仓出库，检测料仓门口信号
         /// </summary>
-        SO_26_CheckTray,
+        SO_27_CheckTray,
         /// <summary>
         /// 料仓出库，，升降轴返回，，  轴2至P1（ 待机点）
         /// </summary>
-        SO_27_GoBack,
+        SO_28_GoBack,
         /// <summary>
         /// 等待拿走物品
         /// </summary>
-        SO_28_WaitTake,
+        SO_29_WaitTake,
 
         #endregion