Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage

MainWindow.xaml.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Data;
 using System.Data.SqlClient;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -54,7 +55,7 @@ namespace formula_manage
 
             USER.Text = App.USER_Purview;
 
-            sql_Stuff();//查询stuff表
+            sql_();//查询stuff表
 
             //bindDataGridDatas
             //SelectionList = STUFFdataTable;
@@ -86,12 +87,10 @@ namespace formula_manage
             }
             // DetailedGrid.DataContext = dataTable;
             Grid_RRODUCT.ItemsSource = dataTable.DefaultView;
+   
         }
 
-
+        private async void sql_()
- 
-
-        private async void sql_Stuff()
         {
             UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);//生效配置读取
             TEXT_SQLIP = Configini.IniReadvalue("SQL_SERVER", "SQL1");    //读配置文件
@@ -171,15 +170,23 @@ namespace formula_manage
 
         string Prepose;  //料单前置
         string PreposeT;  //料单时间
-
+        bool Loginprint;
+        bool Loginanew;
+        bool LoginMAC;
         private void Window_MIN(object sender, RoutedEventArgs e)
         {
 
             UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
+       //     Loginprint = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L2"));  //是否立即打印料单
+       //     Loginanew = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L3"));  //是否立即打印料单
+            Machine.IsReadOnly = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L4"));  //允许自定义机台
+
             Prepose = Configini.IniReadvalue("SOFTWARE_SET", "T1");  //自定义料单前缀
             PreposeT = Configini.IniReadvalue("SOFTWARE_SET", "T2");  //自定义料单时间
+
             Number.Text = Prepose + System.DateTime.Now.ToString(PreposeT);  //生成料单号
 
+
         }
 
         private void Tb_KeyPress(object sender, TextCompositionEventArgs e)//输入事件

Windows/APP_set.xaml

@@ -7,9 +7,11 @@
         mc:Ignorable="d" Loaded="Window_SET" BorderBrush="White" Background="#FFEFEFEF"
         Title="APP_set" Height="450" Width="800" MaxHeight="450" MaxWidth="800" ResizeMode="NoResize">
     <Grid>
+       
         <CheckBox x:Name="Login_LINK" Height="19" Margin="15,15,605,0" VerticalAlignment="Top" Content="登录页面显示连接状态" IsTabStop="False" Checked="Login_LINK_Checked" Unchecked="Login_LINK_Checked"/>
         <CheckBox x:Name="Login_PRINT" Height="19" Margin="15,35,605,0" VerticalAlignment="Top" Content="确认立即打印料单" IsTabStop="False" Checked="Login_PRINT_Checked" Unchecked="Login_PRINT_Checked"/>
-        <CheckBox x:Name="Login_anew" Height="19" Margin="15,55,605,0" VerticalAlignment="Top" Content="单号相同时重染号修改" IsTabStop="False" Checked="Login_anew_Checked" Unchecked="Login_anew_Checked"/>
+        <CheckBox x:Name="Login_MACHINE" Height="19" Margin="15,55,605,0" VerticalAlignment="Top" Content="不允许自定义机台号" IsTabStop="False" Checked="Login_MAC_Checked" Unchecked="Login_MAC_Checked"/>
+        <CheckBox x:Name="Login_anew" Height="19" Margin="15,75,605,0" VerticalAlignment="Top" Content="单号相同时重染号修改" IsTabStop="False" Checked="Login_anew_Checked" Unchecked="Login_anew_Checked"/>
 
 
         <TextBlock HorizontalAlignment="Left" Height="20" Margin="10,220,0,0" TextWrapping="Wrap" Text="前缀名称" VerticalAlignment="Top" Width="75" FontSize="14"/>

Windows/APP_set.xaml.cs

@@ -37,6 +37,8 @@ namespace formula_manage.Windows
             Configini.IniWritevalue("SOFTWARE_SET", " L1", Loginlink.ToString());
             Configini.IniWritevalue("SOFTWARE_SET", " L2", Loginprint.ToString());
             Configini.IniWritevalue("SOFTWARE_SET", " L3", Loginanew.ToString());
+            Configini.IniWritevalue("SOFTWARE_SET", " L4", LoginMAC.ToString());
+
 
             Configini.IniWritevalue("SOFTWARE_SET", " T1", Prepose.Text);
             Configini.IniWritevalue("SOFTWARE_SET", " T2", TimeFormat.Text);
@@ -52,6 +54,7 @@ namespace formula_manage.Windows
         bool Loginlink;
         bool Loginprint;
         bool Loginanew;
+        bool LoginMAC;
         private void Window_SET(object sender, RoutedEventArgs e)
         {
 
@@ -60,6 +63,7 @@ namespace formula_manage.Windows
             Login_LINK.IsChecked = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L1"));  //连接状态显示是否生效
             Login_PRINT.IsChecked = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L2"));  //是否立即打印料单
             Login_anew.IsChecked = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L3"));  //是否立即打印料单
+            Login_MACHINE.IsChecked = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L4"));  //允许自定义机台
 
             Prepose.Text = Configini.IniReadvalue("SOFTWARE_SET", "T1");  //自定义料单前缀
             TimeFormat.Text = Configini.IniReadvalue("SOFTWARE_SET", "T2");  //自定义料单时间格式
@@ -71,6 +75,11 @@ namespace formula_manage.Windows
             Loginlink = Login_LINK.IsChecked.GetValueOrDefault();    //显示是否生效
         }
 
+        private void Login_MAC_Checked(object sender, RoutedEventArgs e)
+        {
+            LoginMAC = Login_MACHINE.IsChecked.GetValueOrDefault();    //是否
+        }
+
         private void Login_PRINT_Checked(object sender, RoutedEventArgs e)
         {
             Loginprint = Login_PRINT.IsChecked.GetValueOrDefault();    //是否立即打印料单

formula_manage.csproj

@@ -14,6 +14,7 @@
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -26,7 +27,6 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
@@ -56,6 +56,49 @@
   <PropertyGroup>
     <ApplicationIcon>sunlight_logo.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>formula_manage.App</StartupObject>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="CommonServiceLocator, Version=2.0.2.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>packages\CommonServiceLocator.2.0.2\lib\net45\CommonServiceLocator.dll</HintPath>