修改BUG

Muchinfo.MTPClient/Fx4.0/Main/03.UI/Modules/Muchinfo.TASClient.Account/Views/AllOrderView/MOHoldSummaryView.xaml

@@ -265,12 +265,11 @@
                     <MenuItem Command="{Binding Path=MOProsition.LockOrderCommand,
                                                 Source={StaticResource Locator}}"
                               Header="{x:Static resource:Client_Resource.Summary_Operate_Lock_Order}"
-                              Visibility="Visible" />
+                              Visibility="Collapsed" />
                     <MenuItem Command="{Binding Path=MOProsition.SPSLCommand,
                                                 Source={StaticResource Locator}}"
                               Header="{x:Static resource:Client_Resource.Summary_Operate_SL_SP}"
-                              Visibility="{Binding IsCanSPSL,
-                                                   Converter={StaticResource ToBoolVisibilityExConverter}}" />
+                              Visibility="Collapsed" />
                     <MenuItem Command="{Binding RefreshCommand}"
                               Header="{x:Static resource:Client_Resource.Button_Refresh}"
                               IsEnabled="True" />

Muchinfo.MTPClient/Fx4.0/Main/03.UI/Modules/Muchinfo.TASClient.Trade/ViewModels/TradeBaseViewModel.cs

@@ -2269,9 +2269,9 @@ namespace Muchinfo.MTPClient.Trade.ViewModels
 
                 var dic2 = new Dictionary<ChannelPriceMode, string> // 不支持市价
                 {
-                    //{ChannelPriceMode.LastestPrice, ChannelPriceMode.LastestPrice.Discription()},
+                    {ChannelPriceMode.LastestPrice, ChannelPriceMode.LastestPrice.Discription()},
                     {ChannelPriceMode.MatchPrice, ChannelPriceMode.MatchPrice.Discription()},
-                    //{ChannelPriceMode.SuperPrice, ChannelPriceMode.SuperPrice.Discription()},
+                    {ChannelPriceMode.SuperPrice, ChannelPriceMode.SuperPrice.Discription()},
                     {ChannelPriceMode.LimitPrice, ChannelPriceMode.LimitPrice.Discription()},
                 };
 

Muchinfo.MTPClient/Fx4.0/Main/03.UI/Modules/Muchinfo.TASClient.Trade/Views/OrderContent.xaml

@@ -291,8 +291,7 @@
                                      IsEnabled="{Binding TradeViewModel.ShowOpenCloseOrder}"
                                      Style="{DynamicResource RadioButtonStyle}"
                                      TabIndex="24"
-                                     Visibility="{Binding TradeViewModel.ShowOpenCloseOrder,
-                                                          Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                     Visibility="Collapsed" />
 
                     </StackPanel>
                 </StackPanel>

Muchinfo.MTPClient/Fx4.0/Main/03.UI/Muchinfo.TASClient/Config/Config.xml

@@ -3,13 +3,17 @@
   <Config>
     <BizAddress></BizAddress>
     <QuoteAddress></QuoteAddress>
-    
+
+    <!-- 风管云平台服务地址 - 风管云平台 -->
+    <ErmcpAddress>http://103.40.249.127:28280/cfg?key=mtp_20</ErmcpAddress>
+    <ErmcpWebUrl>http://103.40.249.127:28090/#/custom_info/custom_info_unsubmit</ErmcpWebUrl>
     <!-- 风管云平台服务地址 - 千海金 -->
-    <ErmcpAddress>http://103.40.249.123:8280/cfg?key=mtp_20</ErmcpAddress>
-    <ErmcpWebUrl>http://103.40.249.123:8090/#/platinum_pick_query/tab</ErmcpWebUrl>
+    <!--<ErmcpAddress>http://103.40.249.123:8280/cfg?key=mtp_20</ErmcpAddress>
+    <ErmcpWebUrl>http://103.40.249.123:8090/#/platinum_pick_query/tab</ErmcpWebUrl>-->
     <!-- 风管云平台服务地址 - 测试 -->
-    <!--<ErmcpAddress>http://192.168.31.175:8080/cfg?key=test_175</ErmcpAddress>
-    <ErmcpWebUrl>http://192.168.31.175:5035/webpc/#/platinum_pick_query/tab</ErmcpWebUrl>-->
+    <!--<ErmcpAddress>http://192.168.21.71:8280/cfg?key=mtp_20</ErmcpAddress>
+    <ErmcpWebUrl>http://192.168.21.71:9999/#/platinum_pick_query/tab</ErmcpWebUrl>-->
+    
 
     <!--应用程序升级地址-->
     <UpdateAddress></UpdateAddress>

Muchinfo.MTPClient/Fx4.0/Main/03.UI/Muchinfo.TASClient/Themes/ControlStyle/BaseStyle.xaml

@@ -429,7 +429,7 @@
                                                     Background="Transparent"
                                                     BorderBrush="Transparent">
                                             <TabItem Header="{x:Static resource:Client_Resource.TradeParamerSet_Title}" Style="{DynamicResource TabItemCardStyle}" />
-                                            <TabItem Header="{x:Static resource:Client_Resource.Auto_Entrust_Profit_Loss}" Style="{DynamicResource TabItemCardStyle}" />
+                                            <!--<TabItem Header="{x:Static resource:Client_Resource.Auto_Entrust_Profit_Loss}" Style="{DynamicResource TabItemCardStyle}" />-->
                                         </TabControl>
                                     </Border>
                                     <Button x:Name="btnClose"

Muchinfo.MTPClient/Fx4.0/Main/05.Services/Muchinfo.TASClient.Adapter/Data/tas.cs

@@ -16138,10 +16138,10 @@ namespace tas
       set { _Currency = value; }
     }
 
-    private double _AgreeUnit = int.MinValue;
+    private int _AgreeUnit = int.MinValue;
     [global::ProtoBuf.ProtoMember(10, IsRequired = false, Name=@"AgreeUnit", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
     [global::System.ComponentModel.DefaultValue(int.MinValue)]
-    public double AgreeUnit
+    public int AgreeUnit
     {
       get { return _AgreeUnit; }
       set { _AgreeUnit = value; }

Muchinfo.MTPClient/Fx4.0/Main/05.Services/Muchinfo.TASClient.Data/Helper/SystemParamManager.cs

@@ -23,9 +23,9 @@ namespace Muchinfo.MTPClient.Infrastructure.Utilities
             get
             {
                 if (ParamConfigs == null) return eRiskRateMode.OCCUPYWORTH;
-                var param = ParamConfigs.FirstOrDefault(z => z.ParamCode == "143");
+                var param = ParamConfigs.FirstOrDefault(z => z.ParamCode == "132");
                 //默认使用占用/净值
-                if( param == null || param.ParamValue == "0") return eRiskRateMode.OCCUPYWORTH;
+                if( param == null || param.ParamValue == "1") return eRiskRateMode.OCCUPYWORTH;
                 return eRiskRateMode.WORTHOCCUPY;
             }
         }

Muchinfo.MTPClient/Fx4.0/Main/05.Services/Muchinfo.TASClient.Data/Model/System/ExChangeCheckModel.cs

@@ -33,6 +33,11 @@ namespace Muchinfo.MTPClient.Data.Model
         /// <returns></returns>
         public bool IsExchangeHasGoods(long exChangeId)
         {
+            if (ExChangeGroup.Count <= exChangeId)
+            {
+                return false;
+            }
+
             List<long> groups = ExChangeGroup[exChangeId]; // 先查找交易所和商品组的关系
             var ret = groups.Find(g => (Group.ContainsKey(g) && Group[g] != null && Group[g].Count > 0)); // 找出商品组下的商品信息，返回的是List<uint>
             return ret != 0;

Muchinfo.MTPClient/Fx4.0/Main/05.Services/Muchinfo.TASClient.Service/LoginService.cs

@@ -369,7 +369,7 @@ namespace Muchinfo.MTPClient.Service
                 }
             }), new Action<int, string>((errorCode, errorDesc) =>
             {     ////通信错误
-                if (errorAction != null)
+                  if (errorAction != null)
                 {
                     errorAction(new ErrorEntity() { ReturnCode = errorCode, ReturnDesc = errorDesc, RequestFunc = "商品查询请求" });
                 }