林豪 左 3 жил өмнө
parent
commit
74a9c0672f

+ 9 - 0
Projects/永冠OPP/WCS.Service/Log/InfoLog.cs

@@ -152,5 +152,14 @@ namespace WCS.Service.Log
         {
             Log.Info(msg, "INFO_UPEX");
         }
+
+        /// <summary>
+        /// 任务创建记录
+        /// </summary>
+        /// <param name="msg"></param>
+        public static void INFO_CREATETASKIN(string msg)
+        {
+            Log.Info(msg, "INFO_CREATETASKIN");
+        }
     }
 }

+ 1 - 1
Projects/永冠OPP/WCS.Service/WebApi/APICaller.cs

@@ -102,7 +102,7 @@ namespace WCS.Service
                 var res = reader.ReadToEnd();
                 sw.Stop();
                 if (sw.ElapsedMilliseconds > 500)
-                    InfoLog.INFO_TIMING($"接口{url}调用耗时{sw.ElapsedMilliseconds}---------{res}");
+                    InfoLog.INFO_TIMING($"接口{url}调用耗时{sw.ElapsedMilliseconds}---------{JsonConvert.SerializeObject(res)}");
                 return res;
             }
         }

+ 3 - 1
Projects/永冠OPP/WCS.Service/Works/Station/一楼入库.cs

@@ -1,5 +1,6 @@
 using DBHelper;
 using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -41,7 +42,7 @@ namespace WCS.Service.Works.Station
                         var devs = obj.GetBcrValid();
                         devs.Valid();
                         var infos = devs.GetWMSInTask();
-
+                        InfoLog.INFO_CREATETASKIN($"[{obj.Entity.CODE}]--请求条码{JsonConvert.SerializeObject(devs)}");
                         foreach (var item in devs)
                         {
                             var dev = item.Station;
@@ -78,6 +79,7 @@ namespace WCS.Service.Works.Station
                     //检查对应的任务是否已创建成功
                     DB.Do(db =>
                     {
+                        InfoLog.INFO_CREATETASKIN($"[{obj.Entity.CODE}]--生成任务{JsonConvert.SerializeObject(finishTaskList)}");
                         foreach (var finishTask in finishTaskList)
                         {
                             var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.WMSTASK == finishTask.FinishCode);

+ 1 - 1
Projects/永冠OPP/WCS.Service/Works/Station/一楼出库.cs

@@ -45,7 +45,7 @@ namespace WCS.Service.Works.Station
                         }
                         devs.Add(new FinishTaskList<string>(dev.Entity.CODE, dev.Entity.Create<StationDevice>()));
                     }
-
+                    if (!devs.Any()) return;
                     foreach (var dev in devs)
                     {
                         var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.TYPE == TaskType.出库 && v.SRMSTATION == dev.FinishCode && v.STATUS == TaskStatus.堆垛机完成) ?? throw new WarnException("无任务");

+ 1 - 1
Projects/永冠OPP/WCS.Service/Works/Station/涂布入库.cs

@@ -111,7 +111,7 @@ namespace WCS.Service.Works.Station
                                     InfoLog.INFO_WarnDb("AGV放货完成信号未清楚", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
                                     continue;
                                 }
-                                if (obj.Items.Any(v => v.Data2.Tasknum > 10000))
+                                if (obj.Items.Any(v => v.Data2.Tasknum > 0))
                                 {
                                     InfoLog.INFO_WarnDb("已有WCS任务号", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
                                     continue;

+ 2 - 1
Projects/永冠OPP/WCS.Service/config.json

@@ -17,7 +17,8 @@
         "INFO_WARN": "Info_Warn",
         "INFO_PLCREADLOG": "Info_PlcReadLog",
         "INFO_TIMING": "Info_Timing",
-        "INFO_UPEX": "INFO_I_WCS_GetExcTask"
+        "INFO_UPEX": "INFO_I_WCS_GetExcTask",
+        "INFO_CREATETASKIN": "CreateTaskIn"
       }
     },
     {