From 5623f0878efc3b8cdc51149f8a5e2754bcc4e526 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Wed, 21 Feb 2024 17:20:25 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=88=A0=E9=99=A4=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=AE=8C=E6=88=90=E4=BF=A1=E5=8F=B7=EF=BC=8Cplc?=
 =?UTF-8?q?=E5=BA=94=E7=AD=94=E5=8D=B3=E8=A7=86=E4=B8=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Aucma.Scada.Business/InStoreBusiness.cs      |  4 +++-
 Aucma.Scada.Business/InStoreTaskHandle.cs    |  4 ++--
 Aucma.Scada.UI/bin/Debug/config/Plc.Ini      |  8 +++-----
 Aucma.Scada.UI/bin/Debug/config/PlcSpace.Ini | 13 -------------
 4 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/Aucma.Scada.Business/InStoreBusiness.cs b/Aucma.Scada.Business/InStoreBusiness.cs
index 6e216ea7..44031f1f 100644
--- a/Aucma.Scada.Business/InStoreBusiness.cs
+++ b/Aucma.Scada.Business/InStoreBusiness.cs
@@ -104,7 +104,7 @@ namespace Aucma.Scada.Business
             _printBarCodeServices = registerServices.GetService<IPrintBarCodeServices>();
             _productPlanInfoServices = registerServices.GetService<IProductPlanInfoService>();
             _iMaterialCompletionServices = registerServices.GetService<IMaterialCompletionServices>();
-            taskHandle.InStoreFinsihEvent += InStoreFinish;
+         //   taskHandle.InStoreFinsihEvent += InStoreFinish;
             taskHandle.InStoreAnswerEvent += InStoreAnswer;
 
             MvCodeHelper.RefreshMaterialCodeStrEvent += InStore;
@@ -371,6 +371,8 @@ namespace Aucma.Scada.Business
 
                 linerSemaphore.Release();
             }
+            // 入库完成
+            InStoreFinish(storeCode, taskCode);
         }
 
         /// <summary>
diff --git a/Aucma.Scada.Business/InStoreTaskHandle.cs b/Aucma.Scada.Business/InStoreTaskHandle.cs
index e6f785f1..9ee3ddbb 100644
--- a/Aucma.Scada.Business/InStoreTaskHandle.cs
+++ b/Aucma.Scada.Business/InStoreTaskHandle.cs
@@ -90,11 +90,11 @@ namespace Aucma.Scada.Business
         {
             _taskInfoService = registerServices.GetService<IRealTaskInfoService>();
             _plcDictionary = _pool.GetAll();
-            RealReadFinish();
+           // RealReadFinish(); 
 
         }
 
-        #region 判断箱壳，内胆入库是否完成
+        #region  20240221取消入库完成信号 判断箱壳，内胆入库是否完成
         /// <summary>
         /// 实时读取箱壳，内胆入库完成信号
         /// </summary>
diff --git a/Aucma.Scada.UI/bin/Debug/config/Plc.Ini b/Aucma.Scada.UI/bin/Debug/config/Plc.Ini
index 17a9d474..47f22378 100644
--- a/Aucma.Scada.UI/bin/Debug/config/Plc.Ini
+++ b/Aucma.Scada.UI/bin/Debug/config/Plc.Ini
@@ -13,18 +13,16 @@
 [liner_inStore_address]
 ��������=D7000
 ���Ӧ����=D7010
-������=D7020
+
 #��dz����ַ
 [shell_outStore_address]
 ���������=D7100
-��������=D7110
 �������=D7120
 ����Ӧ����=D7130
-������=D7140
+
 #�ڵ������ַ
 [liner_outStore_address]
 ���������=D7100
-��������=D7110
 �������=D7120
 ����Ӧ����=D7130
-������=D7140
+
diff --git a/Aucma.Scada.UI/bin/Debug/config/PlcSpace.Ini b/Aucma.Scada.UI/bin/Debug/config/PlcSpace.Ini
index 15aab8b3..c04d9a17 100644
--- a/Aucma.Scada.UI/bin/Debug/config/PlcSpace.Ini
+++ b/Aucma.Scada.UI/bin/Debug/config/PlcSpace.Ini
@@ -2,63 +2,50 @@
 [XKK-001_XK_001]
 �ڿ�����=D7201
 ��;����=D7211
-������=D7021
 �������=D7240
-
 [XKK-001_XK_002]
 �ڿ�����=D7202
 ��;����=D7212
-������=D7022
 �������=D7240
 [XKK-001_XK_003]
 �ڿ�����=D7203
 ��;����=D7213
-������=D7023
 �������=D7240
 [XKK-001_XK_004]
 �ڿ�����=D7204
 ��;����=D7214
-������=D7024
 �������=D7240
 [XKK-001_XK_005]
 �ڿ�����=D7205
 ��;����=D7215
-������=D7025
 �������=D7240
 [XKK-001_XK_006]
 �ڿ�����=D7206
 ��;����=D7216
-������=D7026
 �������=D7240
 
 #�ڵ��������Ϣ
 [NDK-001_ND_001]
 �ڿ�����=D7201
 ��;����=D7211
-������=D7021
 �������=D7240
 [NDK-001_ND_002]
 �ڿ�����=D7202
 ��;����=D7212
-������=D7022
 �������=D7240
 [NDK-001_ND_003]
 �ڿ�����=D7203
 ��;����=D7213
-������=D7023
 �������=D7240
 [NDK-001_ND_004]
 �ڿ�����=D7204
 ��;����=D7214
-������=D7024
 �������=D7240
 [NDK-001_ND_005]
 �ڿ�����=D7205
 ��;����=D7215
-������=D7025
 �������=D7240
 [NDK-001_ND_006]
 �ڿ�����=D7206
 ��;����=D7216
-������=D7026
 �������=D7240
\ No newline at end of file