修复为null的问题

schangxiang@126.com

2024-09-06 e4f89a92209ebca77240edaa3b78f66eb6e4b3d5

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs

@@ -183,13 +183,14 @@
                                info.Remarks = $"工件二维码第一次出现的工序{loginfo.WorkingProcedure}不是OP05,数据缺失,请确认情况并做相应处理！";
                            }
                            else
                            {
                            {//OP05工序
                                info.QualityState = (int)QualityStateEnum.OK;//此处需要注意，判断所有工序质量，然后再赋值 //默认合格，OP05默认是合格
                                info.Remarks = "OP05新增工件信息";
                            }
                            info.WorkPieceinitOnlineTime = DateTimeHelper.GetDateTime();
                            info.WorkingProcedurePlan = ConfigHelper.GetConfigString("WorkingProcedureAllStr") ?? "OP05OP10OP20OP30OP35OP40OP50OP60OP70OP80";
                            info.CreatedUserName = loginfo.MonitoringPoint;
                            info.WorkingProcedureCurrent = loginfo.WorkingProcedure;//工序赋值
                            SystemBussinessHelper.SetWorkPieceInfoMiddleForCreatedUserName(ref info, loginfo.DataCapturePointCname);
                            info.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            info = ParseQRCode(info);
@@ -197,46 +198,40 @@
                        }
                        else
                        {
                            if (info.WorkingProcedureCurrent.Equals("OP05"))
                            {
                                loginfo.Remarks = $"读取二维码{loginfo.WorkPieceID ?? "空"} OP05工序重复读取了";
                                return;
                            }
                            //存在 表 WorkPieceInfo有，但是 WorkPieceProcess这个工序不存在的情况 【Editby shaocx,2024-09-06】
                            //if (info.WorkingProcedureCurrent.Equals("OP05"))
                            //{
                            //    loginfo.Remarks = $"读取二维码{loginfo.WorkPieceID ?? "空"} OP05工序重复读取了";
                            //    return;
                            //}
                        }
                        info.WorkingProcedureStartTime = DateTimeHelper.GetDateTime();//
                        info.WorkingProcedureEndTime = null;
                        info.WorkPieceState = (int)WorkPieceState.WIP;
                        info.EquipmentID = loginfo.EquipmentID;
                        info.QualityStateUpdateUser = loginfo.UpdatedUserName;
                        info.QualityStateUpdateTime = loginfo.UpdatedTime.Value.LocalDateTime;
                        info.QualityStateUpdateMode = QualityStateUpdateMode.Auto.ToString();
                        info.UpdatedUserName = loginfo.MonitoringPoint;
                        SystemBussinessHelper.SetWorkPieceInfoMiddleForUpdateDataCapturePointCname(ref info, loginfo.DataCapturePointCname);
                        info.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                        info.WorkPieceCurrentPosition = loginfo.WorkingProcedure;
                        info.WorkPieceCurrentPositionOrder = info.WorkingProcedurePlan.IndexOf(loginfo.WorkingProcedure) / 2;
                        info.WorkingProcedureCurrent = loginfo.WorkingProcedure;
                        info.Remarks = $"{info.WorkingProcedureCurrent}工件上线";
                        if ((loginfo.WorkingProcedure.Equals("OP05") && isAddWorkPieceInfo == false))
                        {//存在 表 WorkPieceInfo有，但是 WorkPieceProcess这个工序不存在的情况
                            //如果是OP05的，并且是 不需要新增 表WorkPieceInfo，那么就不需要更新表 WorkPieceInfo
                        }
                        else
                        {
                            info.WorkingProcedureStartTime = DateTimeHelper.GetDateTime();//
                            info.WorkingProcedureEndTime = null;
                            info.WorkPieceState = (int)WorkPieceState.WIP;
                            info.EquipmentID = loginfo.EquipmentID;
                            info.QualityStateUpdateUser = loginfo.UpdatedUserName;
                            info.QualityStateUpdateTime = loginfo.UpdatedTime.Value.LocalDateTime;
                            info.QualityStateUpdateMode = QualityStateUpdateMode.Auto.ToString();
                            info.UpdatedUserName = loginfo.MonitoringPoint;
                            SystemBussinessHelper.SetWorkPieceInfoMiddleForUpdateDataCapturePointCname(ref info, loginfo.DataCapturePointCname);
                            info.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);

                            info.WorkPieceCurrentPosition = loginfo.WorkingProcedure;
                            info.WorkPieceCurrentPositionOrder = info.WorkingProcedurePlan.IndexOf(loginfo.WorkingProcedure) / 2;
                            info.WorkingProcedureCurrent = loginfo.WorkingProcedure;//工序赋值
                            info.Remarks = $"{info.WorkingProcedureCurrent}工件上线";
                        }


                        //修复下 op35 同一个件 下线时间跟下一个上线时间一模一样的问题  【Editby shaocx,2024-08-27】
                        var isNeedAddNewProcess = true;
                        var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID && !o.OperationType.Equals("SPC") && (o.EndTime == null || o.EndTime <= DateTime.MinValue)).OrderByDescending(o => o.StartTime).FirstOrDefault();
                        if (pro != null && pro.WorkPieceID.Length > 1)
                        {
                            if (pro.WorkingProcedureCurrent == loginfo.WorkingProcedure)
                            {//表示工序相同
                                isNeedAddNewProcess = false;
                                pro.Remarks = "又一次上线，更新结束时间";
                            }
                            else
                            {
                                pro.EndTime = DateTimeHelper.GetDateTime();
                                pro.UpdatedUserName = loginfo.MonitoringPoint;
                                pro.UpdateDataCapturePointCname = loginfo.DataCapturePointCname;
                                pro.UpdatedTime = DateTimeHelper.GetDateTime();
                                pro.Remarks = "又一次上线，更新结束时间";
                            }
                        }

                        //特殊处理OP05上线，因为他是根据文本列表内容上线的 【Editby shaocx,2024-09-03】
                        if (loginfo.WorkingProcedure.Equals("OP05"))
                        {
@@ -244,6 +239,26 @@
                            if (op05Proccss != null)
                            {
                                isNeedAddNewProcess = false;//不需要新增了
                            }
                        }
                        else
                        {
                            var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID && !o.OperationType.Equals("SPC") && (o.EndTime == null || o.EndTime <= DateTime.MinValue)).OrderByDescending(o => o.StartTime).FirstOrDefault();
                            if (pro != null && pro.WorkPieceID.Length > 1)
                            {
                                if (pro.WorkingProcedureCurrent == loginfo.WorkingProcedure)
                                {//表示工序相同
                                    isNeedAddNewProcess = false;
                                    pro.Remarks = "又一次上线，更新结束时间";
                                }
                                else
                                {
                                    pro.EndTime = DateTimeHelper.GetDateTime();
                                    pro.UpdatedUserName = loginfo.MonitoringPoint;
                                    pro.UpdateDataCapturePointCname = loginfo.DataCapturePointCname;
                                    pro.UpdatedTime = DateTimeHelper.GetDateTime();
                                    pro.Remarks = "又一次上线，更新结束时间";
                                }
                            }
                        }
                        if (isNeedAddNewProcess)
@@ -274,12 +289,22 @@
                            new_process.Remarks = "";
                            new_process.MyRemarks = "读码上线时，每次扫描上线都插入追溯表";
                            if (loginfo.WorkingProcedure.Equals("OP05"))
                            {
                            {//特殊处理OP05工序
                                new_process.EndTime = new_process.StartTime;

                                //如果已经存在其他工序，那么就必须要按照其他工序的时间往前推数据 【Editby shaocx,2024-09-05】
                                var op05OtherProccss = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID).OrderBy(x => x.StartTime).FirstOrDefault();
                                if (op05OtherProccss != null)
                                {//说明有，那么时间就按照这个时间往前推
                                    var _time = op05OtherProccss.StartTime.AddHours(-1);
                                    new_process.StartTime = _time;
                                    new_process.EndTime = _time;
                                    new_process.CreatedTime = _time;
                                    new_process.UpdatedTime = _time;
                                }
                            }
                            db.WorkPieceProcess.Add(new_process);
                        }

                        //db.Database.AutoTransactionsEnabled = false;// 同一个SaveChanges默认事务， 关闭默认事务：... 好像不能用啊，后面再研究吧
                        if (isAddWorkPieceInfo)
                        {
@@ -291,6 +316,7 @@
                        }

                        #region 判断是否跳序,或质量不符合 然后反馈PLC
                        /*
                        if (IsFeedback.HasValue && IsFeedback.Value == (int)FeedbackMode.FeedbackPLC)
                        {
                            bool checkQualityInfoCompleteFlag = false;
@@ -304,43 +330,7 @@
                                message = !checkQualityInfoCompleteFlag ? "跳序，" : "";
                                message += info.QualityState != (int)QualityStateEnum.OK ? "质量不符合" : "";
                            }
                            ////反馈给PLC，（写入点待定）
                            //MessageModel fr = null;
                            //fr = plcService.WriteValuePoint("", "", plcFlag, PLCManger.GetTypeForString("bool"));
                            //if (fr.result)
                            //{
                            //    Log4NetHelper.WriteInfoLog(type, $" 工件{info.WorkPieceID} {loginfo.WorkingProcedure}工序反馈给PLC 成功， 出现 {message}");
                            //}
                            //else
                            //{
                            //    Log4NetHelper.WriteErrorLog(type, $" 工件{info.WorkPieceID} {loginfo.WorkingProcedure}工序反馈给PLC 失败， 出现 {message} ，失败原因：{fr.resMsg}");
                            //}

                            //#region 反馈PLC

                            //bool checkQualityInfoCompleteFlag = false;
                            //bool plcFlag = true;//反馈给PLC的标记
                            //string message = "";
                            //checkQualityInfoCompleteFlag = WorkPieceInfoManager.CheckQualityInfoComplete(info, wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));

                            //if (!checkQualityInfoCompleteFlag || info.QualityState != (int)QualityState.OK)
                            //{
                            //    plcFlag = false;
                            //    message = !checkQualityInfoCompleteFlag ? "跳序，" : "";
                            //message += info.QualityState != (int)QualityState.OK ? "质量不符合" : "";
                            //}
                            ////反馈给PLC，（写入点待定）
                            //MessageModel fr = null;
                            //fr = plcService.WriteValuePoint("", "", plcFlag, PLCManger.GetTypeForString("bool"));
                            //if (fr.result)
                            //{
                            //    Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" 工件{wplog.WorkPieceID} {WorkingProcedure}工序反馈给PLC 成功， 出现 {message}");
                            //}
                            //else
                            //{
                            //    Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" 工件{wplog.WorkPieceID} {WorkingProcedure}工序反馈给PLC 失败， 出现 {message} ，失败原因：{fr.resMsg}");
                            //}
                            //#endregion
                            
                        }
                        else
                        {//读码完成若工件质量不符合或发生跳序，不用管设备是否把工件放过去，数采系统都不变更当前工序，反馈设备PLC工件不符合，
@@ -348,6 +338,7 @@

                            info.WorkingProcedureCurrent = loginfo.WorkingProcedure;
                        }
                        //*/
                        #endregion

                        #region 更新设备实时表
@@ -983,7 +974,7 @@
                        cur_db_info = db.WorkPieceInfo.Where(o => o.WorkPieceID == loginfo.WorkPieceID).FirstOrDefault();
                        if (cur_db_info == null || cur_db_info.WorkPieceID.Length < 1)
                        {//没有工件信息，不做更新
                            Log4NetHelper.WriteErrorLog(type, $"工件{loginfo.WorkPieceID} 工件推出工序{loginfo.WorkingProcedure} 没有获取到工件信息不做更新");
                            Log4NetHelper.WriteErrorLog(type, $"工件{loginfo.WorkPieceID} 工件推出NOOK工序{loginfo.WorkingProcedure} 没有获取到工件信息不做更新");
                            return;
                        }
                        else
@@ -1929,7 +1920,7 @@
                        .OrderByDescending(o => o.WarnStartTime).FirstOrDefault();
                    if (loginfo.IsMessage)
                    {//若有告警，如果有设备状态变更，肯定插入，此处只修改即可
                        //若有告警，如果设备状态没有变更，有告警，也不插入新的（问题：当状态没有更改，如一直是故障，但告警信息有变化，怎么办  ps：此处先不管）
                     //若有告警，如果设备状态没有变更，有告警，也不插入新的（问题：当状态没有更改，如一直是故障，但告警信息有变化，怎么办  ps：此处先不管）
                        infolog.WarnStartTime = DateTimeHelper.GetDateTime();
                        infolog.WarnType = alertall;
                        infolog.Warnmsg = warnmsg;
@@ -2279,10 +2270,10 @@
                        info.UpdatedTime = DateTimeHelper.GetDateTime();
                        info.UpdatedUserName = threadinfo.Threadcode;
                        info.Threadlastmodifytime = threadinfo.Threadlastmodifytime > DateTime.MinValue ? threadinfo.Threadlastmodifytime : info.Threadlastmodifytime;//如果有传参则更新
                        //if (info.Threadstatue==1)
                        //{
                        //    info.Threadlastmodifytime = DateTimeHelper.GetDateTime();//最新跑到数据
                        //}
                                                                                                                                                                      //if (info.Threadstatue==1)
                                                                                                                                                                      //{
                                                                                                                                                                      //    info.Threadlastmodifytime = DateTimeHelper.GetDateTime();//最新跑到数据
                                                                                                                                                                      //}
                    }
                    db.SaveChanges();
                }