增加 JiaJuGongWei

schangxiang@126.com

2024-09-11 dfbe7cb2992df2d4195b12026d1f9e0a7423460e

增加  JiaJuGongWei

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/1_ReadQRcodeManager.cs

@@ -145,6 +145,7 @@

                            new_process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                            new_process.CreatedUserName = loginfo.MonitoringPoint;
                            new_process.JiaJuGongWei = loginfo.JiaJuGongWei;
                            new_process.DataCapturePointCname = loginfo.DataCapturePointCname;
                            new_process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            new_process.UpdatedUserName = loginfo.MonitoringPoint;

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/2_QualityInfoCompleteManager.cs

@@ -5,6 +5,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Web.UI.WebControls;

namespace iWare_SCADA_BusinessLogical.BLL.Important
{
@@ -303,6 +304,7 @@

                            process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                            process.CreatedUserName = WorkPieceInfoManager.ResetUpdatedUserName(logMiddle);
                            process.JiaJuGongWei = process.JiaJuGongWei;
                            process.DataCapturePointCname = logMiddle.DataCapturePointCname;
                            process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            process.UpdatedUserName = WorkPieceInfoManager.ResetUpdatedUserName(logMiddle);

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/3_WorkingProcedureCompleteManager.cs

@@ -5,6 +5,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Web.UI.WebControls;

namespace iWare_SCADA_BusinessLogical.BLL.Important
{
@@ -204,6 +205,7 @@
                                add_process.QualityState = WorkPieceInfoManager.GetQualityStateValue(logMiddle.QualityState);
                            }
                            add_process.CreatedUserName = logMiddle.MonitoringPoint;
                            add_process.JiaJuGongWei = logMiddle.JiaJuGongWei;
                            add_process.DataCapturePointCname = logMiddle.DataCapturePointCname;
                            add_process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            add_process.UpdatedUserName = logMiddle.MonitoringPoint;

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/4_WorkPiecePushOffManager.cs

@@ -5,6 +5,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Web.UI.WebControls;

namespace iWare_SCADA_BusinessLogical.BLL.Important
{
@@ -124,6 +125,7 @@
                            add_process.QualityState = WorkPieceInfoManager.GetQualityStateValue(logMiddle.QualityState);

                            add_process.CreatedUserName = logMiddle.MonitoringPoint;
                            add_process.JiaJuGongWei = logMiddle.JiaJuGongWei;
                            add_process.DataCapturePointCname = logMiddle.DataCapturePointCname;
                            add_process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            add_process.UpdatedUserName = logMiddle.MonitoringPoint;

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/5_WorkPieceSPCPushOffManager.cs

@@ -5,6 +5,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Web.UI.WebControls;

namespace iWare_SCADA_BusinessLogical.BLL.Important
{
@@ -101,6 +102,7 @@
                        process.QualityState = (int)QualityStateEnum.Suspected;
                        process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                        process.CreatedUserName = logMiddle.MonitoringPoint;
                        process.JiaJuGongWei = logMiddle.JiaJuGongWei;
                        process.DataCapturePointCname = logMiddle.DataCapturePointCname;
                        process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                        process.UpdatedUserName = logMiddle.MonitoringPoint;

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs

@@ -198,6 +198,7 @@
                                        //特殊处理OP50 【Editby shaocx,2024-08-16】
                                        string sideValue = GetSideForOP50(plcService, wplog);
                                        wplog.MonitoringPoint += sideValue;
                                        wplog.JiaJuGongWei = SystemBussinessHelper.GetJiaJuGongWei(wplog.MonitoringPoint, wplog.WorkingProcedure);
                                        //wplog.CreatedUserName = wplog.MonitoringPoint;
                                        SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, wplog.MonitoringPoint, DataCapturePointCname);


 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs

@@ -504,7 +504,7 @@
                                            SystemValue.OP20_Side_Value = sideValue;
                                        }
                                        logMiddle.MonitoringPoint += SystemValue.OP20_Side_Value;
                                        //logMiddle.JiaJuGongWei
                                        logMiddle.JiaJuGongWei = SystemBussinessHelper.GetJiaJuGongWei(logMiddle.MonitoringPoint, logMiddle.WorkingProcedure);
                                        //logMiddle.CreatedUserName = logMiddle.MonitoringPoint;
                                        SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref logMiddle, logMiddle.MonitoringPoint, DataCapturePointCname);


 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs

@@ -546,6 +546,7 @@
                        process.StartTime = DateTimeHelper.GetDateTime();
                        process.EndTime = file.LastWriteTime;
                        process.CreatedUserName = _DataCapturePointCode;
                        process.JiaJuGongWei = "";
                        process.DataCapturePointCname = DataCapturePointCname;
                        process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                        process.UpdatedUserName = _DataCapturePointCode;

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs

@@ -17,6 +17,48 @@
    {

        /// <summary>
        /// 获取夹具工位
        /// </summary>
        /// <param name="str"></param>
        /// <param name="workingProcedure"></param>
        /// <returns></returns>
        public static string GetJiaJuGongWei(string str, string workingProcedure)
        {
            try
            {
                if (string.IsNullOrEmpty(str))
                {
                    return "";
                }

                if (workingProcedure == "OP20")
                {
                    if (str.Length == "OP2002C2".Length)
                    {
                        int length = str.Length;
                        string lastTwoCharacters = str.Substring(length - 2, 2);
                        return lastTwoCharacters;
                    }
                }
                else if (workingProcedure == "OP50")
                {
                    if (str.Length == "OP5001A3".Length)
                    {
                        int length = str.Length;
                        string lastTwoCharacters = str.Substring(length - 2, 2);
                        return lastTwoCharacters;
                    }
                }
            }
            catch (Exception)
            {
                return "";
            }
            return "";
        }


        /// <summary>
        /// 模拟时间（返回秒）
        /// </summary>
        /// <param name="workingProcedure"></param>

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/WorkPieceProcessHelper.cs

@@ -54,6 +54,7 @@

                process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                process.CreatedUserName = _user;
                process.JiaJuGongWei = "";
                process.DataCapturePointCname = "打码完成标记";
                process.CreatedTime = _time;
                process.UpdatedUserName = _user;
@@ -110,6 +111,7 @@

                process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                process.CreatedUserName = _user;
                process.JiaJuGongWei = "";
                process.DataCapturePointCname = "工序完成标记";
                process.CreatedTime = _end_time;
                process.UpdatedUserName = _user;

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceLog.cs

@@ -166,5 +166,8 @@
        [MaxLength(255)]
        public string PieceLogTypeName { get; set; }


        public string JiaJuGongWei { get; set; }

    }
}