schangxiang@126.com
2025-01-02 6f035bae8e9ce978c49941518de57585b77e8d7d
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
@@ -1,4 +1,5 @@
using 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.正常;
            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   给WorkPieceInfoLog 属性赋值
        /// </summary>
@@ -156,7 +160,7 @@
            }
        }
        public static WorkPieceLogMiddle QualityDataHand(WorkPieceLogMiddle loginfo, List<EquipmentQualityConfig> qcofig)
        {
            try
@@ -250,7 +254,7 @@
            return loginfo;
        }
        /// <summary>
        /// 赋值 修改人 【Editby 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)
        {
@@ -638,10 +642,6 @@
                            {//自动运行状态+下料道满料 =  完成 (就是有生产出来但没有出设备)
                                State = ((int)EnumEquipmentCurrentStateDisplay.完成).ToString();
                            }
                            //else if (loginfo.IsNormalProduction && loginfo.LackMaterial)
                            //{//其他状态全算待机
                            //    State = ((int)EnumEquipmentCurrentStateDisplay.待机).ToString();
                            //}
                            else
                            {//其他状态全算待机
                                State = ((int)EnumEquipmentCurrentStateDisplay.待机).ToString();