diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo
index f7106fc..0f60048 100644
Binary files a/shangjian/.vs/BL/v17/.suo and b/shangjian/.vs/BL/v17/.suo differ
diff --git a/shangjian/CentralControl/bin/Debug/CentralControl.exe b/shangjian/CentralControl/bin/Debug/CentralControl.exe
index 38078fb..b97fd01 100644
Binary files a/shangjian/CentralControl/bin/Debug/CentralControl.exe and b/shangjian/CentralControl/bin/Debug/CentralControl.exe differ
diff --git a/shangjian/CentralControl/bin/Debug/CentralControl.pdb b/shangjian/CentralControl/bin/Debug/CentralControl.pdb
index 34d1e64..7459334 100644
Binary files a/shangjian/CentralControl/bin/Debug/CentralControl.pdb and b/shangjian/CentralControl/bin/Debug/CentralControl.pdb differ
diff --git a/shangjian/CentralControl/bin/Debug/CommonFunc.dll b/shangjian/CentralControl/bin/Debug/CommonFunc.dll
index 817b693..da275a2 100644
Binary files a/shangjian/CentralControl/bin/Debug/CommonFunc.dll and b/shangjian/CentralControl/bin/Debug/CommonFunc.dll differ
diff --git a/shangjian/CentralControl/bin/Debug/CommonFunc.pdb b/shangjian/CentralControl/bin/Debug/CommonFunc.pdb
index 76c2a7b..dfa5eda 100644
Binary files a/shangjian/CentralControl/bin/Debug/CommonFunc.pdb and b/shangjian/CentralControl/bin/Debug/CommonFunc.pdb differ
diff --git a/shangjian/CentralControl/bin/Debug/XGL.Data.dll b/shangjian/CentralControl/bin/Debug/XGL.Data.dll
index 9b6211f..2c04d3b 100644
Binary files a/shangjian/CentralControl/bin/Debug/XGL.Data.dll and b/shangjian/CentralControl/bin/Debug/XGL.Data.dll differ
diff --git a/shangjian/CentralControl/bin/Debug/XGL.Data.pdb b/shangjian/CentralControl/bin/Debug/XGL.Data.pdb
index a00753d..ed0781a 100644
Binary files a/shangjian/CentralControl/bin/Debug/XGL.Data.pdb and b/shangjian/CentralControl/bin/Debug/XGL.Data.pdb differ
diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache
index 7a6e978..b30576e 100644
Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache and b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache differ
diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.exe b/shangjian/CentralControl/obj/Debug/CentralControl.exe
index 38078fb..b97fd01 100644
Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.exe and b/shangjian/CentralControl/obj/Debug/CentralControl.exe differ
diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.pdb b/shangjian/CentralControl/obj/Debug/CentralControl.pdb
index 34d1e64..7459334 100644
Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.pdb and b/shangjian/CentralControl/obj/Debug/CentralControl.pdb differ
diff --git a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll
index 817b693..da275a2 100644
Binary files a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll and b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll differ
diff --git a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb
index 76c2a7b..dfa5eda 100644
Binary files a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb and b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb differ
diff --git a/shangjian/LanJuLib/bin/Debug/CommonFunc.dll b/shangjian/LanJuLib/bin/Debug/CommonFunc.dll
index 817b693..da275a2 100644
Binary files a/shangjian/LanJuLib/bin/Debug/CommonFunc.dll and b/shangjian/LanJuLib/bin/Debug/CommonFunc.dll differ
diff --git a/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb b/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb
index 76c2a7b..dfa5eda 100644
Binary files a/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb and b/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb differ
diff --git a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache
index 2d5f7e2..a0d1e38 100644
Binary files a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache and b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache differ
diff --git a/shangjian/XGL.Data/DBService/DBService.cs b/shangjian/XGL.Data/DBService/DBService.cs
index 508214d..97b6c41 100644
--- a/shangjian/XGL.Data/DBService/DBService.cs
+++ b/shangjian/XGL.Data/DBService/DBService.cs
@@ -924,8 +924,8 @@ where workorder.workorder_id = '{workOrderNo}'";
         public DataTable GettypeList()
         {
             //根据工单获取成型机
-            string sql = $@"  SELECT DISTINCT remark FROM[dbo].[mes_interface_log] ";
-
+            //string sql = $@"  SELECT DISTINCT remark FROM[dbo].[mes_interface_log] ";
+            string sql = $@"SELECT DISTINCT REPLACE(REPLACE(remark, '回参', ''), '入参', '') as remark  FROM mes_interface_log";
             DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
             if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
             {
diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache
index 84399b3..50824f7 100644
Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache differ
diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll
index 9b6211f..2c04d3b 100644
Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll differ
diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb
index a00753d..ed0781a 100644
Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb differ
diff --git a/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 58bd50d..1a962e1 100644
Binary files a/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/shangjian/XGL/Views/ViewLogWin.xaml b/shangjian/XGL/Views/ViewLogWin.xaml
index 519bd32..9dbd91c 100644
--- a/shangjian/XGL/Views/ViewLogWin.xaml
+++ b/shangjian/XGL/Views/ViewLogWin.xaml
@@ -81,28 +81,29 @@
 
             <Label Content="通讯内容关键字：" VerticalContentAlignment="Center" FontSize="14" Margin="20"></Label>
             <TextBox x:Name="txtKey" Width="150" Height="30" Text="" FontSize="18" VerticalContentAlignment="Center" KeyDown="txtKey_KeyDown"/>
-            <Button x:Name="btnQueryLog" Content="查询" Foreground="White" Margin="20,0,0,0" FontSize="18" Background="#2B7EE6" Width="100" Height="30" Click="btnQueryLog_Click"/>
             <Label Content="备注选择：" VerticalContentAlignment="Center" FontSize="14" Margin="20"></Label>
-            <ComboBox Name="selebeizhu" Width="150"  Height="30" FontSize="18" Margin="20,0,0,0">
-                
+            <ComboBox Name="selebeizhu" Width="250"  Height="30" FontSize="18" Margin="20,0,0,0">
+
             </ComboBox>
+            <Button x:Name="btnQueryLog" Content="查询" Foreground="White" Margin="20,0,0,0" FontSize="18" Background="#2B7EE6" Width="100" Height="30" Click="btnQueryLog_Click"/>
+         
         </StackPanel>
         <Button x:Name="btnClose"  Content="关闭" Foreground="White" FontSize="18" Background="#2B7EE6" Width="100" Margin="20" Height="30" Click="btnClose_Click" HorizontalAlignment="Right"/>
         <DataGrid
             x:Name="dgLogInfo"
             Grid.Row="1"
-                ScrollViewer.HorizontalScrollBarVisibility="Visible"
-             Height="830"
-                    MinHeight="340"
-                     AlternatingRowBackground="{StaticResource OddRowBackground}"
-          AlternationCount="2"
-          RowStyle="{StaticResource DataGridRowStyle}"
+            ScrollViewer.HorizontalScrollBarVisibility="Visible"
+            Height="930"
+            MinHeight="340"
+            AlternatingRowBackground="{StaticResource OddRowBackground}"
+            AlternationCount="2"
+            RowStyle="{StaticResource DataGridRowStyle}"
                     Margin="20,0,0,5"
                     LoadingRow="dgLogInfo_LoadingRow"
                     HeadersVisibility="Column"
                     CellStyle="{StaticResource CustomCellStyle}"
                     HorizontalAlignment="Left"
-                    VerticalAlignment="Top" IsReadOnly="True"
+                    VerticalAlignment="Top" IsReadOnly="False"
                     AutoGenerateColumns="False" CanUserAddRows="False">
             <DataGrid.ColumnHeaderStyle  >
                 <Style TargetType="DataGridColumnHeader">
@@ -121,11 +122,11 @@
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-                 <DataGridTextColumn Width="0.7*" Header="通讯内容" Binding="{Binding messsge}" /> 
-                <DataGridTextColumn Width="0.1*" Header="日志时间" Binding="{Binding creter_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" />
+                 <DataGridTextColumn Width="1000" Header="通讯内容" Binding="{Binding messsge}" /> 
+                <DataGridTextColumn Width="250" Header="日志时间" Binding="{Binding creter_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" />
                 <!--<DataGridTextColumn Width="0.05*" Header="状态"   Binding="{Binding reqcode}" >  </DataGridTextColumn>-->
-                <DataGridTextColumn Width="0.1*" Header="方法名" Binding="{Binding method}" />
-                <DataGridTextColumn Width="0.1*" Header="备注" Binding="{Binding remark}" />
+                <DataGridTextColumn Width="300" Header="方法名" Binding="{Binding method}" />
+                <DataGridTextColumn Width="300" Header="备注" Binding="{Binding remark}" />
 
                 <!--<DataGridTextColumn Width="340" Header="流转码" Binding="{Binding work_batch_code}" />-->
                 <!--<DataGridTextColumn Width="60" Header="出入" Binding="{Binding taskcode,Converter={StaticResource TaskCodeConverter}}"/>-->
diff --git a/shangjian/XGLFinishPro/Views/ViewLogWin.xaml b/shangjian/XGLFinishPro/Views/ViewLogWin.xaml
index f6a1bfa..63aa57f 100644
--- a/shangjian/XGLFinishPro/Views/ViewLogWin.xaml
+++ b/shangjian/XGLFinishPro/Views/ViewLogWin.xaml
@@ -88,7 +88,7 @@
         <Button x:Name="btnClose"  Content="关闭" Foreground="White" FontSize="18" Background="#2B7EE6" Width="100" Margin="20" Height="30" Click="btnClose_Click" HorizontalAlignment="Right"/>
         <DataGrid
             x:Name="dgLogInfo"
-            Grid.Row="1" Width="1080"
+            Grid.Row="1" 
                     MinHeight="340"
                      AlternatingRowBackground="{StaticResource OddRowBackground}"
           AlternationCount="2"
@@ -117,11 +117,11 @@
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-                 <DataGridTextColumn Width="0.7*" Header="通讯内容" Binding="{Binding messsge}" /> 
-                <DataGridTextColumn Width="0.1*" Header="日志时间" Binding="{Binding creter_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" />
+                 <DataGridTextColumn Width="1000" Header="通讯内容" Binding="{Binding messsge}" /> 
+                <DataGridTextColumn Width="150" Header="日志时间" Binding="{Binding creter_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" />
                 <!--<DataGridTextColumn Width="0.05*" Header="状态"   Binding="{Binding reqcode}" >  </DataGridTextColumn>-->
-                <DataGridTextColumn Width="0.1*" Header="方法名" Binding="{Binding method}" />
-                <DataGridTextColumn Width="0.1*" Header="备注" Binding="{Binding remark}" />
+                <DataGridTextColumn Width="150" Header="方法名" Binding="{Binding method}" />
+                <DataGridTextColumn Width="200" Header="备注" Binding="{Binding remark}" />
 
                 <!--<DataGridTextColumn Width="340" Header="流转码" Binding="{Binding work_batch_code}" />-->
                 <!--<DataGridTextColumn Width="60" Header="出入" Binding="{Binding taskcode,Converter={StaticResource TaskCodeConverter}}"/>-->