林豪 左 2 tahun lalu
induk
melakukan
0fde8f23b1

+ 4 - 0
WCS.WorkEngineering/Systems/NoInteractionSystems.cs

@@ -139,6 +139,10 @@ namespace WCS.WorkEngineering.Systems
                                     break;
 
                                 case 2: //二楼下发AGV任务
+                                    var agvRes = IwmsApi.满轮出库(wcs.MatCode, wcs.WorkBench);
+                                    agv.Status = AGVTaskStatus.Confirm;
+                                    agv.AgvID = agvRes.data;
+                                    db.Default.Updateable(agv).SplitTable().ExecuteCommand();
                                     break;
 
                                 default:

+ 11 - 10
WCS.WorkEngineering/WebApi/Controllers/IwmsSApi.cs → WCS.WorkEngineering/WebApi/Controllers/IwmsApi.cs

@@ -7,7 +7,7 @@ using WCS.WorkEngineering.Worlds.Logs;
 
 namespace WCS.WorkEngineering.WebApi.Controllers
 {
-    public class IwmsSApi
+    public class IwmsApi
     {
         private static string _IwmsUrl = null!;
 
@@ -27,27 +27,28 @@ namespace WCS.WorkEngineering.WebApi.Controllers
             }
         }
 
-        //public static zhongTianIntoStockResponse 空轮入库(string matCode, string wbCode)
-        //{
-        //    //return zhongTianIntoStock(matCode, )
-        //}
+        public static zhongTianIntoStockResponse 满轮出库(string matCode, string wbCode)
+        {
+            return zhongTianIntoStock(matCode, wbCode, "1");
+        }
 
         //public static zhongTianIntoStockResponse 余料入库(string matCode, string wbCode)
         //{
         //    //return zhongTianIntoStock(matCode, )
         //}
 
-        public static zhongTianIntoStockResponse zhongTianIntoStock(string matCode, string wbCode)
+        public static zhongTianIntoStockResponse zhongTianIntoStock(string matCode, string wbCode, string inSpoolFull)
         {
             var res = APICaller.CallApi2<zhongTianIntoStockResponse>(IwmsUrl + "/databus/publish/zhongTianIntoStock", new zhongTianIntoStockRequest
             {
                 matCode = matCode,
                 wbCode = wbCode,
+                inSpoolFull = inSpoolFull,
             });
-            //if (res.code != AgvResponseCode.Success)
-            //{
-            //    throw new KnownException(res.message, LogLevelEnum.High);
-            //}
+            if (res.code != AgvResponseCode.Success)
+            {
+                throw new KnownException(res.message, LogLevelEnum.High);
+            }
             return res;
         }
 

+ 22 - 0
WCS.WorkEngineering/WebApi/Models/AGV/Response/zhongTianIntoStockResponse.cs

@@ -1,6 +1,28 @@
 namespace WCS.WorkEngineering.WebApi.Models.AGV.Response
 {
+    /// <summary>
+    /// 
+    /// </summary>
     public class zhongTianIntoStockResponse
     {
+        /// <summary>
+        /// 返回码
+        /// </summary>
+        public string code { get; set; }
+
+        /// <summary>
+        /// 自定义返回(返回任务单号)
+        /// </summary>
+        public string data { get; set; }
+
+        /// <summary>
+        /// 返回消息
+        /// </summary>
+        public string message { get; set; }
+
+        /// <summary>
+        /// 请求编号
+        /// </summary>
+        public string reqCode { get; set; }
     }
 }