From b52018589bf6c7ec1d51ce8ad000a7aa993b0ab5 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 13 四月 2026 16:06:15 +0800
Subject: [PATCH] 优化组盘表获取成品编号、流水号、供方代码

---
 代码管理/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Tasks/PLCJob.cs |  767 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 661 insertions(+), 106 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Tasks/PLCJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Tasks/PLCJob.cs"
index dc9ec1b..ed85f36 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Tasks/PLCJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Tasks/PLCJob.cs"
@@ -1,106 +1,661 @@
-锘縰sing Autofac.Core;
-using HslCommunication;
-using HslCommunication.Core;
-using Microsoft.VisualBasic.FileIO;
-using Quartz;
-using SixLabors.ImageSharp.PixelFormats;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEAWCS_BasicInfoService;
-using WIDESEAWCS_Communicator;
-using WIDESEAWCS_Core.Helper;
-using WIDESEAWCS_QuartzJob;
-using WIDESEAWCS_QuartzJob.DeviceBase;
-using WIDESEAWCS_QuartzJob.StackerCrane.Enum;
-
-namespace WIDESEAWCS_Tasks
-{
-    [DisallowConcurrentExecution]
-    public class PLCJob : JobBase, IJob
-    {
-        private readonly IBoxingService _boxingService;
-        private readonly IBoxingDetailService _boxingDetailService;
-        private readonly IFormulaService _formulaService;
-        private readonly IFormulaDetailService _formulaDetailService;
-        private readonly IProcessInfoService _processInfoService;
-        public PLCJob(IBoxingService boxingService, IBoxingDetailService boxingDetailService, IFormulaService formulaService, IFormulaDetailService formulaDetailService, IProcessInfoService processInfoService)
-        {
-            _boxingService = boxingService;
-            _boxingDetailService = boxingDetailService;
-            _formulaService = formulaService;
-            _formulaDetailService = formulaDetailService;
-            _processInfoService = processInfoService;
-        }
-
-        public Task Execute(IJobExecutionContext context)
-        {
-
-            bool flag = context.JobDetail.JobDataMap.TryGetValue("JobParams", out object? value);
-            if (flag && value != null)
-            {
-                if (value is OtherDevice)
-                {
-                    OtherDevice device = (OtherDevice)value;
-                    try
-                    {
-                        var Heart = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rboolHeart);
-                        var EMG = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rboolEMG);
-                        var AutoExecuting = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rboolAutoExecuting);
-                        var OnlineExecuting = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rboolOnlineExecuting);
-                        var Error = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rboolError);
-                        if (Heart && !EMG && AutoExecuting && OnlineExecuting && !Error)
-                        {
-                            #region 涓婄嚎鎵爜
-                            var Location1ScanStart = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rboolLocation1ScanStart);
-                            var Location1ScanDone = device.GetValue<W_PLCDBName, bool>(W_PLCDBName.wboolLocation1ScanDone);
-                            if (Location1ScanStart && !Location1ScanDone)//鎺у埗鎵爜鏋壂鎻忔墭鐩樼爜锛屾牴鎹墭鐩樼爜鏌ヨ缁勭洏鏁版嵁锛屽垽鏂墭鐩樼粦瀹氭垚鍝佹槸鍚﹀凡缁戝畾鎵�鏈夋墍闇�闆朵欢
-                            {
-                                device.SetValue(W_PLCDBName.wboolLocation1ScanDone, true);
-                            }
-                            else if (!Location1ScanDone && Location1ScanStart)
-                            {
-                                device.SetValue(W_PLCDBName.wboolLocation1ScanDone, false);
-                            }
-                            #endregion
-
-
-                            #region 鍘嬭鎵爜
-                            var Location2ScanStart = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rboolLocation2ScanStart);
-                            if (Location2ScanStart)//鎺у埗鎵爜鏋壂鎻忔墭鐩樼爜锛屾牴鎹墭鐩樼爜鏌ヨ鎵樼洏缁戝畾鎴愬搧鍔犲伐鎵�闇�鏁版嵁锛屽啓鍏LC
-                            {
-
-                            }
-                            #endregion
-
-                            #region 妫�娴嬫壂鐮�
-                            var Location3ScanStart = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rboolLocation3ScanStart);
-                            #endregion
-
-                            #region 涓嬬嚎鎵爜
-                            var Location4ScanStart = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rboolLocation4ScanStart);
-                            #endregion
-                        }
-
-
-                        //var a = _boxingService.Repository.QueryFirst(x => x.PalletCode == "1232123");
-                        //WriteInfo(device.DeviceName, "infoLog");
-
-                        //WriteDebug(device.DeviceName, "debugLog");
-                    }
-                    catch (Exception ex)
-                    {
-                        WriteError(device.DeviceName, "閿欒", ex);
-                    }
-                }
-            }
-            return Task.CompletedTask;
-        }
-    }
-
-
-}
+锘縰sing OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
+using Quartz;
+using System.Linq;
+using System.Text;
+using WIDESEAWCS_BasicInfoService;
+using WIDESEAWCS_Common;
+using WIDESEAWCS_Common.PLCEnum;
+using WIDESEAWCS_Communicator;
+using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.BaseRepository;
+using WIDESEAWCS_Core.Helper;
+using WIDESEAWCS_DTO.BasicInfo;
+using WIDESEAWCS_IBasicInfoService;
+using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_QuartzJob;
+
+namespace WIDESEAWCS_Tasks
+{
+    [DisallowConcurrentExecution]
+    public class PLCJob : JobBase, IJob
+    {
+        private readonly IBoxingService _boxingService;
+        private readonly IBoxingDetailService _boxingDetailService;
+        private readonly IFormulaService _formulaService;
+        private readonly IFormulaDetailService _formulaDetailService;
+        private readonly IProcessInfoService _processInfoService;
+        private readonly IProcessInfoDetailService _processDetailInfoService;
+        private readonly IUnitOfWorkManage _unitOfWorkManage;
+        private readonly IScanStationService _scanStationService;
+
+        public PLCJob(IBoxingService boxingService,
+            IBoxingDetailService boxingDetailService,
+            IFormulaService formulaService,
+            IFormulaDetailService formulaDetailService,
+            IProcessInfoService processInfoService,
+            IProcessInfoDetailService processDetailInfoService,
+            IUnitOfWorkManage unitOfWorkManage,
+            IScanStationService scanStationService
+            )
+        {
+            _boxingService = boxingService;
+            _boxingDetailService = boxingDetailService;
+            _formulaService = formulaService;
+            _formulaDetailService = formulaDetailService;
+            _processInfoService = processInfoService;
+            _processDetailInfoService = processDetailInfoService;
+            _unitOfWorkManage = unitOfWorkManage;
+            _scanStationService = scanStationService;
+        }
+        public Task Execute(IJobExecutionContext context)
+        {
+
+            bool flag = context.JobDetail.JobDataMap.TryGetValue("JobParams", out object? value);
+            if (flag && value != null)
+            {
+                if (value is OtherDevice)
+                {
+                    OtherDevice device = (OtherDevice)value;
+                    try
+                    {
+                        if (!device.IsConnected) throw new Exception(device.DeviceName + "杩炴帴澶辫触");
+                        var Heart = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rboolHeart);
+                        var EMG = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rboolEMG);
+                        var AutoExecuting = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rboolAutoExecuting);
+                        var OnlineExecuting = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rboolOnlineExecuting);
+                        var Error = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rboolError);
+
+                        if (/*Heart &&*/ !EMG && AutoExecuting && OnlineExecuting && !Error)
+                        {
+                            //#region 闆朵欢妫�娴�
+                            //HandlePartDetection(device);
+                            //#endregion
+
+                            //#region 涓婄嚎鎵爜
+                            //HandleOnlineScan(device);
+                            //#endregion
+
+                            #region 鍘嬭鎵爜
+                            HandlePressScan(device);
+                            #endregion
+
+                            #region 鍘嬭淇℃伅涓婁紶
+                            HandlePressInfoUpload(device);
+                            #endregion
+
+                            #region 妫�娴嬫壂鐮�
+                            HandleDetectScan(device);
+                            #endregion
+
+                            #region 妫�娴嬩俊鎭笂浼�
+                            HandleDetectInfoUpload(device);
+                            #endregion
+
+                            #region 涓嬬嚎鎵爜
+                            HandleOfflineScan(device);
+                            #endregion
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        WriteError(device.DeviceName, "閿欒", ex);
+                    }
+                }
+            }
+            return Task.CompletedTask;
+        }
+
+
+
+
+        /// <summary>
+        /// 闆朵欢妫�娴�
+        /// </summary>
+        /// <param name="device"></param>
+        /// <exception cref="InvalidOperationException"></exception>
+        private void HandlePartDetection(OtherDevice device)
+        {
+            //DB800.1.4
+            var Location5ScanStart = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rboolLocation5ScanStart);
+            var Location5ScanDone = device.GetValue<W_PLCDBName, bool>(W_PLCDBName.wboolLocation5ScanDone);
+            if (Location5ScanStart && !Location5ScanDone)
+            {
+                try
+                {
+                    if (_scanStationService.Repository.QueryFirst(x => x.StationCode == "001").IsScanned == 0)
+                    {
+                        device.SetValue(W_PLCDBName.wboolLocation5ScanDone, true);
+                        return;
+                    }
+                    Dt_Boxing dt_Boxing = _boxingService.Repository.QueryData(x => true, 1, "Id desc").FirstOrDefault();
+                    if (dt_Boxing == null)
+                    {
+                        throw new InvalidOperationException("鏃犵粍鐩樻暟鎹�");
+                    }
+                    Dt_Formula dt_Formula = _formulaService.Repository.QueryFirst(x => x.ProductCode == dt_Boxing.ProductCode);
+                    if (dt_Formula == null)
+                    {
+                        throw new InvalidOperationException("鏃犳垚鍝侀厤鏂�");
+                    }
+                    List<Dt_BoxingDetail> dt_BoxingDetails = _boxingDetailService.Repository.QueryData(x => x.BoxingId == dt_Boxing.Id);
+                    List<Dt_FormulaDetail> dt_FormulaDetails = _formulaDetailService.Repository.QueryData(x => x.FormulaId == dt_Formula.Id && x.IsScanned == 1);
+                    if (!_boxingDetailService.CheckComponentsMatchExactly(dt_BoxingDetails.Select(x => x.ComponentCode).ToList(), dt_FormulaDetails.Select(x => x.ComponentCode).ToList()))
+                    {
+                        throw new InvalidOperationException("闆朵欢涓庨厤鏂硅〃涓笉鍚�");
+                    }
+                    device.SetValue(W_PLCDBName.wboolLocation5ScanDone, true);
+                }
+                catch (Exception ex)
+                {
+                    WriteError(device.DeviceName, "妫�娴嬮浂浠舵祦绋嬫墽琛屽紓甯�", ex);
+                }
+            }
+            else if (!Location5ScanStart && Location5ScanDone)
+            {
+                device.SetValue(W_PLCDBName.wboolLocation5ScanDone, false);
+            }
+        }
+
+        /// <summary>
+        /// 涓婄嚎鎵爜
+        /// </summary>
+        /// <param name="device"></param>
+        private void HandleOnlineScan(OtherDevice device)
+        {
+            //DB800.1.4
+            var Location5ScanStart = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rboolLocation5ScanStart);
+            var Location5ScanDone = device.GetValue<W_PLCDBName, bool>(W_PLCDBName.wboolLocation5ScanDone);
+            if (Location5ScanStart && !Location5ScanDone)//鎺у埗鎵爜鏋壂鎻忔墭鐩樼爜锛屾牴鎹墭鐩樼爜鏌ヨ缁勭洏鏁版嵁锛屽垽鏂墭鐩樼粦瀹氭垚鍝佹槸鍚﹀凡缁戝畾鎵�鏈夋墍闇�闆朵欢
+            {
+                Dt_Boxing dt_Boxing1 = _boxingService.Repository.QueryData(x => true, 1, "Id desc").FirstOrDefault();
+                if (dt_Boxing1 != null && dt_Boxing1.ProductCode == null)
+                {
+                    return;
+                }
+                //var PalletCode = "PL111";
+                var PalletCode = TcpClientExample.Start("192.168.2.120", 2001);
+                try
+                {
+                    if (!PalletCode.IsNotEmptyOrNull() || PalletCode == "NoRead")
+                    {
+                        throw new InvalidOperationException("鎵樼洏涓虹┖");
+                    }
+
+                    if (_boxingService.Repository.QueryFirst(x => x.PalletCode == PalletCode && x.ProductCode != null) != null)
+                    {
+                        device.SetValue(W_PLCDBName.wboolLocation5ScanDone, true);
+                        throw new InvalidOperationException("鎵樼洏浠ュ瓨鍦�");
+                    }
+
+                    Dt_Boxing dt_Boxing = new Dt_Boxing();
+                    dt_Boxing.PalletCode = PalletCode;
+                    _boxingService.Repository.AddData(dt_Boxing);
+
+
+
+                    //Dt_ScanStation dt_ScanStation = _scanStationService.Repository.QueryFirst(x => x.StationCode == "001");
+                    //if (dt_ScanStation == null)
+                    //{
+                    //    throw new InvalidOperationException("鏃犲伐浣嶆暟鎹�");
+                    //}
+                    //Dt_Formula dt_Formula = _formulaService.Repository.QueryFirst(x => x.ProductCode == dt_ScanStation.StationEndProduct);
+
+                    //if (dt_Formula == null)
+                    //{
+                    //    throw new InvalidOperationException("鏃犳垚鍝侀厤鏂�");
+                    //}
+
+                    //List<Dt_FormulaDetail> dt_FormulaDetails = _formulaDetailService.Repository.QueryData(x => x.FormulaId == dt_Formula.Id && x.IsScanned == 1);
+                    //if (dt_ScanStation.IsScanned == 0)
+                    //{ 
+                    //    Dt_Boxing dt_Boxing = new Dt_Boxing
+                    //    {
+                    //        PalletCode = PalletCode,
+                    //        ProductCode = dt_Formula.ProductCode,
+                    //        ProductName = dt_Formula.ProductName,
+                    //        Creater = "admin",
+                    //        CreateDate = new DateTime()
+                    //    };
+
+                    //    int id = _boxingService.Repository.AddData(dt_Boxing);
+                    //    foreach (var item in dt_FormulaDetails)
+                    //    {
+                    //        Dt_BoxingDetail dt_BoxingDetail = new Dt_BoxingDetail()
+                    //        {
+                    //            BoxingId = id,
+                    //            ComponentCode = item.ComponentCode,
+                    //            ComponentName = item.ComponentName,
+                    //            Creater = "admin",
+                    //            CreateDate = new DateTime()
+                    //        };
+                    //        _boxingDetailService.Repository.AddData(dt_BoxingDetail);
+                    //    }
+                    //    device.SetValue(W_PLCDBName.wboolLocation5ScanDone, true);
+                    //    return;
+                    //}
+
+                    //var boxing = _boxingService.Repository.QueryFirst(x => x.PalletCode == PalletCode);
+                    //if (boxing == null)
+                    //{
+                    //    throw new InvalidOperationException("鏈坊鍔犵粍鐩樹俊鎭�");
+                    //}
+
+                    //List<Dt_BoxingDetail> dt_BoxingDetails = _boxingDetailService.Repository.QueryData(x => x.BoxingId == boxing.Id);
+
+
+                    //if (!_boxingDetailService.CheckComponentsMatchExactly(dt_BoxingDetails.Select(x => x.ComponentCode).ToList(), dt_FormulaDetails.Select(x => x.ComponentCode).ToList()))
+                    //{
+                    //    throw new InvalidOperationException("闆朵欢涓庨厤鏂硅〃涓笉鍚�");
+                    //}
+
+
+                }
+                catch (Exception ex)
+                {
+                    WriteError(device.DeviceName, "涓婄嚎鎵爜娴佺▼鎵ц寮傚父", ex);
+                }
+            }
+            else if (!Location5ScanStart && Location5ScanDone)
+            {
+                device.SetValue(W_PLCDBName.wboolLocation5ScanDone, false);
+            }
+        }
+
+        /// <summary>
+        /// 鍘嬭鎵爜
+        /// </summary>
+        /// <param name="device"></param>
+        private void HandlePressScan(OtherDevice device)
+        {
+            //DB800.1.1
+            var Location2ScanStart = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rboolLocation2ScanStart);
+            var Location2ScanDone = device.GetValue<W_PLCDBName, bool>(W_PLCDBName.wboolLocation2ScanDone);
+            if (Location2ScanStart && !Location2ScanDone)//鎺у埗鎵爜鏋壂鎻忔墭鐩樼爜锛屾牴鎹墭鐩樼爜鏌ヨ鎵樼洏缁戝畾鎴愬搧鍔犲伐鎵�闇�鏁版嵁锛屽啓鍏LC
+            {
+                var PalletCode = TcpClientExample.Start("192.168.2.121", 2001);
+
+                try
+                {
+                    if (!PalletCode.IsNotEmptyOrNull() || PalletCode == "NoRead")
+                    {
+                        throw new InvalidOperationException("鎵樼洏鍙蜂负绌�");
+                    }
+                    Dt_Boxing dt_Boxing = _boxingService.Repository.QueryFirst(x => x.PalletCode == PalletCode);
+                    if (dt_Boxing == null)
+                    {
+                        device.SetValue(W_PLCDBName.wboolLocation2ScanDone, true);
+                        throw new InvalidOperationException("鎵樼洏涓虹┖");
+                    }
+                    if (dt_Boxing.ProductCode == null && dt_Boxing.BoxingNo == null)
+                    {
+                        device.SetValue(W_PLCDBName.wboolLocation2ScanDone, true);
+                        return;
+                    }
+
+                    Dt_Formula dt_Formula = _formulaService.Repository.QueryFirst(x => x.ProductCode == dt_Boxing.ProductCode);
+                    //鍐欏叆PLC
+                    device.SetValue(W_PLCDBName.wrealPressPalletCode, dt_Boxing.Id % 100);
+                    if(dt_Formula.PressNoTighten == 1)
+                    {
+                        device.SetValue(W_PLCDBName.wboolLocation8ScanDone,true);
+                    }
+                    else
+                    {
+                        device.SetValue(W_PLCDBName.wboolLocation8ScanDone, false);
+                    }
+
+                    device.SetValue(W_PLCDBName.wrealProductLength, dt_Formula.ProductLength);
+                    device.SetValue(W_PLCDBName.wrealProductWidth, dt_Formula.ProductWidth);
+                    device.SetValue(W_PLCDBName.wrealProductHeight, dt_Formula.ProductHeight + dt_Formula.GasketHeight);
+                    device.SetValue(W_PLCDBName.wrealScrewDownsetDistance, dt_Formula.ScrewDownsetDistance);
+                    //涓績楂樺害
+                    device.SetValue(W_PLCDBName.wrealScrewTorque, dt_Formula.ScrewTorqueOutput + dt_Formula.GasketHeight);
+                    device.SetValue(W_PLCDBName.wrealAutoScrewProgramNo, dt_Formula.DintAutoScrewOn);
+                    device.SetValue(W_PLCDBName.wrealPressPressure, dt_Formula.PressPressureDiff);
+                    device.SetValue(W_PLCDBName.wrealTighteningTorque, dt_Formula.PressTorqueDiff);
+                    device.SetValue(W_PLCDBName.wrealFastenTorque, dt_Formula.PressFastenTorque);
+
+
+                    //鍘嬭鎵爜瀹屾垚
+                    device.SetValue(W_PLCDBName.wboolLocation2ScanDone, true);
+
+
+                }
+                catch (Exception ex)
+                {
+                    WriteError(device.DeviceName, "鍘嬭鎵爜娴佺▼鎵ц寮傚父", ex);
+                }
+            }
+            else if (!Location2ScanStart && Location2ScanDone)
+            {
+                device.SetValue(W_PLCDBName.wboolLocation2ScanDone, false);
+            }
+        }
+
+
+        /// <summary>
+        /// 鍘嬭淇℃伅涓婁紶
+        /// </summary>
+        /// <param name="device"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void HandlePressInfoUpload(OtherDevice device)
+        {
+            //DB800.1.5
+            var Location6ScanStart = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rboolLocation6ScanStart);
+            var Location6ScanDone = device.GetValue<W_PLCDBName, bool>(W_PLCDBName.wboolLocation6ScanDone);
+            if (Location6ScanStart && !Location6ScanDone)//鎺у埗鎵爜鏋壂鎻忔墭鐩樼爜锛屾牴鎹墭鐩樼爜鏌ヨ鎵樼洏缁戝畾鎴愬搧鍔犲伐鎵�闇�鏁版嵁锛屽啓鍏LC
+            {
+
+                var PalletNum = device.GetValue<R_PLCDBName, int>(R_PLCDBName.rrealPressPalletCode);
+                try
+                {
+                    if (!PalletNum.IsNotEmptyOrNull())
+                    {
+                        throw new InvalidOperationException("鎵樼洏涓虹┖");
+                    }
+                    Dt_Boxing dt_Boxing = _boxingService.Repository.QueryFirst(x => x.Id % 100 == PalletNum);
+                    if (dt_Boxing == null)
+                    {
+                        device.SetValue(W_PLCDBName.wboolLocation6ScanDone, true);
+                        throw new InvalidOperationException("鏈壘鍒扮粍鐩樻暟鎹�");
+                    }
+                    Dt_Formula dt_Formula = _formulaService.Repository.QueryFirst(x => x.ProductCode == dt_Boxing.ProductCode);
+
+
+                    //鎺ユ敹鏁版嵁
+                    decimal ScrewTorque = (decimal)device.GetValue<R_PLCDBName, float>(R_PLCDBName.rrealDetectScrewTorque);
+                    decimal ScrewAngle = (decimal)device.GetValue<R_PLCDBName, float>(R_PLCDBName.rrealDetectScrewAngle);
+                    decimal PressPressure = (decimal)device.GetValue<R_PLCDBName, float>(R_PLCDBName.rrealDetectPressForce);
+                    bool PressTightenOk = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rrealPressScrewByScrewOK);
+                    bool PressTightenUnfinished = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rrealPressScrewByProcessUnfinished);
+
+
+
+                    //娣诲姞鍒版暟鎹簱
+                    Dt_ProcessInfo dt_ProcessInfo = new Dt_ProcessInfo()
+                    {
+                        PalletCode = dt_Boxing.PalletCode,
+                        ProductCode = dt_Formula.ProductCode,
+                        ProductName = dt_Formula.ProductName,
+                        ProductSn = dt_Boxing.BoxingNo,
+                        ProductStatus = 1,
+                        PressTightenOk = PressTightenOk ? 1 : 0,
+                        PressTightenUnfinished = PressTightenUnfinished ? 1 : 0,
+                        ScrewTorque = ScrewTorque,
+                        ScrewAngle = ScrewAngle,
+                        PressPressure = PressPressure,
+                    };
+
+                    if (
+                        PressPressure > dt_Formula.ScrewDownsetDistance + dt_Formula.PressPressureDiff || PressPressure < dt_Formula.ScrewDownsetDistance - dt_Formula.PressPressureDiff ||
+                        ScrewTorque > dt_Formula.PressFastenTorque + dt_Formula.PressTorqueDiff || ScrewTorque < dt_Formula.PressFastenTorque - dt_Formula.PressTorqueDiff
+                        )
+                    {
+                        dt_ProcessInfo.ProductStatus = 0;
+                    }
+
+                    _processInfoService.Repository.AddData(dt_ProcessInfo);
+
+                    // 鍘嬭淇℃伅涓婁紶瀹屾垚
+                    device.SetValue(W_PLCDBName.wboolLocation6ScanDone, true);
+                }
+                catch (Exception ex)
+                {
+                    WriteError(device.DeviceName, "鍘嬭淇℃伅涓婁紶娴佺▼鎵ц寮傚父", ex);
+                }
+            }
+            else if (!Location6ScanStart && Location6ScanDone)
+            {
+                device.SetValue(W_PLCDBName.wboolLocation6ScanDone, false);
+            }
+        }
+
+
+        /// <summary>
+        /// 妫�娴嬫壂鐮�
+        /// </summary>
+        /// <param name="device"></param>
+        private void HandleDetectScan(OtherDevice device)
+        {
+            //DB800.1.2
+            var Location3ScanStart = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rboolLocation3ScanStart);
+            var Location3ScanDone = device.GetValue<W_PLCDBName, bool>(W_PLCDBName.wboolLocation3ScanDone);
+            if (Location3ScanStart && !Location3ScanDone)
+            {
+                var PalletCode = TcpClientExample.Start("192.168.2.122", 2001);
+
+                try
+                {
+                    if (!PalletCode.IsNotEmptyOrNull() || PalletCode == "NoRead")
+                    {
+                        throw new InvalidOperationException("鎵樼洏涓虹┖");
+                    }
+                    Dt_Boxing dt_Boxing = _boxingService.Repository.QueryFirst(x => x.PalletCode == PalletCode);
+                    if (dt_Boxing == null)
+                    {
+                        device.SetValue(W_PLCDBName.wboolLocation3ScanDone, true);
+                        throw new InvalidOperationException("鎵樼洏涓虹┖");
+                    }
+                    if (dt_Boxing.ProductCode == null && dt_Boxing.BoxingNo == null)
+                    {
+                        device.SetValue(W_PLCDBName.wboolLocation3ScanDone, true);
+                        return;
+                    }
+                    Dt_Formula dt_Formula = _formulaService.Repository.QueryFirst(x => x.ProductCode == dt_Boxing.ProductCode);
+                    if(dt_Formula.PressNoCheckBottomPlate == 1)
+                    {
+                        device.SetValue(W_PLCDBName.wboolLocation9ScanDone, true);
+                    }
+                    else
+                    {
+                        device.SetValue(W_PLCDBName.wboolLocation9ScanDone, false);
+                    }
+
+                    //鍐欏叆PLC
+                    device.SetValue(W_PLCDBName.wrealCheckPalletCode, dt_Boxing.Id % 100);
+                    device.SetValue(W_PLCDBName.wrealP0P1Width, dt_Formula.P0P1Width);
+                    device.SetValue(W_PLCDBName.wrealP0P2Width, dt_Formula.P0P2Width);
+                    device.SetValue(W_PLCDBName.wrealP0P3Width, dt_Formula.P0P3Width);
+                    device.SetValue(W_PLCDBName.wrealP1P3Height, dt_Formula.ScrewTorqueOutput + dt_Formula.GasketHeight);
+                    device.SetValue(W_PLCDBName.wrealP2P3Height, dt_Formula.ProductHeight + dt_Formula.GasketHeight);
+                    device.SetValue(W_PLCDBName.wrealProdHeightDiff, dt_Formula.DetectHeightDiff);
+                    device.SetValue(W_PLCDBName.wrealScrewHeight, dt_Formula.ScrewPositionDiff);
+                    
+
+
+
+                    //妫�娴嬫壂鐮佸畬鎴�
+                    device.SetValue(W_PLCDBName.wboolLocation3ScanDone, true);
+
+
+                }
+                catch (Exception ex)
+                {
+                    WriteError(device.DeviceName, "妫�娴嬫壂鐮佹祦绋嬫墽琛屽紓甯�", ex);
+                }
+            }
+            else if (!Location3ScanStart && Location3ScanDone)
+            {
+                device.SetValue(W_PLCDBName.wboolLocation3ScanDone, false);
+            }
+
+        }
+
+        /// <summary>
+        /// 妫�娴嬩俊鎭笂浼�
+        /// </summary>
+        /// <param name="device"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void HandleDetectInfoUpload(OtherDevice device)
+        {
+
+            //DB800.1.6
+            var Location7ScanStart = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rboolLocation7ScanStart);
+            var Location7ScanDone = device.GetValue<W_PLCDBName, bool>(W_PLCDBName.wboolLocation7ScanDone);
+            if (Location7ScanStart && !Location7ScanDone)
+            {
+                var PalletNum = device.GetValue<R_PLCDBName, int>(R_PLCDBName.rrealCheckPalletCode);
+
+                try
+                {
+                    if (!PalletNum.IsNotEmptyOrNull())
+                    {
+                        throw new InvalidOperationException("鎵樼洏涓虹┖");
+                    }
+                    Dt_Boxing dt_Boxing = _boxingService.Repository.QueryFirst(x => x.Id % 100 == PalletNum);
+
+                    if (dt_Boxing == null)
+                    {
+                        throw new InvalidOperationException("鏈壘鍒扮粍鐩樻暟鎹�");
+                    }
+                    Dt_Formula dt_Formula = _formulaService.Repository.QueryFirst(x => x.ProductCode == dt_Boxing.ProductCode);
+
+                    //鎺ユ敹鏁版嵁
+                    decimal Height1 = (decimal)device.GetValue<R_PLCDBName, float>(R_PLCDBName.rrealDetectHeight1);//113
+                    decimal Height2 = (decimal)device.GetValue<R_PLCDBName, float>(R_PLCDBName.rrealDetectHeight2);//92
+                    decimal Height3 = (decimal)device.GetValue<R_PLCDBName, float>(R_PLCDBName.rrealDetectHeight3);//11
+                    if(dt_Formula.PressNoCheckBottomPlate == 1)
+                    {
+                        Height3 = 0;
+                    }
+
+                    //bool CheckUnfinished = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rrealDetectByInspectUnfinished);
+
+                    
+
+                    Dt_ProcessInfo dt_ProcessInfo = _processInfoService.Repository.QueryFirst(x => x.PalletCode == dt_Boxing.PalletCode);
+                    int id = 0;
+                    if (dt_ProcessInfo == null)
+                    {
+                        dt_ProcessInfo = new Dt_ProcessInfo()
+                        {
+                            PalletCode = dt_Boxing.PalletCode,
+                            ProductCode = dt_Formula.ProductCode,
+                            ProductName = dt_Formula.ProductName,
+                            ProductSn = dt_Boxing.BoxingNo,
+                        };
+                        id = _processInfoService.Repository.AddData(dt_ProcessInfo);
+                    }
+                    else
+                    {
+                        id = dt_ProcessInfo.Id;
+                    }
+                    decimal? ThreadPositionHeight = Height1 - Height3 - dt_Formula.GasketHeight;
+                    decimal? ProductCheckHeight = Height2 - Height3 - dt_Formula.GasketHeight;
+
+                    dt_ProcessInfo.Id = id;
+                    dt_ProcessInfo.ThreadPositionHeight = ThreadPositionHeight;
+                    dt_ProcessInfo.ProductCheckHeight = ProductCheckHeight;
+                    dt_ProcessInfo.Height1 = Height1;
+                    dt_ProcessInfo.Height2 = Height2;
+                    dt_ProcessInfo.Height3 = Height3;
+
+                    if(
+                        ProductCheckHeight > dt_Formula.ProductHeight + dt_Formula.DetectHeightDiff || ProductCheckHeight < dt_Formula.ProductHeight - dt_Formula.DetectHeightDiff ||
+                        ThreadPositionHeight > dt_Formula.ScrewTorqueOutput + dt_Formula.ScrewPositionDiff || ThreadPositionHeight < dt_Formula.ScrewTorqueOutput - dt_Formula.ScrewPositionDiff
+                        )
+                    {
+                        dt_ProcessInfo.ProductStatus = 0;
+                    }
+
+                    _processInfoService.Repository.UpdateData(dt_ProcessInfo);
+                    //妫�娴嬩俊鎭笂浼犲畬鎴�
+                    device.SetValue(W_PLCDBName.wboolLocation7ScanDone, true);
+
+                }
+                catch (Exception ex)
+                {
+                    WriteError(device.DeviceName, "妫�娴嬫壂鐮佹祦绋嬫墽琛屽紓甯�", ex);
+                }
+            }
+            else if (!Location7ScanStart && Location7ScanDone)
+            {
+                device.SetValue(W_PLCDBName.wboolLocation7ScanDone, false);
+            }
+
+        }
+
+
+        /// <summary>
+        /// 涓嬬嚎鎵爜
+        /// </summary>
+        /// <param name="device"></param>
+        private void HandleOfflineScan(OtherDevice device)
+        {
+            //DB800.1.3
+
+            var Location4ScanStart = device.GetValue<R_PLCDBName, bool>(R_PLCDBName.rboolLocation4ScanStart);
+            var Location4ScanDone = device.GetValue<W_PLCDBName, bool>(W_PLCDBName.wboolLocation4ScanDone);
+            if (Location4ScanStart && !Location4ScanDone)//鎺у埗鎵爜鏋壂鎻忔墭鐩樼爜锛屾牴鎹墭鐩樼爜鏌ヨ缁勭洏鏁版嵁锛屽垽鏂墭鐩樼粦瀹氭垚鍝佹槸鍚﹀凡缁戝畾鎵�鏈夋墍闇�闆朵欢
+            {
+                var PalletCode = TcpClientExample.Start("192.168.2.123", 2001);
+                using (var uow = _unitOfWorkManage.CreateUnitOfWork())
+                {
+                    try
+                    {
+                        if (!PalletCode.IsNotEmptyOrNull() || PalletCode == "NoRead")
+                        {
+                            throw new InvalidOperationException("鎵樼洏涓虹┖");
+                        }
+                        Dt_Boxing dt_Boxing = _boxingService.Repository.QueryFirst(x => x.PalletCode == PalletCode);
+                        WriteInfo("涓嬬嚎鎵爜缁勭洏鏁版嵁",$"{PalletCode}_boxingService鏌ヨ{dt_Boxing}");
+
+                        if (dt_Boxing != null)
+                        {
+                            WriteInfo("涓嬬嚎鎵爜缁勭洏鏁版嵁", $"{PalletCode}_boxingService鍒犻櫎{dt_Boxing}");
+                            _boxingService.Repository.DeleteData(dt_Boxing);
+                            
+                            List<Dt_BoxingDetail> dt_BoxingDetails = _boxingDetailService.Repository.QueryData(x => x.BoxingId == dt_Boxing.Id);
+                            if (dt_BoxingDetails != null)
+                            {
+                                WriteInfo("涓嬬嚎鎵爜缁勭洏鏁版嵁", $"{PalletCode}_boxingService鍒犻櫎{dt_BoxingDetails}");
+                                _boxingDetailService.Repository.DeleteData(dt_BoxingDetails);
+                            }
+                        }
+                        Dt_ProcessInfo dt_ProcessInfo = _processInfoService.Repository.QueryFirst(x => x.PalletCode == PalletCode);
+                        WriteInfo("涓嬬嚎鎵爜缁勭洏鏁版嵁", $"{PalletCode}_processInfoService鏌ヨ{dt_ProcessInfo}");
+                        if (dt_ProcessInfo != null)
+                        {
+                            Dt_ProcessInfoDetail dt_ProcessInfoDetail = new Dt_ProcessInfoDetail()
+                            {
+                                PalletCode = PalletCode,
+                                ProductCode = dt_ProcessInfo.ProductCode?.ToString() ?? "",
+                                ProductName = dt_ProcessInfo.ProductName?.ToString() ?? "",
+                                ProductSn = dt_ProcessInfo.ProductSn,
+                                PressTightenOk = dt_ProcessInfo.PressTightenOk,
+                                PressTightenUnfinished = dt_ProcessInfo.PressTightenUnfinished,
+                                ProductStatus = dt_ProcessInfo.ProductStatus,
+                                ScrewTorque = dt_ProcessInfo.ScrewTorque,
+                                ScrewAngle = dt_ProcessInfo.ScrewAngle,
+                                PressPressure = dt_ProcessInfo.PressPressure,
+                                ThreadPositionHeight = dt_ProcessInfo.ThreadPositionHeight,
+                                ProductCheckHeight = dt_ProcessInfo.ProductCheckHeight,
+                                Height1 = dt_ProcessInfo.Height1,
+                                Height2 = dt_ProcessInfo.Height2,
+                                Height3 = dt_ProcessInfo.Height3,
+                                Creater = "admin",
+                                CreateDate = DateTime.Now
+                            };
+                            _processDetailInfoService.Repository.AddData(dt_ProcessInfoDetail);
+                            WriteInfo("涓嬬嚎鎵爜缁勭洏鏁版嵁", $"{PalletCode}_processInfoService鍒犻櫎{dt_ProcessInfo}");
+                            _processInfoService.DeleteData(dt_ProcessInfo);
+                            
+                        }
+                        uow.Commit();
+                        //涓嬬嚎鎵爜瀹屾垚
+                        device.SetValue(W_PLCDBName.wboolLocation4ScanDone, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        WriteError(device.DeviceName, "涓嬬嚎鎵爜娴佺▼鎵ц寮傚父", ex);
+
+                    }
+                }
+            }
+            else if (!Location4ScanStart && Location4ScanDone)
+            {
+                device.SetValue(W_PLCDBName.wboolLocation4ScanDone, false);
+            }
+        }
+    }
+}
\ No newline at end of file

--
Gitblit v1.9.3