2

schangxiang@126.com

2024-06-20 3ae4d4e84face9c3f81a8cd74e6458b5914a43e0

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs

@@ -1012,11 +1012,14 @@
                            info.CompleteTime = DateTimeHelper.GetDateTime();
                            info.OP80NewCode = loginfo.OP80NewCode;

                            //质检数据改为 获取文件后修改 【Editby shaocx,2024-06-15】
                            /*
                            info.QualityState = (int)((loginfo.QualityStateStr.Equals("OK") || loginfo.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
                            loginfo.QualityState = info.QualityState;
                            info.QualityStateUpdateUser = loginfo.UpdatedUserName;
                            info.QualityStateUpdateTime = loginfo.UpdatedTime.Value.LocalDateTime;
                            info.QualityStateUpdateMode = QualityStateUpdateMode.Auto.ToString();
                            //*/

                            var qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == loginfo.WorkPieceID).FirstOrDefault();
                            if (qualityData == null || qualityData.WorkPieceID.Length < 1 || qualityData.WorkingProcedure.Length < 1)
@@ -1027,6 +1030,8 @@
                            //修改QualityDataInfo表 //重复收到质量信息，会覆盖之前的
                            EntityPropHelper<WorkPieceLogMiddle, QualityDataInfo>.CopyProp(loginfo, qualityData, GetQualityDataInfoUpdate(loginfo.WorkingProcedure, loginfo.MonitoringPoint));//指定修改字段

                            //质检数据改为 获取文件后修改 【Editby shaocx,2024-06-15】
                            /*
                            qualityData.QualityStateUpdateUser = info.UpdatedUserName;
                            qualityData.QualityReceiveTime = info.UpdatedTime.Value.LocalDateTime;
                            qualityData.QualityStateUpdateMode = info.QualityStateUpdateMode;
@@ -1043,6 +1048,7 @@
                            {
                                info.QualityErrorInfo = "";
                            }
                            //*/
                        }
                        else if (loginfo.WorkingProcedure.Equals("OP30"))
                        {
@@ -1091,13 +1097,23 @@
                            process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                            process.StartTime = DateTimeHelper.GetDateTime();
                            process.EndTime = DateTimeHelper.GetDateTime();
                            process.QualityState = loginfo.QualityState.HasValue ? loginfo.QualityState.Value : (int)QualityState.OK;
                            if (loginfo.WorkingProcedure.Equals("OP80"))
                            {//OP80的质量数据是后来获取文件搞的
                            }
                            else
                            {
                                process.QualityState = loginfo.QualityState.HasValue ? loginfo.QualityState.Value : (int)QualityState.OK;
                            }
                            process.CreatedUserName = loginfo.MonitoringPoint;
                            process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            process.UpdatedUserName = loginfo.MonitoringPoint;
                            process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            process.OperationType = OperationType.生产.ToString();
                            process.Remarks = "";
                            if (loginfo.WorkingProcedure.Equals("OP80"))
                            {
                                process.GetQcDataFlag = loginfo.GetQcDataFlag;//赋值标记 [Editby shaocx,2024-06-15]
                            }
                            if (op80id > 0)
                            {
                                process.QualityDataInfoID = op80id;
@@ -1113,6 +1129,13 @@
                            pro.EndTime = DateTimeHelper.GetDateTime();
                            pro.UpdatedUserName = loginfo.MonitoringPoint;
                            pro.UpdatedTime = DateTimeHelper.GetDateTime();
                            if (loginfo.WorkingProcedure.Equals("OP80"))
                            {
                                if (pro.GetQcDataFlag != 0)
                                {
                                    pro.GetQcDataFlag = loginfo.GetQcDataFlag;//赋值标记 [Editby shaocx,2024-06-15]
                                }
                            }
                        }


@@ -1996,6 +2019,25 @@
                    dict.Add("QualityOP80To8", "QualityOP80To8");
                    dict.Add("QualityOP80To9", "QualityOP80To9");
                    dict.Add("QualityOP80To10", "QualityOP80To10");

                    //新增 【Editby shaocx,2024-06-16】
                    dict.Add("QualityOP80_Houdu", "QualityOP80_Houdu");
                    dict.Add("QualityOP80_ZXJ", "QualityOP80_ZXJ");
                    dict.Add("QualityOP80_DTKYZD", "QualityOP80_DTKYZD");
                    dict.Add("QualityOP80_XTSMYD", "QualityOP80_XTSMYD");
                    dict.Add("QualityOP80_XTXMYD", "QualityOP80_XTXMYD");
                    dict.Add("QualityOP80_D_TKZJ", "QualityOP80_D_TKZJ");
                    dict.Add("QualityOP80_D_S_X", "QualityOP80_D_S_X");
                    dict.Add("QualityOP80_D_S_Y", "QualityOP80_D_S_Y");
                    dict.Add("QualityOP80_D_X_X", "QualityOP80_D_X_X");
                    dict.Add("QualityOP80_D_X_Y", "QualityOP80_D_X_Y");
                    dict.Add("QualityOP80_X_TKZJ", "QualityOP80_X_TKZJ");
                    dict.Add("QualityOP80_X_S_X", "QualityOP80_X_S_X");
                    dict.Add("QualityOP80_X_S_Y", "QualityOP80_X_S_Y");
                    dict.Add("QualityOP80_X_X_X", "QualityOP80_X_X_X");
                    dict.Add("QualityOP80_X_X_Y", "QualityOP80_X_X_Y");
                  

                    break;
                default:
                    break;