From 976c73028601843ac2c7655890d1c661f5b0983d Mon Sep 17 00:00:00 2001 From: liuwf Date: Wed, 28 Feb 2024 17:08:42 +0800 Subject: [PATCH] =?UTF-8?q?change-=E6=88=90=E5=93=81=E4=B8=8B=E7=BA=BF?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReportQualityInspectionServices.cs | 2 +- .../Business/offLineBusiness.cs | 68 +++++++++---------- Aucma.Core.ProductOffLine/appsettings.json | 6 +- 3 files changed, 39 insertions(+), 37 deletions(-) diff --git a/Admin.Core.Service/Service_New/ReportQualityInspectionServices.cs b/Admin.Core.Service/Service_New/ReportQualityInspectionServices.cs index 33cd6326..0c556b04 100644 --- a/Admin.Core.Service/Service_New/ReportQualityInspectionServices.cs +++ b/Admin.Core.Service/Service_New/ReportQualityInspectionServices.cs @@ -34,7 +34,7 @@ namespace Admin.Core.Service { try { - string boxCode = _codeBindingRecordRepository.Query(s => s.ProductCode == SnCode).FirstOrDefault().BoxCode; + string boxCode = _codeBindingRecordRepository.Query(s => s.ProductCode == SnCode).FirstOrDefault().BoxCode; var list = _baseSpaceInfoRepository.Query(x=>x.BarCode.Equals(boxCode) && x.IsFlag!=1); return list; diff --git a/Aucma.Core.ProductOffLine/Business/offLineBusiness.cs b/Aucma.Core.ProductOffLine/Business/offLineBusiness.cs index cbf34339..50e0ab67 100644 --- a/Aucma.Core.ProductOffLine/Business/offLineBusiness.cs +++ b/Aucma.Core.ProductOffLine/Business/offLineBusiness.cs @@ -108,22 +108,22 @@ namespace Aucma.Core.ProductOffLine.Business public void test() { - - // string result = await _productOffLineServices.QueryChecked("1531000AP0098DCU0481"); - // Console.WriteLine(result); + string result = _productOffLineServices.QueryChecked("1531000AP0098DCU0481"); + Console.WriteLine(result); + string strSave = _productOffLineServices.SaveBarcodeInfo("1531000AP0098DCU0481", "ILS_SORT", result.Replace("0000",""), 1); // string tt = "Y@1104@16160030000000910780@000010034895@@ @000000@000000009000004899@BCD-160C,家电下乡@@BCD-160C@皓月白-家电下乡@161601300@160@1-00版@家电下乡产品@默认@2010-09-01"; //Task.Run(() => //{ - // while(true) - // { - // Thread.Sleep(50000); + // //while (true) + // //{ + // Thread.Sleep(5000); // Random random = new Random(); - // MaterialBarScan("32160030000000912"+random.Next(100,999), "192.168.1.19"); - // } + // MaterialBarScan("32160030000000912" + random.Next(100, 999), "192.168.1.20"); + // // } - // // Thread.Sleep(1000); - // // MaterialBarScanEvent("33160030000000910780", "192.168.1.20"); + // // Thread.Sleep(1000); + // // MaterialBarScanEvent("33160030000000910780", "192.168.1.20"); //}); } @@ -153,6 +153,7 @@ namespace Aucma.Core.ProductOffLine.Business } // 2.更新mes数据库 BackResult = updateMesData(TempOffLineInfo1); + BackResult = true; // 测试 // 3.plc放行 if (BackResult) { @@ -186,6 +187,7 @@ namespace Aucma.Core.ProductOffLine.Business } // 2.更新mes数据库 BackResult = updateMesData(TempOffLineInfo2); + BackResult = true; // 3.plc放行 if (BackResult) { @@ -308,10 +310,11 @@ namespace Aucma.Core.ProductOffLine.Business { try { - // 1.质检 - List qualityList = _reportQualityInspectionServices.JudgeIsQualified(BarCode); - if(qualityList != null) - { + // 1.质检 + // List qualityList = _reportQualityInspectionServices.JudgeIsQualified(BarCode); + List qualityList = null; // 测试使用 + if (qualityList != null) + { TempOffLineInfo.QualityResult = "失败"; TempOffLineInfo.ProductSNCode = BarCode.Trim(); //产品SN条码*1 TempOffLineInfo.ProductScanTime = System.DateTime.Now; // 扫码时间*2 @@ -373,8 +376,9 @@ namespace Aucma.Core.ProductOffLine.Business // return false; // } log.Info(TempOffLineInfo.ProductSNCode + ", 多码验证通过！"); - //2.上传条码系统 - return uploadSnSysytem(TempOffLineInfo); + //2.上传条码系统 + // return uploadSnSysytem(TempOffLineInfo); + return true; } else @@ -537,23 +541,23 @@ namespace Aucma.Core.ProductOffLine.Business var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("成品下线Plc")); if (obj != null) { - if (obj.plc.IsConnected) - { + if(scannerNo == 1) // 扫码器1对应的货道地址 { // 写入入库方向，两条道plc地址不同 - obj.plc.WriteInt32("D100", direction); + obj.plc.WriteInt32("ZR1000", direction); // 往plc写入放行信号 - obj.plc.WriteInt32("D102", 1); + obj.plc.WriteInt32("ZR1002", 1); } else { + direction = 2; // 写入入库方向，两条道plc地址不同 - obj.plc.WriteInt32("D200", direction); + obj.plc.WriteInt32("ZR1001", direction); // 往plc写入放行信号 - obj.plc.WriteInt32("D202", 1); + obj.plc.WriteInt32("ZR1003", 1); } - DateTime targetTime = DateTime.Now.AddSeconds(8); + DateTime targetTime = DateTime.Now.AddSeconds(100); // 等待plc反馈信号 while (true) { @@ -566,12 +570,12 @@ namespace Aucma.Core.ProductOffLine.Business if (scannerNo == 1) { // 读取plc反馈信号 - if (obj.plc.ReadInt32("D102") == 2) + if (obj.plc.ReadInt32("ZR1002") == 2) { Console.WriteLine("收到plc放行成功"); // 清空数据 - obj.plc.WriteInt32("D100", 0); - obj.plc.WriteInt32("D102", 0); + // obj.plc.WriteInt32("ZR1000", 0); + obj.plc.WriteInt32("ZR1002", 0); result = true; break; } @@ -579,23 +583,19 @@ namespace Aucma.Core.ProductOffLine.Business else { // 读取plc反馈信号 - if (obj.plc.ReadInt32("D202") == 2) + if (obj.plc.ReadInt32("ZR1003") == 2) { Console.WriteLine("收到plc放行成功"); // 清空数据 - obj.plc.WriteInt32("D200", 0); - obj.plc.WriteInt32("D202", 0); + // obj.plc.WriteInt32("ZR1001", 0); + obj.plc.WriteInt32("ZR1003", 0); result = true; break; } } Thread.Sleep(500); } - } - else - { - log.Info("成品下线plc连接失败，请检查plc连接"); - } + } else { diff --git a/Aucma.Core.ProductOffLine/appsettings.json b/Aucma.Core.ProductOffLine/appsettings.json index a8166450..7af9f786 100644 --- a/Aucma.Core.ProductOffLine/appsettings.json +++ b/Aucma.Core.ProductOffLine/appsettings.json @@ -221,8 +221,10 @@ { "Id": 1, "EquipName": "成品下线Plc", - "IP": "127.0.0.1", - "Port": 6000 + "PlcType": "Melsec", + "Enabled": true, + "IP": "10.10.92.70", + "Port": 2015 } ],