diff --git a/ProductionSystem/App.config b/ProductionSystem/App.config index 75c07da..86a2c7a 100644 --- a/ProductionSystem/App.config +++ b/ProductionSystem/App.config @@ -1,4 +1,4 @@ - + diff --git a/ProductionSystem/ProductionSystem.csproj b/ProductionSystem/ProductionSystem.csproj index 235ffc9..c9b6936 100644 --- a/ProductionSystem/ProductionSystem.csproj +++ b/ProductionSystem/ProductionSystem.csproj @@ -40,6 +40,9 @@ program.ico + + ..\packages\Bartender.1.0.0\lib\net45\Bartender.dll + False Dll\Custom.Communication.Framework.dll diff --git a/ProductionSystem/packages.config b/ProductionSystem/packages.config index ab35a63..2e78d07 100644 --- a/ProductionSystem/packages.config +++ b/ProductionSystem/packages.config @@ -1,5 +1,6 @@  + diff --git a/ProductionSystem_Service/ParaConfigService.cs b/ProductionSystem_Service/ParaConfigService.cs index 7dc072e..e5b088c 100644 --- a/ProductionSystem_Service/ParaConfigService.cs +++ b/ProductionSystem_Service/ParaConfigService.cs @@ -262,7 +262,6 @@ namespace ProductionSystem_Service editonType.SB2.SendMsgList = _protocolDetailConfigService.QueryActiveProtocolDetailConfigByProtocolConfigCodeAndMsgType("SBUY", "Send"); editonType.SB2.CollectMsgList = _protocolDetailConfigService.QueryActiveProtocolDetailConfigByProtocolConfigCodeAndMsgType("SBUY", "Receive"); continue; - continue; } else if (paraConfig[i].ParaCode == "SB3ZS_DB") {