gkj 2 lat temu
rodzic
commit
9fd922645d

+ 1 - 1
ServiceCenter/Logs/LogHub.cs

@@ -50,7 +50,7 @@ namespace ServiceCenter.Logs
             {
                 path = $"D:\\WCSLogs\\{DateTime.Now.yyyyMMdd()}\\接口日志\\",
                 Title = $"{title}.txt",
-                Con = $"{DateTime.Now.yyyyMMddhhmmssf()}--[{Thread.CurrentThread.ManagedThreadId}]--{con}\n"
+                Con = $"{con}\n"
             }));
         }
 

+ 3 - 23
WCS.Core/DataBlock.cs

@@ -33,12 +33,9 @@ namespace WCS.Core
         {
             try
             {
-                if (Length == 0)
-                {
-                    Start = (ushort)ProxyList.Min(v => v.Info.Position);
-                    var last = ProxyList.OrderBy(v => v.Info.Position).Last();
-                    Length = (ushort)(last.Info.Position + last.BytesCount);
-                }
+                Start = (ushort)ProxyList.Min(v => v.Info.Position);
+                var last = ProxyList.OrderBy(v => v.Info.Position).Last();
+                Length = (ushort)(last.Info.Position + last.BytesCount);
                 var data = new byte[0];
                 lock (Entity.PLCInfo.Ex())
                 {
@@ -298,23 +295,6 @@ namespace WCS.Core
                 throw new Exception(msg);
             }
 
-            if (Entity.No == 91)
-            {
-                string data1 = "";
-                foreach (var item in Data.ToList())
-                {
-                    data1 = data1 + $"[{item}]";
-                }
-                var msg = $"称重正常读取记录:";
-                msg = msg + $"Data--{Data.Length};";
-                msg = msg + $"bitStart--{bitStart};";
-                msg = msg + $"start--{start};";
-                msg = msg + $"length--{length};";
-                msg = msg + $"读取PLC传入参数{Entity.No},{Start},{(ushort)(Length - Start)};";
-                msg = msg + $"Data内容--{data1}";
-                throw new Exception(msg);
-            }
-
             var data = Data.Skip(start).Take(length).ToArray();
             bitStart += length * 8;
             return data;

+ 4 - 2
WCS.WorkEngineering/Systems/SrmSystems.cs

@@ -114,6 +114,7 @@ namespace WCS.WorkEngineering.Systems
 
                                   case OutTypeEnum.半自动手动出库任务:
                                       task.Status = Entity.TaskStatus.Finish;
+                                      task.EditTime = DateTime.Now;
                                       task.AddWCS_TASK_DTL(db, task.SrmStation, "半自动手动出库任务结束");
                                       break;
 
@@ -142,11 +143,12 @@ namespace WCS.WorkEngineering.Systems
                       taskInfo = task;
                   });
                 if (taskInfo == null) throw new KnownException("数据库提交事务错误", LogLevelEnum.High);
+                // 写入信号
+                obj.Data.OkAck = 1;
                 //通知WMS任务完成
                 if (taskInfo.Status == TaskStatus.Finish) WmsApi.CompleteTask(taskInfo.ID);
                 if (taskInfo.Type == TaskType.OutDepot && taskInfo.Status == TaskStatus.ConveyorExecution) WmsApi.SrmPickOutCompleted(taskInfo.ID);
-                // 写入信号
-                obj.Data.OkAck = 1;
+                
                 World.Log($"堆垛机任务处理:结束--完成任务{obj.Data2.TaskFinishiId}", LogLevelEnum.Mid);
             }
 

+ 6 - 2
WCS.WorkEngineering/Systems/一楼入库工位处理系统.cs

@@ -63,11 +63,15 @@ namespace WCS.WorkEngineering.Systems
                    //获取称重
                    var dev91 = Device.All.Where(v => v.Code == obj.Entity.Code).Select(v => new Device<IStation91>(v, this.World)).FirstOrDefault();
                    task.Weight = dev91.Data.Weight;
-                   if (task.Weight == 0) throw new KnownException($"称重异常", LogLevelEnum.Mid);
+                   if (task.Weight == 0) throw new KnownException($"称重结果为零", LogLevelEnum.Mid);
                }
                catch (Exception ex)
                {
-                   World.Log($"称重读取报错:{ex.Message}", LogLevelEnum.High);
+                   World.Log($"称重读取记录:{ex.Message}", LogLevelEnum.Low);
+                   if (ex.Message == "称重结果为零")
+                   {
+                       throw new KnownException($"称重结果为零:{task.Weight}", LogLevelEnum.Mid);
+                   }
                }
 
 

+ 9 - 2
WCS.WorkEngineering/Systems/二楼入库工位处理系统.cs

@@ -76,12 +76,19 @@ namespace WCS.WorkEngineering.Systems
                        //获取称重
                        var dev91 = Device.All.Where(v => v.Code == obj.Entity.Code).Select(v => new Device<IStation91>(v, this.World)).FirstOrDefault();
                        task.Weight = dev91.Data.Weight;
-                       WmsApi.WcsUploadInfo(task.ID, (decimal)task.Weight, task.BarCode);
+                       if (task.Weight == 0) throw new KnownException($"称重结果为零", LogLevelEnum.Mid);
+                      
                    }
                    catch (Exception ex)
                    {
-                       World.Log($"称重读取报错:{ex.Message}", LogLevelEnum.High);
+                       World.Log($"称重读取记录:{ex.Message}", LogLevelEnum.Low);
+                       if (ex.Message == "称重结果为零")
+                       {
+                           throw new KnownException($"称重结果为零:{task.Weight}", LogLevelEnum.Mid);
+                       }
                    }
+
+                   WmsApi.WcsUploadInfo(task.ID, (decimal)task.Weight, task.BarCode);
                }
 
                task.Status = Entity.TaskStatus.ConveyorExecution;