From c7acb51c3ace14e509704f453adc58b9eb6613a8 Mon Sep 17 00:00:00 2001 From: liuying <1427574514@qq.com> Date: 周三, 16 10月 2024 16:23:28 +0800 Subject: [PATCH] 细节 --- DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs index e01949f..6f034ad 100644 --- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs +++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs @@ -1,4 +1,5 @@ 锘縰sing HslCommunication.BasicFramework; +using iWare.Wms.Core; using iWare_SCADA_BusinessLogical.Utils; using iWare_SCADA_Model; using iWare_SCADA_Model.MiddleModel; @@ -58,13 +59,16 @@ public static WorkPieceLog GetAddWorkPieceLog(WorkPieceLog loginfo) { loginfo.Id = Yitter.IdGenerator.YitIdHelper.NextId(); + PieceLogTypeEnum pieceLogTypeEnum = PieceLogTypeEnum.姝e父; + loginfo.PieceLogType = (int)pieceLogTypeEnum; + loginfo.PieceLogTypeName = pieceLogTypeEnum.ToString(); return loginfo; } - public static WorkPieceLog GetAddWorkPieceLog1(WorkPieceLogMiddle loginfo) - { - loginfo.Id = Yitter.IdGenerator.YitIdHelper.NextId(); - return loginfo; - } + //public static WorkPieceLog GetAddWorkPieceLog1(WorkPieceLogMiddle loginfo) + //{ + // loginfo.Id = Yitter.IdGenerator.YitIdHelper.NextId(); + // return loginfo; + //} /// <summary> /// 閫氳繃WorkPieceInfo 缁橶orkPieceInfoLog 灞炴�ц祴鍊� /// </summary> @@ -156,7 +160,7 @@ } } - + public static WorkPieceLogMiddle QualityDataHand(WorkPieceLogMiddle loginfo, List<EquipmentQualityConfig> qcofig) { try @@ -250,7 +254,7 @@ return loginfo; } - + /// <summary> /// 璧嬪�� 淇敼浜� 銆怑ditby shaocx,2024-07-05銆� @@ -266,8 +270,8 @@ return logMiddle.MonitoringPoint; } - - + + public static void SetWorkingProcedureCurrentForOP10(WorkPieceInfo cur_db_info, ref string set_WorkingProcedureCurrent) @@ -299,7 +303,7 @@ } } - + public static void AlertMonitor(WorkPieceLog loginfo, LogType type) { -- Gitblit v1.9.3