Merge branch 'release/警用装备打印_1.2.25.4192'

JmpZbPrint/Common/HttpHelper.cs

@@ -1115,6 +1115,12 @@ namespace JmpZbPrint
         {
             try
             {
+                if (string.IsNullOrEmpty(CaChe.UserInfo.policeman?.id))
+                {
+                    msg = "当前账号未绑定警员，暂无法进行此操作";
+                    Log.WorkLog("当前账号未绑定警员，暂无法进行此操作");
+                    return false;
+                }
                 msg = string.Empty;
                 var body_par = JsonConvert.SerializeObject(new
                 {
@@ -1165,7 +1171,6 @@ namespace JmpZbPrint
                         var res_data = JsonConvert.DeserializeObject<respone_head<respone_order>>(json);
                         if (res_data == null || res_data.code != 10000)
                         {
-
                             msg = res_data.msg;
                             Log.DebugLog($"写入库存失败,{msg}", "请求失败");
                             return default;

JmpZbPrint/Dialog/SelectEqu.xaml

@@ -79,7 +79,7 @@
                 </StackPanel>
             </Grid>
 
-            <DataGrid  EnableRowVirtualization="False" x:Name="g_equ" Margin="3 5 3 20"   Grid.Row="2"  BorderBrush="#dedede" FontSize="20" Foreground="#37537d"  HeadersVisibility="Column"
+            <DataGrid IsReadOnly="True" EnableRowVirtualization="False" x:Name="g_equ" Margin="3 5 3 20"   Grid.Row="2"  BorderBrush="#dedede" FontSize="20" Foreground="#37537d"  HeadersVisibility="Column"
              GridLinesVisibility="None" Background="Transparent"  BorderThickness="1"  CanUserAddRows="False" 
              AutoGenerateColumns="False"  SelectionMode="Single"   HorizontalScrollBarVisibility="Hidden"   RowBackground="Transparent"   CanUserSortColumns="True" >
                 <DataGrid.ColumnHeaderStyle>

JmpZbPrint/Dialog/ShelfWindow.xaml

@@ -63,7 +63,7 @@
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="10"/>
             </Grid.ColumnDefinitions>
-            <TextBlock Grid.Row="0" Grid.Column="1" x:Name="txtTitle" Text="选择供应商信息" FontSize="30" Foreground="#0092ea" VerticalAlignment="Top" Margin="20 20 0 0"/>
+            <TextBlock Grid.Row="0" Grid.Column="1" x:Name="txtTitle" Text="选择货架信息" FontSize="30" Foreground="#0092ea" VerticalAlignment="Top" Margin="20 20 0 0"/>
             <TextBlock Grid.Row="0" Grid.Column="1" Text="&#xE618;" Style="{StaticResource FiconBase}" x:Name="tbclose"
                        HorizontalAlignment="Right" VerticalAlignment="Top"
                        Margin="0 20 20 0" FontSize="35" Foreground="#8a8a8a" />

JmpZbPrint/Dialog/SupplierWindow.xaml

@@ -79,7 +79,7 @@
                 </StackPanel>
             </Grid>
 
-            <DataGrid  EnableRowVirtualization="False" x:Name="g_vender" Margin="3 5 3 20"   Grid.Row="2"  BorderBrush="#dedede" FontSize="20" Foreground="#37537d"  HeadersVisibility="Column"
+            <DataGrid IsReadOnly="True" EnableRowVirtualization="False" x:Name="g_vender" Margin="3 5 3 20"   Grid.Row="2"  BorderBrush="#dedede" FontSize="20" Foreground="#37537d"  HeadersVisibility="Column"
              GridLinesVisibility="None" Background="Transparent"  BorderThickness="1"  CanUserAddRows="False" 
              AutoGenerateColumns="False"  SelectionMode="Single"   HorizontalScrollBarVisibility="Hidden"   RowBackground="Transparent"   CanUserSortColumns="True" >
                 <DataGrid.ColumnHeaderStyle>

JmpZbPrint/JmpZbPrint.csproj

@@ -217,12 +217,6 @@
     <Compile Include="View\SetGenInfoV2.xaml.cs">
       <DependentUpon>SetGenInfoV2.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\SetGenBoxInfo.xaml.cs">
-      <DependentUpon>SetGenBoxInfo.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="View\SetGenInfo.xaml.cs">
-      <DependentUpon>SetGenInfo.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Dialog\SelectEqu.xaml.cs">
       <DependentUpon>SelectEqu.xaml</DependentUpon>
     </Compile>
@@ -315,14 +309,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="View\SetGenBoxInfo.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="View\SetGenInfo.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Dialog\SelectEqu.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

JmpZbPrint/PagePartial/SetBasicInfo.xaml

@@ -114,7 +114,7 @@
                     <DataGridTemplateColumn Header="生产日期"  Width="150">
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
-                                <DatePicker VerticalContentAlignment="Top" VerticalAlignment="Bottom"  SelectedDate="{Binding productTime,Converter={StaticResource date_convert},UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}" materialDesign:HintAssist.HintOpacity=".26" Width="100" FontSize="13" Margin="0,0,0,0"  Style="{StaticResource MaterialDesignDatePicker}" />
+                                <DatePicker Language="en-CA" VerticalContentAlignment="Top" VerticalAlignment="Bottom"  SelectedDate="{Binding productTime,Converter={StaticResource date_convert},UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}" materialDesign:HintAssist.HintOpacity=".26" Width="100" FontSize="13" Margin="0,0,0,0"  Style="{StaticResource MaterialDesignDatePicker}" />
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
 
@@ -122,7 +122,7 @@
                     <DataGridTemplateColumn Header="使用日期"  Width="150"   >
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
-                                <DatePicker VerticalContentAlignment="Top" VerticalAlignment="Bottom" SelectedDate="{Binding useTime,Converter={StaticResource date_convert},UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}" materialDesign:HintAssist.HintOpacity=".26" Width="100" FontSize="13" Margin="0,0,0,0"  Style="{StaticResource MaterialDesignDatePicker}" />
+                                <DatePicker Language="en-CA" VerticalContentAlignment="Top" VerticalAlignment="Bottom" SelectedDate="{Binding useTime,Converter={StaticResource date_convert},UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}" materialDesign:HintAssist.HintOpacity=".26" Width="100" FontSize="13" Margin="0,0,0,0"  Style="{StaticResource MaterialDesignDatePicker}" />
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>

JmpZbPrint/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.22.02241")]
-[assembly: AssemblyFileVersion("1.2.22.02241")]
+[assembly: AssemblyVersion("1.2.25.04192")]
+[assembly: AssemblyFileVersion("1.2.25.04192")]

JmpZbPrint/View/SetGenInfoV2.xaml.cs

@@ -10,6 +10,7 @@ using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Input;
+using System.Windows.Markup;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
@@ -124,6 +125,8 @@ namespace JmpZbPrint.View
             spShelfData.IsEnabled = false;
             spMessage.Visibility = Visibility.Hidden;
 
+            dtUseDate.Language=XmlLanguage.GetLanguage("en-CA");
+            dtProductDate.Language=XmlLanguage.GetLanguage("en-CA");
             dtProductDate.SelectedDate = DateTime.Now.AddDays(-7);
             dtUseDate.SelectedDate = DateTime.Now;
         }