fix

ServiceCenter/WebApi/APICaller.cs

@@ -25,6 +25,12 @@ namespace ServiceCenter.WebApi
             return JsonConvert.DeserializeObject<T>(result);
         }
 
+        public static T CallApi1<T>(string url, string parameter, string type = "GET")
+        {
+            var result = HttpApi(url + parameter, "", type);
+            return JsonConvert.DeserializeObject<T>(result);
+        }
+
         public static T CallApi<T>(string url, object parameter, string type = "Post")
         {
             var content = JsonConvert.SerializeObject(parameter);
@@ -91,11 +97,16 @@ namespace ServiceCenter.WebApi
                 request.Timeout = 60000;//连接超时
                 request.ReadWriteTimeout = 3600000;//读写超时
                 request.Accept = "text/html,application/xhtml+xml,*/*";
+
                 request.ContentType = "application/json";
                 request.Method = type.ToUpper().ToString();//get或者post
                 byte[] buffer = encoding.GetBytes(jsonstr);
                 request.ContentLength = buffer.Length;
-                request.GetRequestStream().Write(buffer, 0, buffer.Length);
+                if (type != "GET")
+                {
+                    request.GetRequestStream().Write(buffer, 0, buffer.Length);
+                }
+
                 HttpWebResponse response = (HttpWebResponse)request.GetResponse();
                 using (StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.UTF8))
                 {
@@ -112,4 +123,4 @@ namespace ServiceCenter.WebApi
             }
         }
     }
-}
+}

业务工程/分拣库/WCS.WorkEngineering/Systems/NoInteractionSystems.cs

@@ -8,6 +8,7 @@ using WCS.Core;
 using WCS.Entity;
 using WCS.Entity.Protocol.Station;
 using WCS.WorkEngineering.Extensions;
+using WCS.WorkEngineering.WebApi.Models.WMS.Request;
 using WCS.WorkEngineering.Worlds;
 using DeviceFlags = WCS.WorkEngineering.Extensions.DeviceFlags;
 using TaskStatus = WCS.Entity.TaskStatus;
@@ -101,6 +102,10 @@ namespace WCS.WorkEngineering.Systems
                                     db.Default.UpdateableRowLock(task).UpdateColumns(x => new { x.Status, x.AgvTaskID }).ExecuteCommand();
                                     task.AddWCS_TASK_DTL(db.Default, task.Device, $"初始化单独返皮盘任务");
                                 }
+                                else if(task.BusType==TaskBusType.芯股用空托盘入库.GetDescription())
+                                {
+                                    return;
+                                }
                                 else
                                 {
                                     //更新任务状态

业务工程/分拣库/WCS.WorkEngineering/WebApi/Models/WMS/Request/FJBuildEmptyPalletsStockRequest.cs

@@ -63,9 +63,9 @@ namespace WCS.WorkEngineering.WebApi.Models.WMS.Request
         def = 0,
 
         /// <summary>
-        ///  一楼人工入空托盘
+        ///  一楼空托入库
         /// </summary>
-        [Description("一楼人工入空托盘")]
+        [Description("一楼空托入库")]
         OneLayerManualPallets = 1,
 
         /// <summary>
@@ -97,5 +97,53 @@ namespace WCS.WorkEngineering.WebApi.Models.WMS.Request
         /// </summary>
         [Description("组盘_托盘")]
         组盘_托盘 = 6,
+
+        /// <summary>
+        ///  码垛入库
+        /// </summary>
+        [Description("码垛入库")]
+        码垛入库 = 7,
+
+        /// <summary>
+        ///  环形库出库码垛任务
+        /// </summary>
+        [Description("环形库出库码垛任务")]
+        环形库出库码垛任务 = 8,
+
+        /// <summary>
+        ///  车间叫料
+        /// </summary>
+        [Description("车间叫料")]
+        车间叫料 = 9,
+
+        /// <summary>
+        ///  二楼异常组盘
+        /// </summary>
+        [Description("二楼异常组盘")]
+        二楼异常组盘 = 10,
+
+        /// <summary>
+        ///  车间手动叫料
+        /// </summary>
+        [Description("车间手动叫料")]
+        车间手动叫料 = 11,
+
+        /// <summary>
+        ///  二楼二次码垛出库
+        /// </summary>
+        [Description("二楼二次码垛出库")]
+        二楼二次码垛出库 = 12,
+
+        /// <summary>
+        ///  人工满托入库
+        /// </summary>
+        [Description("人工满托入库")]
+        人工满托入库 = 13,
+
+        /// <summary>
+        ///  芯股用空托盘入库
+        /// </summary>
+        [Description("芯股用空托盘入库")]
+        芯股用空托盘入库 = 14
     }
 }