林豪 左 2 years ago
parent
commit
23815616ce

+ 1 - 1
WCS.WorkEngineering/Systems/一楼出库工位处理系统.cs

@@ -27,7 +27,7 @@ namespace WCS.WorkEngineering.Systems
                 var any = false;
                 SqlSugarHelper.Do(db =>
                 {
-                    any = db.Default.Queryable<WCS_TaskInfo>().Any(v => v.AddrTo == obj.Entity.Code && v.Status <= Entity.TaskStatus.AGVExecution);
+                    any = db.Default.Queryable<WCS_TaskInfo>().Any(v => v.AddrTo == obj.Entity.Code && v.Status < Entity.TaskStatus.AGVExecution);
                 });
                 if (!any) WmsApi.ApplyStockOutTask(obj.Entity.Code);
             }

+ 13 - 2
WCS.WorkEngineering/WebApi/Controllers/IwmsSApi.cs

@@ -27,11 +27,22 @@ namespace WCS.WorkEngineering.WebApi.Controllers
             }
         }
 
-        public static zhongTianIntoStockResponse zhongTianIntoStock()
+        //public static zhongTianIntoStockResponse 空轮入库(string matCode, string wbCode)
+        //{
+        //    //return zhongTianIntoStock(matCode, )
+        //}
+
+        //public static zhongTianIntoStockResponse 余料入库(string matCode, string wbCode)
+        //{
+        //    //return zhongTianIntoStock(matCode, )
+        //}
+
+        public static zhongTianIntoStockResponse zhongTianIntoStock(string matCode, string wbCode)
         {
             var res = APICaller.CallApi2<zhongTianIntoStockResponse>(IwmsUrl + "/databus/publish/zhongTianIntoStock", new zhongTianIntoStockRequest
             {
-
+                matCode = matCode,
+                wbCode = wbCode,
             });
             //if (res.code != AgvResponseCode.Success)
             //{