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

MainWindow.xaml

@@ -7,7 +7,7 @@
         xmlns:local="clr-namespace:DyeingComputer" 
         xmlns:viewmodel="clr-namespace:DyeingComputer.ViewModel" 
         d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}"
-        mc:Ignorable="d"  KeyDown="W_KeyDown"
+        mc:Ignorable="d" 
         Title="SUNLIGHT 838 b0.0.1 (2024/08/10)"      
         Height="720" Width="1280"  
         WindowState ="Maximized"

MainWindow.xaml.cs

@@ -177,27 +177,7 @@ namespace DyeingComputer
                     break;
             }
         }
-
-        private void W_KeyDown(object sender, KeyEventArgs e) //键盘监控
-        {
-            if(e.Key == Key.N) 
-            {
-                if (MainWindowViewModel.WORK_RUN == 2)
-                {
-                    MainWindowViewModel.WORK_RUN = 1;// 运行时停止键为暂停
-                }else if (MainWindowViewModel.WORK_RUN == 1)
-                {
-                    MessageBoxResult messageBoxResult = System.Windows.MessageBox.Show(Properties.Resources.StopProcess, "800", MessageBoxButton.OKCancel);
-                    if (messageBoxResult == MessageBoxResult.OK) 
-                    {
-                        MainWindowViewModel.WORK_RUN = 0;// 运行时停止键为
-                        MainWindowViewModel.DIDETime = 0;
-
-                    }
-                }
-            }
-        }
-
+           
         private void Image_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             ((Image)sender).RenderTransform = new ScaleTransform(0.9,0.9);

Properties/Resources.Designer.cs

@@ -132,6 +132,15 @@ namespace DyeingComputer.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 BathRatio 的本地化字符串。
+        /// </summary>
+        public static string BathRatio {
+            get {
+                return ResourceManager.GetString("BathRatio", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Beginning 的本地化字符串。
         /// </summary>
@@ -186,6 +195,15 @@ namespace DyeingComputer.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Client 的本地化字符串。
+        /// </summary>
+        public static string Client {
+            get {
+                return ResourceManager.GetString("Client", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 ClothIntake 的本地化字符串。
         /// </summary>
@@ -195,6 +213,24 @@ namespace DyeingComputer.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 ClothSpecies 的本地化字符串。
+        /// </summary>
+        public static string ClothSpecies {
+            get {
+                return ResourceManager.GetString("ClothSpecies", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 ClothWeight 的本地化字符串。
+        /// </summary>
+        public static string ClothWeight {
+            get {
+                return ResourceManager.GetString("ClothWeight", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 ClothWheel 的本地化字符串。
         /// </summary>
@@ -213,6 +249,24 @@ namespace DyeingComputer.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 ColorName 的本地化字符串。
+        /// </summary>
+        public static string ColorName {
+            get {
+                return ResourceManager.GetString("ColorName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 ColorNumber 的本地化字符串。
+        /// </summary>
+        public static string ColorNumber {
+            get {
+                return ResourceManager.GetString("ColorNumber", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Compute 的本地化字符串。
         /// </summary>
@@ -1293,6 +1347,15 @@ namespace DyeingComputer.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Total 的本地化字符串。
+        /// </summary>
+        public static string Total {
+            get {
+                return ResourceManager.GetString("Total", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Type 的本地化字符串。
         /// </summary>

Properties/Resources.en-US.resx

@@ -558,4 +558,25 @@
   <data name="Shutdown" xml:space="preserve">
     <value>Shutdown</value>
   </data>
+  <data name="ColorNumber" xml:space="preserve">
+    <value>Color Number</value>
+  </data>
+  <data name="ColorName" xml:space="preserve">
+    <value>Color Name</value>
+  </data>
+  <data name="Client" xml:space="preserve">
+    <value>Client</value>
+  </data>
+  <data name="ClothWeight" xml:space="preserve">
+    <value>Cloth Weight</value>
+  </data>
+  <data name="ClothSpecies" xml:space="preserve">
+    <value>Cloth Species</value>
+  </data>
+  <data name="BathRatio" xml:space="preserve">
+    <value>Bath Ratio</value>
+  </data>
+  <data name="Total" xml:space="preserve">
+    <value>Total</value>
+  </data>
 </root>

Properties/Resources.resx

@@ -558,4 +558,25 @@
   <data name="Shutdown" xml:space="preserve">
     <value>Shutdown</value>
   </data>
+  <data name="ColorNumber" xml:space="preserve">
+    <value>ColorNumber</value>
+  </data>
+  <data name="ColorName" xml:space="preserve">
+    <value>ColorName</value>
+  </data>
+  <data name="Client" xml:space="preserve">
+    <value>Client</value>
+  </data>
+  <data name="ClothWeight" xml:space="preserve">
+    <value>ClothWeight</value>
+  </data>
+  <data name="ClothSpecies" xml:space="preserve">
+    <value>ClothSpecies</value>
+  </data>
+  <data name="BathRatio" xml:space="preserve">
+    <value>BathRatio</value>
+  </data>
+  <data name="Total" xml:space="preserve">
+    <value>Total</value>
+  </data>
 </root>

Properties/Resources.zh-CN.resx

@@ -558,4 +558,25 @@
   <data name="Shutdown" xml:space="preserve">
     <value>关机</value>
   </data>
+  <data name="ColorNumber" xml:space="preserve">
+    <value>颜色编号</value>
+  </data>
+  <data name="ColorName" xml:space="preserve">
+    <value>颜色</value>
+  </data>
+  <data name="Client" xml:space="preserve">
+    <value>客户</value>
+  </data>
+  <data name="ClothWeight" xml:space="preserve">
+    <value>布重</value>
+  </data>
+  <data name="ClothSpecies" xml:space="preserve">
+    <value>布种</value>
+  </data>
+  <data name="BathRatio" xml:space="preserve">
+    <value>浴比</value>
+  </data>
+  <data name="Total" xml:space="preserve">
+    <value>总量</value>
+  </data>
 </root>

Properties/Resources.zh-TW.resx

@@ -550,12 +550,33 @@
     <value>運行</value>
   </data>
   <data name="Unlock" xml:space="preserve">
-    <value />
+    <value>解鎖</value>
   </data>
   <data name="Manual" xml:space="preserve">
-    <value />
+    <value>手動</value>
   </data>
   <data name="Shutdown" xml:space="preserve">
-    <value />
+    <value>關機</value>
+  </data>
+  <data name="ColorNumber" xml:space="preserve">
+    <value>顏色編號</value>
+  </data>
+  <data name="ColorName" xml:space="preserve">
+    <value>顏色</value>
+  </data>
+  <data name="Client" xml:space="preserve">
+    <value>客戶</value>
+  </data>
+  <data name="ClothWeight" xml:space="preserve">
+    <value>布重</value>
+  </data>
+  <data name="ClothSpecies" xml:space="preserve">
+    <value>布種</value>
+  </data>
+  <data name="BathRatio" xml:space="preserve">
+    <value>浴比</value>
+  </data>
+  <data name="Total" xml:space="preserve">
+    <value>總量</value>
   </data>
 </root>

View/TechnologicalProcessView.xaml.cs

@@ -263,6 +263,7 @@ namespace DyeingComputer.View
             Parameter_set.Visibility = Visibility.Visible;
             Receip.Visibility = Visibility.Collapsed;
         }
+
         DataTable tblDatas = new DataTable("Datas");
         public static object workName;
         public static SQLiteHelper SQLiteHelpers = null;  //定义数据库

View/WorkOrderView.xaml

@@ -78,7 +78,7 @@
             </DataGrid.CellStyle>
             <DataGrid.Columns>
                 <!--列信息绑定-->
-                <DataGridTextColumn Header="{x:Static lang:Resources.WorkOrderNumder}" Width="250" Binding="{Binding WorkOrder}" IsReadOnly="True">
+                <DataGridTextColumn Header="{x:Static lang:Resources.WorkOrderNumder}" Width="350" Binding="{Binding WorkOrder}" IsReadOnly="True">
                     <DataGridTextColumn.ElementStyle>
                         <Style TargetType="{x:Type TextBlock}">
                             <Setter Property="Foreground" Value="{Binding Path=lock,Converter={StaticResource GramsSQLConvert}}"/>

View/WorkOrderView.xaml.cs

@@ -36,7 +36,6 @@ namespace DyeingComputer.View
         public WorkOrderView()
         {
             DataContext = new WorkOrderViewModel();
-
             InitializeComponent();
         }
 
@@ -63,6 +62,11 @@ namespace DyeingComputer.View
             };
             timer1s.Tick += Tick_Event_1S;
             timer1s.Start();
+
+             WorkOrder_Numder = null;
+             Process_Name = null;
+             Process_id = null;
+             _lock = null;
         }
         void Tick_Event_1S(object sender, EventArgs e)
         {
@@ -81,6 +85,7 @@ namespace DyeingComputer.View
         string Process_id;
         string _lock;
         bool SQL_UPDATE = false;
+        int inf_cont = 0;
 
         public void Workorder_sql()
         {
@@ -95,10 +100,10 @@ namespace DyeingComputer.View
 
             SQLiteHelpers.Close();  //关闭连接
 
-            WorkOrder_Numder = null;
-            Process_Name = null;
-            Process_id = null;
-            _lock = null;
+           // WorkOrder_Numder = null;
+           // Process_Name = null;
+           // Process_id = null;
+           // _lock = null;
         }
  
         private void WorkOrderView_lock_Click(object sender, RoutedEventArgs e)//锁定按钮
@@ -129,9 +134,9 @@ namespace DyeingComputer.View
         }
         private void Address_ButtonClicked(object sender, AddressUpdateEventArgs e)//编辑返回结果
         {
+            SQL_UPDATE = false;
             MainWindowViewModel.WorkNumder = DateTime.Now.ToString("yyMMddHHmmss");
             TechnologicalProcessView.workName = e.ID;
-
         }
         private void WorkOrderView_del_Click(object sender, RoutedEventArgs e)//删除按钮
         {
@@ -147,6 +152,7 @@ namespace DyeingComputer.View
                 SQLiteHelpers.Close();
                 Workorder_sql();
             }
+            SQL_UPDATE = false;
         }
 
         private void WorkOrderView_redy_Click(object sender, RoutedEventArgs e)//重染按钮
@@ -160,6 +166,7 @@ namespace DyeingComputer.View
                     ///执行重染
                 }
             }
+            SQL_UPDATE = false;
         }
 
         private void Grid_SelectionChanged(object sender, SelectionChangedEventArgs e)//表格选择事件
@@ -180,6 +187,7 @@ namespace DyeingComputer.View
                  "select * from WorkorderSteps where WorkOrder='" + WorkOrder_Numder + "'", null).Tables[0];  //读取表写入缓存
                 SQLiteHelpers.Close();  //关闭连接
 
+                inf_cont = 0;
                 TEMP();
             }         
         }
@@ -190,32 +198,80 @@ namespace DyeingComputer.View
         }
         private void Image_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
         {
+            SQL_UPDATE = false;
             ((System.Windows.Controls.Image)sender).RenderTransform = Transform.Identity;
             if (string.IsNullOrEmpty(WorkOrder_Numder)) return;
+            inf_cont++;
+            if (inf_cont == 1)
+            {
+                DataGrid dataGrid = new DataGrid();
+                dataGrid.Columns.Add(new DataGridTextColumn() { Header = Properties.Resources.Step, Width = 60, Binding = new Binding("Step") });
+                dataGrid.Columns.Add(new DataGridTextColumn() { Header = Properties.Resources.Directives, Width = 300, Binding = new Binding("StepName") });
+                dataGrid.Columns.Add(new DataGridTextColumn() { Header = Properties.Resources.ParameterSet, Width = 500, Binding = new Binding("ParameterName") });
+                dataGrid.Columns.Add(new DataGridTextColumn() { Header = Properties.Resources.Remark, Width = Picture.ActualWidth - 885, Binding = new Binding("Remark") });
+                dataGrid.AutoGenerateColumns = false;
+                dataGrid.CanUserReorderColumns = false;
+                dataGrid.CanUserSortColumns = false;
+                dataGrid.CanUserResizeRows = false;
+                dataGrid.CanUserResizeColumns = false;
+                dataGrid.ColumnHeaderHeight = 40;
+                dataGrid.FontSize = 25;
+                dataGrid.HorizontalGridLinesBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 201, 201, 201));
+                dataGrid.VerticalGridLinesBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 201, 201, 201));
 
-            DataGrid dataGrid = new DataGrid();
-            dataGrid.Columns.Add(new DataGridTextColumn() { Header = Properties.Resources.Step, Width = 60, Binding = new Binding("Step") });
-            dataGrid.Columns.Add(new DataGridTextColumn() { Header = Properties.Resources.Directives, Width = 300, Binding = new Binding("StepName") });
-            dataGrid.Columns.Add(new DataGridTextColumn() { Header = Properties.Resources.ParameterSet, Width = 500, Binding = new Binding("ParameterName") });
-            dataGrid.Columns.Add(new DataGridTextColumn() { Header = Properties.Resources.Remark, Width = 600, Binding = new Binding("Remark") });
-            dataGrid.AutoGenerateColumns = false;
-            dataGrid.CanUserReorderColumns = false;
-            dataGrid.CanUserSortColumns = false;
-            dataGrid.CanUserResizeRows = false;
-            dataGrid.CanUserResizeColumns = false;
-            dataGrid.ColumnHeaderHeight = 40;
-            dataGrid.FontSize = 25;
-            dataGrid.HorizontalGridLinesBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 201, 201, 201));
-            dataGrid.VerticalGridLinesBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 201, 201, 201));
+                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
+                SQLiteHelpers.Open();  //打开数据库
+                string sql_script = "select * from WorkorderSteps where WorkOrder='" + WorkOrder_Numder + "'";
+                DataTable inf = SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0];  //读取表写入缓存           
+                SQLiteHelpers.Close();  //关闭连接
+                dataGrid.ItemsSource = inf.DefaultView;  //转换显示计划表
 
-            SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-            SQLiteHelpers.Open();  //打开数据库
-            string sql_script = "select * from WorkorderSteps where WorkOrder='" + WorkOrder_Numder + "'";
-            DataTable inf = SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0];  //读取表写入缓存           
-            SQLiteHelpers.Close();  //关闭连接
-            dataGrid.ItemsSource = inf.DefaultView;  //转换显示计划表
+                Picture.Content = dataGrid;
+            }//步骤细节
+            else if (inf_cont == 2)
+            {
+                DataGrid dataGrid_ = new DataGrid();
+                dataGrid_.Columns.Add(new DataGridTextColumn() { Header = "", Width = Picture.ActualWidth / 2 , Binding = new Binding("NAME") });
+                dataGrid_.Columns.Add(new DataGridTextColumn() { Header = "", Width = Picture.ActualWidth / 2 - 25, Binding = new Binding("Value") });
+                dataGrid_.AutoGenerateColumns = false;
+                dataGrid_.CanUserReorderColumns = false;
+                dataGrid_.CanUserSortColumns = false;
+                dataGrid_.CanUserResizeRows = false;
+                dataGrid_.CanUserResizeColumns = false;
+                dataGrid_.ColumnHeaderHeight = 40;
+                dataGrid_.FontSize = 25;
+                dataGrid_.HorizontalGridLinesBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 201, 201, 201));
+                dataGrid_.VerticalGridLinesBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 201, 201, 201));
 
-            Picture.Content = dataGrid;
+                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
+                SQLiteHelpers.Open();  //打开数据库
+                string sql_script = "select * from Workorder where WorkOrder='" + WorkOrder_Numder + "'";
+                DataRow inf = SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0].Select().First();  //读取表写入缓存           
+                SQLiteHelpers.Close();  //关闭连接
+
+                DataTable dataTable = new DataTable();
+                dataTable.Columns.Add("NAME", Type.GetType("System.String"));
+                dataTable.Columns.Add("Value", Type.GetType("System.String"));
+                dataTable.Rows.Add(new object[] { Properties.Resources.WorkOrder, inf.Field<string>("WorkOrder")});
+                dataTable.Rows.Add(new object[] { Properties.Resources.Dyelot, inf.Field<string>("Dyelot") });
+                dataTable.Rows.Add(new object[] { Properties.Resources.ProcessName, inf.Field<string>("ProgramName") });
+                dataTable.Rows.Add(new object[] { Properties.Resources.Time, inf.Field<string>("Time") });
+                dataTable.Rows.Add(new object[] { Properties.Resources.ColorNumber, inf.Field<string>("ColorNumber") });
+                dataTable.Rows.Add(new object[] { Properties.Resources.ColorName, inf.Field<string>("ColorName") });
+                dataTable.Rows.Add(new object[] { Properties.Resources.Client, inf.Field<string>("Client") });
+                dataTable.Rows.Add(new object[] { Properties.Resources.ClothWeight, inf.Field<string>("ClothWeight") });
+                dataTable.Rows.Add(new object[] { Properties.Resources.ClothSpecies, inf.Field<string>("ClothSpecies") });
+                dataTable.Rows.Add(new object[] { Properties.Resources.BathRatio, inf.Field<string>("BathRatio") });
+                dataTable.Rows.Add(new object[] { Properties.Resources.Total, inf.Field<string>("Total") });
+
+                dataGrid_.ItemsSource = dataTable.DefaultView;  //转换显示计划表
+                Picture.Content = dataGrid_;
+            }//工单信息
+            else if (inf_cont == 3)
+            {
+                inf_cont = 0; 
+                TEMP();
+            }//显示曲线
         }//信息
         private void Image_MouseLeftButtonDown1(object sender, MouseButtonEventArgs e)
         {
@@ -223,6 +279,7 @@ namespace DyeingComputer.View
         }
         private void Image_MouseLeftButtonUp1(object sender, MouseButtonEventArgs e)
         {
+            SQL_UPDATE = false;
             ((System.Windows.Controls.Image)sender).RenderTransform = Transform.Identity;
             if (string.IsNullOrEmpty(WorkOrder_Numder)) return;
             if (_lock == "1")
@@ -313,7 +370,7 @@ namespace DyeingComputer.View
                 _mainWindow.container.Content = new TechnologicalProcessView();//获取控件
             }
         }//开始
-
+        
         private void TEMP()
         {
             //处理计划温度图表