From 1e38f44af86775a341e4d0e4411d24ad35e417d3 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 28 六月 2024 07:49:36 +0800
Subject: [PATCH] 调整平面图调用接口时间

---
 代码管理/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/One_two_unitJob.cs |  363 ++++++++++++++++++++++++++++-----------------------
 1 files changed, 197 insertions(+), 166 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/One_two_unitJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/One_two_unitJob.cs"
index 4d1d7fc..dbafe1e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/One_two_unitJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/One_two_unitJob.cs"
@@ -1,4 +1,5 @@
 锘縰sing FreeSql;
+using OfficeOpenXml.Drawing.Chart;
 using Quartz;
 using System;
 using System.Collections.Generic;
@@ -6,12 +7,15 @@
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
+using WIDESEA_Comm;
 using WIDESEA_Comm.ItemDB;
 using WIDESEA_Comm.LogInfo;
 using WIDESEA_Core.EFDbContext;
+using WIDESEA_Core.Extensions;
 using WIDESEA_Entity.DomainModels;
 using WIDESEA_WCS.IRepositories;
 using WIDESEA_WCS.IServices;
+using WIDESEA_WCS.Jobs;
 using WIDESEA_WCS.Repositories;
 using WIDESEA_WCS.Services;
 using WIDESEA_WCS.WCSClient;
@@ -23,186 +27,213 @@
     /// 涓�浜屽崟鍏冭皟搴�
     /// </summary>
     [DisallowConcurrentExecution]
-    public class One_two_unitJob : IJob
+    public class One_two_unitJob : JobBase, IJob
     {
         public Task Execute(IJobExecutionContext context)
         {
             try
             {
-                var client = context.JobDetail.JobDataMap.Get("JobParams") as PLCClient;
-                if (client == null)
-                {
-                    return Task.CompletedTask;
-                }
-
-                //鑷姩閲嶈繛
-                if (!client.IsConnected)
-                {
-                    client.Connect();
-                    return Task.CompletedTask;
-                }
-
-                DoAction(client);
-            }
-            catch { }
-            return Task.CompletedTask;
-        }
-        static List<GDXDB> gDXDBs = new List<GDXDB>();
-        private void DoAction(PLCClient client)
-        {
-            try
-            {
-                #region 璇诲啓鏂规硶銆佹棩蹇椼�佹墽琛屾椂闂�
-                //client.Write("DB400.DBX0", "123456");
-                //client.WriteByOrder("R_wheel_SN", "123456", "4.1");
-                //client.WriteByOrder("R_wheel_SN", "666666", "4.2");
-
-                //var res = client.Read<string>("DB400.DBX0", 20);
-                //var res1 = client.ReadByOrder<string>("R_wheel_SN", "4.1");
-                //var res2 = client.ReadByOrder<string>("R_wheel_SN", "4.2");
-
-                //鏃ュ織鍐欏叆
-                //WriteDBLog.Info("涓�浜屽崟鍏冭皟搴�", "4.1:" + res1 + ";4.2:" + res2, "PCS");
-
-                //鎵ц瀹屾垚鏃堕棿
-                //Console.WriteLine(DateTime.Now);
-                #endregion 
-
-                #region     娣诲姞PLC鍦板潃淇℃伅
-                //VOLContext Context = new VOLContext();
-                //Idt_plcinfodetailRepository dt_PlcinfodetailService = new dt_plcinfodetailRepository(Context);
-                //List<dt_plcinfodetail> plcinfodetails = new List<dt_plcinfodetail>();
-                //for (int i = 106; i <= 110; i++)
-                //{
-                //    dt_plcinfodetail dt_Plcinfodetail = new dt_plcinfodetail()
-                //    {
-                //        plcdetail_id = Guid.NewGuid(),
-                //        plcdetail_iotype = "One_two_unit",
-                //        plcdetail_db = "DB400",
-                //        plcdetail_value = "DBX" + ((i - 1) * 30),
-                //        plcdetail_valtype = "string",
-                //        plcdetail_len = 20,
-                //        plcdetail_name = "R_wheel_SN",
-                //        plcdetail_number = "7." + (i - 80),
-                //        plcdetail_remark = "璇诲彇杞﹁疆SN鍙�"
-                //    };
-                //    plcinfodetails.Add(dt_Plcinfodetail);
-                //    dt_plcinfodetail dt_Plcinfodetail1 = new dt_plcinfodetail()
-                //    {
-                //        plcdetail_id = Guid.NewGuid(),
-                //        plcdetail_iotype = "One_two_unit",
-                //        plcdetail_db = "DB400",
-                //        plcdetail_value = "DBX" + ((i - 1) * 30 + 20),
-                //        plcdetail_valtype = "int",
-                //        plcdetail_name = "R_wheel_type",
-                //        plcdetail_number = "7." + (i - 80),
-                //        plcdetail_remark = "璇诲彇杞﹁疆绫诲瀷"
-                //    };
-                //    plcinfodetails.Add(dt_Plcinfodetail1);
-                //    dt_plcinfodetail dt_Plcinfodetail2 = new dt_plcinfodetail()
-                //    {
-                //        plcdetail_id = Guid.NewGuid(),
-                //        plcdetail_iotype = "One_two_unit",
-                //        plcdetail_db = "DB400",
-                //        plcdetail_value = "DBX" + ((i - 1) * 30 + 22),
-                //        plcdetail_valtype = "byte",
-                //        plcdetail_name = "R_part_status",
-                //        plcdetail_number = "7." + (i - 80),
-                //        plcdetail_remark = "璇诲彇杞﹁疆闆朵欢鐘舵��"
-                //    };
-                //    plcinfodetails.Add(dt_Plcinfodetail2);
-                //    dt_plcinfodetail dt_Plcinfodetail3 = new dt_plcinfodetail()
-                //    {
-                //        plcdetail_id = Guid.NewGuid(),
-                //        plcdetail_iotype = "One_two_unit",
-                //        plcdetail_db = "DB400",
-                //        plcdetail_value = "DBX" + ((i - 1) * 30 + 23),
-                //        plcdetail_valtype = "byte",
-                //        plcdetail_name = "R_part_process",
-                //        plcdetail_number = "7." + (i - 80),
-                //        plcdetail_remark = "璇诲彇杞﹁疆闆朵欢宸ヨ壓"
-                //    };
-                //    plcinfodetails.Add(dt_Plcinfodetail3);
-                //    dt_plcinfodetail dt_Plcinfodetail4 = new dt_plcinfodetail()
-                //    {
-                //        plcdetail_id = Guid.NewGuid(),
-                //        plcdetail_iotype = "One_two_unit",
-                //        plcdetail_db = "DB400",
-                //        plcdetail_value = "DBX" + ((i - 1) * 30 + 24),
-                //        plcdetail_valtype = "byte",
-                //        plcdetail_name = "R_machine_nr",
-                //        plcdetail_number = "7." + (i - 80),
-                //        plcdetail_remark = "璇诲彇杈婇亾machine_nr"
-                //    };
-                //    plcinfodetails.Add(dt_Plcinfodetail4);
-                //    dt_plcinfodetail dt_Plcinfodetail5 = new dt_plcinfodetail()
-                //    {
-                //        plcdetail_id = Guid.NewGuid(),
-                //        plcdetail_iotype = "One_two_unit",
-                //        plcdetail_db = "DB400",
-                //        plcdetail_value = "DBX" + ((i - 1) * 30 + 25),
-                //        plcdetail_valtype = "byte",
-                //        plcdetail_name = "R_direction",
-                //        plcdetail_number = "7." + (i - 80),
-                //        plcdetail_remark = "璇诲彇杈婇亾direction"
-                //    };
-                //    plcinfodetails.Add(dt_Plcinfodetail5);
-                //}
-                //dt_PlcinfodetailService.AddRange(plcinfodetails, true);
-                #endregion
-
-                VOLContext Context = new VOLContext();
-                Idt_plcinfoheadRepository repository = new dt_plcinfoheadRepository(Context);
-                Idt_plcinfodetailRepository plcRepository = new dt_plcinfodetailRepository(Context);
-
-                PropertyInfo[] propertyInfos = typeof(GDXDB).GetProperties();//鑾峰彇鎵�鏈夊睘鎬�
-                var plc = repository.FindFirst(x => x.plcinfo_name == client.PLCName);
-                var numbers = plcRepository.Find(x => x.plcdetail_iotype == plc.plcinfo_iotyep).GroupBy(x => x.plcdetail_number).ToList();
-                foreach (var number in numbers)
-                {
-                    GDXDB dBItem = gDXDBs.Where(x => x.R_Name == number.Key).FirstOrDefault();
-                    if (dBItem == null)
-                    {
-                        dBItem = new();
-                        dBItem.OnReadSignal += HandleReadSignal;
-                        gDXDBs.Add(dBItem);
-                        //object obj = dBItem.R_part_status;
-                        //dBItem.R_part_status = client.Read<byte>(number.Key);
-                    }
-                    List<dt_plcinfodetail> details = plcRepository.Find(x => x.plcdetail_iotype == plc.plcinfo_iotyep && x.plcdetail_number == number.Key).ToList();
-                    for (int i = 0; i < propertyInfos.Length; i++)
-                    {
-                        if (i == 0)
-                        {
-                            dBItem.R_Name = number.Key;
-                        }
-                        else
-                        {
-                            object readData = DBExtension.Read(details.Where(x => x.plcdetail_name == propertyInfos[i].Name).FirstOrDefault(), client);
-                            if (readData != null) { }
-                            object obj = propertyInfos[i].GetValue(dBItem);
-                            if (obj != readData)
-                                propertyInfos[i].SetValue(dBItem, readData);
-                        }
-                    }
-                }
+                AddDB();
+                //ExecuteJob(context, DoAction);
             }
             catch (Exception ex)
             {
-                Console.WriteLine(ex.Message);
+
             }
+            return Task.CompletedTask;
         }
 
-        public void HandleReadSignal(GDXDB DBItem)
+        private void DoAction(IJobExecutionContext context)
         {
-            VOLContext Context = new VOLContext();
-            Idt_ActualProductionRepository repository = new dt_ActualProductionRepository(Context);
-            var info = repository.FindFirst(x => x.SN == DBItem.R_wheel_SN);//鏌ヨ杞﹁疆鐨勮缁嗕俊鎭�
-            if (info != null)
+            var client = context.JobDetail.JobDataMap.Get("JobParams") as PLCClient;
+            //鑷姩閲嶈繛
+            if (!client.IsConnected)
             {
-                //鍛婅瘔妗佹灦
-
+                client.Connect();
+                return;
             }
+            StackerReadDBItem.StackerReadDBItems = new List<StackerReadDBItem>();
+            PropertyInfo[] propertyInfos = typeof(StackerReadDBItem).GetProperties();
+            var groups = client.itemGroups.OrderBy(x => x.Methods).ThenBy(x => x.name).GroupBy(x => x.Methods).ToList();
+            foreach (var key in groups)
+            {
+                StackerReadDBItem StackerDBItem = new StackerReadDBItem();
+                foreach (var propertyInfo in propertyInfos)
+                {
+                    if (propertyInfo.Name == "StackerNo")
+                    {
+                        StackerDBItem.StackerNo = key.Key;
+                    }
+                    else
+                    {
+                        DBItemGroup group = key.FirstOrDefault(x => x.name == propertyInfo.Name);
+                        if (group != null)
+                        {
+                            var readData = DBExtension.Read(group, client);
+                            switch (propertyInfo.Name)
+                            {
+                                case "R_wheel_SN":
+                                    StackerDBItem.R_wheel_SN = readData.ToString();
+                                    break;
+                                case "R_wheel_type":
+                                    StackerDBItem.R_wheel_type = Convert.ToInt16(readData);
+                                    break;
+                                case "R_part_status":
+                                    StackerDBItem.R_part_status = Convert.ToByte(readData);
+                                    break;
+                                case "R_part_process":
+                                    StackerDBItem.R_part_process = Convert.ToByte(readData);
+                                    break;
+                                case "R_machine_nr":
+                                    StackerDBItem.R_machine_nr = Convert.ToBoolean(readData);
+                                    break;
+                                case "R_direction":
+                                    StackerDBItem.R_direction = Convert.ToByte(readData);
+                                    break;
+                            }
+                        }
+                    }
+                }
+                StackerReadDBItem.StackerReadDBItems.Add(StackerDBItem);
+            }
+        }
+        /// <summary>
+        /// 娣诲姞DB鍦板潃淇℃伅
+        /// </summary>
+        public void AddDB()
+        {
+            VOLContext context = new VOLContext();
+            Idt_plcinfodetailRepository repository = new dt_plcinfodetailRepository(context);
+            List<dt_plcinfodetail> plcinfodetail = new List<dt_plcinfodetail>();
+            string name = "VK5";
+            for (int i = 1; i <= 2; i++)
+            {
+                dt_plcinfodetail dt_Plcinfodetail1 = new dt_plcinfodetail()
+                {
+                    plcdetail_id = Guid.NewGuid(),
+                    plcdetail_iotype = name,
+                    plcdetail_db = "DB603",
+                    plcdetail_value = (0 + (i - 1) * 144).ToString(),
+                    plcdetail_valtype = "byte",
+                    plcdetail_name = "oi_on",
+                    plcdetail_opratortype = "labeller",
+                    plcdetail_remark = "鐢宠",
+                    plcdetail_number = i + "鍗曞厓",
+                };
+                plcinfodetail.Add(dt_Plcinfodetail1);
+                dt_plcinfodetail dt_Plcinfodetail2 = new dt_plcinfodetail()
+                {
+                    plcdetail_id = Guid.NewGuid(),
+                    plcdetail_iotype = name,
+                    plcdetail_db = "DB603",
+                    plcdetail_value = (2 + (i - 1) * 144).ToString(),
+                    plcdetail_len = 20,
+                    plcdetail_valtype = "string",
+                    plcdetail_name = "o_wp_id",
+                    plcdetail_opratortype = "labeller",
+                    plcdetail_remark = "杞﹁疆SN鍙�",
+                    plcdetail_number = i + "鍗曞厓",
+                };
+                plcinfodetail.Add(dt_Plcinfodetail2);
+                dt_plcinfodetail dt_Plcinfodetail3 = new dt_plcinfodetail()
+                {
+                    plcdetail_id = Guid.NewGuid(),
+                    plcdetail_iotype = name,
+                    plcdetail_db = "DB603",
+                    plcdetail_value = (24 + (i - 1) * 144).ToString(),
+                    plcdetail_len = 20,
+                    plcdetail_valtype = "string",
+                    plcdetail_name = "i_job_id",
+                    plcdetail_opratortype = "labeller",
+                    plcdetail_remark = "宸ュ崟缂栧彿",
+                    plcdetail_number = i + "鍗曞厓",
+                };
+                plcinfodetail.Add(dt_Plcinfodetail3);
+                dt_plcinfodetail dt_Plcinfodetail4 = new dt_plcinfodetail()
+                {
+                    plcdetail_id = Guid.NewGuid(),
+                    plcdetail_iotype = name,
+                    plcdetail_db = "DB603",
+                    plcdetail_value = (22 + (i - 1) * 144).ToString(),
+                    plcdetail_valtype = "byte",
+                    plcdetail_name = "i_status",
+                    plcdetail_opratortype = "labeller",
+                    plcdetail_remark = "鐘舵��",
+                    plcdetail_number = i + "鍗曞厓",
+                };
+                plcinfodetail.Add(dt_Plcinfodetail4);
+                dt_plcinfodetail dt_Plcinfodetail5 = new dt_plcinfodetail()
+                {
+                    plcdetail_id = Guid.NewGuid(),
+                    plcdetail_iotype = name,
+                    plcdetail_db = "DB603",
+                    plcdetail_value = (44 + (i - 1) * 144).ToString(),
+                    plcdetail_len = 20,
+                    plcdetail_valtype = "string",
+                    plcdetail_name = "i_heat_id",
+                    plcdetail_opratortype = "labeller",
+                    plcdetail_remark = "鐐変唬鍙�",
+                    plcdetail_number = i + "鍗曞厓",
+                };
+                plcinfodetail.Add(dt_Plcinfodetail5);
+                dt_plcinfodetail dt_Plcinfodetail6 = new dt_plcinfodetail()
+                {
+                    plcdetail_id = Guid.NewGuid(),
+                    plcdetail_iotype = name,
+                    plcdetail_db = "DB603",
+                    plcdetail_value = (64 + (i - 1) * 144).ToString(),
+                    plcdetail_len = 20,
+                    plcdetail_valtype = "string",
+                    plcdetail_name = "i_billet_id",
+                    plcdetail_opratortype = "labeller",
+                    plcdetail_remark = "閽㈠澂鍙�",
+                    plcdetail_number = i + "鍗曞厓",
+                };
+                plcinfodetail.Add(dt_Plcinfodetail6);
+                dt_plcinfodetail dt_Plcinfodetail7 = new dt_plcinfodetail()
+                {
+                    plcdetail_id = Guid.NewGuid(),
+                    plcdetail_iotype = name,
+                    plcdetail_db = "DB603",
+                    plcdetail_value = (84 + (i - 1) * 144).ToString(),
+                    plcdetail_len = 20,
+                    plcdetail_valtype = "string",
+                    plcdetail_name = "i_batch_id",
+                    plcdetail_opratortype = "labeller",
+                    plcdetail_remark = "鐑鐞嗘壒娆�",
+                    plcdetail_number = i + "鍗曞厓",
+                };
+                plcinfodetail.Add(dt_Plcinfodetail7);
+                dt_plcinfodetail dt_Plcinfodetail8 = new dt_plcinfodetail()
+                {
+                    plcdetail_id = Guid.NewGuid(),
+                    plcdetail_iotype = name,
+                    plcdetail_db = "DB603",
+                    plcdetail_value = (104 + (i - 1) * 144).ToString(),
+                    plcdetail_len = 20,
+                    plcdetail_valtype = "string",
+                    plcdetail_name = "i_drawing_id",
+                    plcdetail_opratortype = "labeller",
+                    plcdetail_remark = "鍥惧彿",
+                    plcdetail_number = i + "鍗曞厓",
+                };
+                plcinfodetail.Add(dt_Plcinfodetail8);
+                dt_plcinfodetail dt_Plcinfodetail9 = new dt_plcinfodetail()
+                {
+                    plcdetail_id = Guid.NewGuid(),
+                    plcdetail_iotype = name,
+                    plcdetail_db = "DB603",
+                    plcdetail_value = (124 + (i - 1) * 144).ToString(),
+                    plcdetail_len = 20,
+                    plcdetail_valtype = "string",
+                    plcdetail_name = "i_wheel_type",
+                    plcdetail_opratortype = "labeller",
+                    plcdetail_remark = "i_wheel_type",
+                    plcdetail_number = i + "鍗曞厓",
+                };
+                plcinfodetail.Add(dt_Plcinfodetail9);
+            }
+            repository.AddRange(plcinfodetail, true);
         }
     }
 }

--
Gitblit v1.9.3