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(); _productPlanInfoServices = registerServices.GetService(); _iMaterialCompletionServices = registerServices.GetService(); - 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); } /// 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(); _plcDictionary = _pool.GetAll(); - RealReadFinish(); + // RealReadFinish(); } - #region 判断箱壳,内胆入库是否完成 + #region 20240221取消入库完成信号 判断箱壳,内胆入库是否完成 /// /// 实时读取箱壳,内胆入库完成信号 /// 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