添加排程信息页面

Properties/Resources.Designer.cs

@@ -87,15 +87,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Abnormal 的本地化字符串。
-        /// </summary>
-        public static string Abnormal1 {
-            get {
-                return ResourceManager.GetString("Abnormal1", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 AddTheMedicine 的本地化字符串。
         /// </summary>
@@ -105,15 +96,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
-        /// <summary>
-        ///   查找类似 AddTheMedicine 的本地化字符串。
-        /// </summary>
-        public static string AddTheMedicine1 {
-            get {
-                return ResourceManager.GetString("AddTheMedicine1", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Add water 的本地化字符串。
         /// </summary>
@@ -123,15 +105,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Add water 的本地化字符串。
-        /// </summary>
-        public static string AddWater1 {
-            get {
-                return ResourceManager.GetString("AddWater1", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Advance 的本地化字符串。
         /// </summary>
@@ -141,15 +114,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Advance 的本地化字符串。
-        /// </summary>
-        public static string Advance1 {
-            get {
-                return ResourceManager.GetString("Advance1", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Auto 的本地化字符串。
         /// </summary>
@@ -159,15 +123,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Auto 的本地化字符串。
-        /// </summary>
-        public static string Auto1 {
-            get {
-                return ResourceManager.GetString("Auto1", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Await 的本地化字符串。
         /// </summary>
@@ -528,6 +483,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Delayed 的本地化字符串。
+        /// </summary>
+        public static string Delayed {
+            get {
+                return ResourceManager.GetString("Delayed", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Delete 的本地化字符串。
         /// </summary>

Properties/Resources.en-US.resx

@@ -270,15 +270,9 @@
   <data name="Abnormal" xml:space="preserve">
     <value>Abnormal</value>
   </data>
-  <data name="Abnormal1" xml:space="preserve">
-    <value>Abnormal</value>
-  </data>
   <data name="Auto" xml:space="preserve">
     <value>Auto</value>
   </data>
-  <data name="Auto1" xml:space="preserve">
-    <value>Auto</value>
-  </data>
   <data name="Await" xml:space="preserve">
     <value>Await</value>
   </data>
@@ -384,9 +378,6 @@
   <data name="AddWater" xml:space="preserve">
     <value>Add water</value>
   </data>
-  <data name="AddWater1" xml:space="preserve">
-    <value>Add water</value>
-  </data>
   <data name="Cooling" xml:space="preserve">
     <value>Cooling</value>
   </data>
@@ -447,9 +438,6 @@
   <data name="AddTheMedicine" xml:space="preserve">
     <value>Add The Medicine</value>
   </data>
-  <data name="AddTheMedicine1" xml:space="preserve">
-    <value>Add The Medicine</value>
-  </data>
   <data name="CallDistribution" xml:space="preserve">
     <value>Call Distribution</value>
   </data>
@@ -567,9 +555,6 @@
   <data name="Advance" xml:space="preserve">
     <value>Advance</value>
   </data>
-  <data name="Advance1" xml:space="preserve">
-    <value>Advance</value>
-  </data>
   <data name="Beginning" xml:space="preserve">
     <value>Beginning</value>
   </data>
@@ -945,4 +930,7 @@
   <data name="View" xml:space="preserve">
     <value>View</value>
   </data>
+  <data name="Delayed" xml:space="preserve">
+    <value>Delayed</value>
+  </data>
 </root>

Properties/Resources.resx

@@ -270,15 +270,9 @@
   <data name="Abnormal" xml:space="preserve">
     <value>Abnormal</value>
   </data>
-  <data name="Abnormal1" xml:space="preserve">
-    <value>Abnormal</value>
-  </data>
   <data name="Auto" xml:space="preserve">
     <value>Auto</value>
   </data>
-  <data name="Auto1" xml:space="preserve">
-    <value>Auto</value>
-  </data>
   <data name="Await" xml:space="preserve">
     <value>Await</value>
   </data>
@@ -384,9 +378,6 @@
   <data name="AddWater" xml:space="preserve">
     <value>Add water</value>
   </data>
-  <data name="AddWater1" xml:space="preserve">
-    <value>Add water</value>
-  </data>
   <data name="Cooling" xml:space="preserve">
     <value>Cooling</value>
   </data>
@@ -447,9 +438,6 @@
   <data name="AddTheMedicine" xml:space="preserve">
     <value>AddTheMedicine</value>
   </data>
-  <data name="AddTheMedicine1" xml:space="preserve">
-    <value>AddTheMedicine</value>
-  </data>
   <data name="CallDistribution" xml:space="preserve">
     <value>CallDistribution</value>
   </data>
@@ -567,9 +555,6 @@
   <data name="Advance" xml:space="preserve">
     <value>Advance</value>
   </data>
-  <data name="Advance1" xml:space="preserve">
-    <value>Advance</value>
-  </data>
   <data name="Beginning" xml:space="preserve">
     <value>Beginning</value>
   </data>
@@ -945,4 +930,7 @@
   <data name="View" xml:space="preserve">
     <value>View</value>
   </data>
+  <data name="Delayed" xml:space="preserve">
+    <value>Delayed</value>
+  </data>
 </root>

Properties/Resources.zh-CN.resx

@@ -270,15 +270,9 @@
   <data name="Abnormal" xml:space="preserve">
     <value>异常</value>
   </data>
-  <data name="Abnormal1" xml:space="preserve">
-    <value>异常</value>
-  </data>
   <data name="Auto" xml:space="preserve">
     <value>自动</value>
   </data>
-  <data name="Auto1" xml:space="preserve">
-    <value>自动</value>
-  </data>
   <data name="Await" xml:space="preserve">
     <value>等待命令</value>
   </data>
@@ -384,9 +378,6 @@
   <data name="AddWater" xml:space="preserve">
     <value>入水</value>
   </data>
-  <data name="AddWater1" xml:space="preserve">
-    <value>入水</value>
-  </data>
   <data name="Cooling" xml:space="preserve">
     <value>冷却</value>
   </data>
@@ -447,9 +438,6 @@
   <data name="AddTheMedicine" xml:space="preserve">
     <value>加药</value>
   </data>
-  <data name="AddTheMedicine1" xml:space="preserve">
-    <value>加药</value>
-  </data>
   <data name="CallDistribution" xml:space="preserve">
     <value>呼叫输送</value>
   </data>
@@ -567,9 +555,6 @@
   <data name="Advance" xml:space="preserve">
     <value>提前</value>
   </data>
-  <data name="Advance1" xml:space="preserve">
-    <value>提前</value>
-  </data>
   <data name="Beginning" xml:space="preserve">
     <value>开头</value>
   </data>
@@ -945,4 +930,7 @@
   <data name="View" xml:space="preserve">
     <value>视图</value>
   </data>
+  <data name="Delayed" xml:space="preserve">
+    <value>延后</value>
+  </data>
 </root>

Properties/Resources.zh-TW.resx

@@ -270,15 +270,9 @@
   <data name="Abnormal" xml:space="preserve">
     <value>異常</value>
   </data>
-  <data name="Abnormal1" xml:space="preserve">
-    <value>異常</value>
-  </data>
   <data name="Auto" xml:space="preserve">
     <value>自動</value>
   </data>
-  <data name="Auto1" xml:space="preserve">
-    <value>自動</value>
-  </data>
   <data name="Await" xml:space="preserve">
     <value>等待命令</value>
   </data>
@@ -384,9 +378,6 @@
   <data name="AddWater" xml:space="preserve">
     <value>入水</value>
   </data>
-  <data name="AddWater1" xml:space="preserve">
-    <value>入水</value>
-  </data>
   <data name="Cooling" xml:space="preserve">
     <value>冷卻</value>
   </data>
@@ -447,9 +438,6 @@
   <data name="AddTheMedicine" xml:space="preserve">
     <value>加藥</value>
   </data>
-  <data name="AddTheMedicine1" xml:space="preserve">
-    <value>加藥</value>
-  </data>
   <data name="CallDistribution" xml:space="preserve">
     <value>呼叫輸送</value>
   </data>
@@ -567,9 +555,6 @@
   <data name="Advance" xml:space="preserve">
     <value>提前</value>
   </data>
-  <data name="Advance1" xml:space="preserve">
-    <value>提前</value>
-  </data>
   <data name="Beginning" xml:space="preserve">
     <value>開始</value>
   </data>
@@ -915,30 +900,30 @@
   <data name="Group" xml:space="preserve">
     <value>組</value>
   </data>
-  <data name="DayAfter" xml:space="preserve">
-    <value>後一天</value>
-  </data>
   <data name="Before" xml:space="preserve">
     <value>前一天</value>
   </data>
   <data name="Today" xml:space="preserve">
     <value>今天</value>
   </data>
+  <data name="DayAfter" xml:space="preserve">
+    <value>後一天</value>
+  </data>
   <data name="Test" xml:space="preserve">
     <value>測試</value>
   </data>
-  <data name="Mode" xml:space="preserve">
-    <value>模式</value>
-  </data>
-  <data name="Password" xml:space="preserve">
-    <value>密碼</value>
-  </data>
   <data name="SQL" xml:space="preserve">
     <value>資料庫</value>
   </data>
   <data name="SERVER" xml:space="preserve">
     <value>伺服器</value>
   </data>
+  <data name="Password" xml:space="preserve">
+    <value>密碼</value>
+  </data>
+  <data name="Mode" xml:space="preserve">
+    <value>模式</value>
+  </data>
   <data name="Jump" xml:space="preserve">
     <value>跳步</value>
   </data>

SunlightCentralizedControlManagement_SCCM_.csproj

@@ -130,6 +130,9 @@
     <Compile Include="View\MachinesView.xaml.cs">
       <DependentUpon>MachinesView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\ProductionPlanningEdit.xaml.cs">
+      <DependentUpon>ProductionPlanningEdit.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\ProductionPlanningView.xaml.cs">
       <DependentUpon>ProductionPlanningView.xaml</DependentUpon>
     </Compile>
@@ -198,6 +201,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="View\ProductionPlanningEdit.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="View\ProductionPlanningView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

View/ProductionPlanningEdit.xaml

@@ -0,0 +1,21 @@
+<UserControl x:Class="SunlightCentralizedControlManagement_SCCM_.View.ProductionPlanningEdit"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.View"    
+             xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties"          
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"  
+             mc:Ignorable="d" 
+             d:DesignHeight="900" d:DesignWidth="600">
+    <Grid>
+        
+        
+        <Button Content="{x:Static lang:Resources.Save}" HorizontalAlignment="Right" Height="35" Margin="0,0,50,10" VerticalAlignment="Bottom" Width="80" Click="Button_Click"/>
+           
+        <Button HorizontalAlignment="Left" Height="35" Margin="0,0,50,10" VerticalAlignment="Bottom" Width="60" Click="Button_Quit" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="{x:Null}">
+            <materialDesign:PackIcon Kind="ArrowLeft" Foreground="#FF00204E" HorizontalAlignment="Center" VerticalAlignment="Center" Width="50" Height="35" />
+        </Button>
+
+    </Grid>
+</UserControl>

View/ProductionPlanningEdit.xaml.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace SunlightCentralizedControlManagement_SCCM_.View
+{
+    /// <summary>
+    /// ProductionPlanningEdit.xaml 的交互逻辑
+    /// </summary>
+    public partial class ProductionPlanningEdit : UserControl
+    {
+        public ProductionPlanningEdit()
+        {
+            InitializeComponent();
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+        private void Button_Quit(object sender, RoutedEventArgs e)
+        {
+            this.Visibility = Visibility.Collapsed;
+        }
+    }
+}

View/ProductionPlanningView.xaml

@@ -7,7 +7,6 @@
              xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties" 
              xmlns:ConvertMoels="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ConvertMoels"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"  
-             xmlns:lvc="clr-namespace:LiveChartsCore.SkiaSharpView.WPF;assembly=LiveChartsCore.SkiaSharpView.WPF"    
              xmlns:viewmodel="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ViewModel" 
              xmlns:Ngantt="clr-namespace:nGantt;assembly=nGantt"           
              d:DataContext="{d:DesignInstance Type=viewmodel:ProductionPlanningModel}"
@@ -61,6 +60,17 @@
                     </StackPanel>
                 </ListViewItem>
             </ListView>
+            <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
+                <ListViewItem Height="60" x:Name="WNumder">
+                    <StackPanel Orientation="Horizontal" >
+                        <materialDesign:PackIcon Kind="Number0CircleOutline" Width="40" Height="30" VerticalAlignment="Center"/>
+                        <TextBlock Text="{x:Static lang:Resources.WorkOrderNumder}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
+                        <TextBox x:Name="Select_WorkOrderNumder" Width="300" Background="White" FontSize="20" VerticalAlignment="Center" Height="40" />
+                        <Button Width="80" Height="40" VerticalAlignment="Center" Click="WorkOrderNumder_Click" Content="{x:Static lang:Resources.Search}"/>
+                    </StackPanel>
+                </ListViewItem>
+            </ListView>
+            
         </StackPanel>
         <StackPanel Grid.Row="1" Height="60" Background="#FF00204E" Orientation="Horizontal" HorizontalAlignment="Right">
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
@@ -71,22 +81,6 @@
                     </StackPanel>
                 </ListViewItem>
             </ListView>
-            <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_edit" x:Name="edit">
-                    <StackPanel Orientation="Horizontal">
-                        <materialDesign:PackIcon Kind="Edit" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
-                        <TextBlock Text="{x:Static lang:Resources.edit}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
-                    </StackPanel>
-                </ListViewItem>
-            </ListView>
-            <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Insert" x:Name="Insert">
-                    <StackPanel Orientation="Horizontal">
-                        <materialDesign:PackIcon Kind="InsertComment" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
-                        <TextBlock Text="{x:Static lang:Resources.Insert}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
-                    </StackPanel>
-                </ListViewItem>
-            </ListView>
         </StackPanel>
     </Grid>
 </UserControl>

View/ProductionPlanningView.xaml.cs

@@ -40,6 +40,7 @@ using ScottPlot.TickGenerators.TimeUnits;
 using System.Runtime.Serialization;
 using System.Windows.Markup;
 using System.Collections.ObjectModel;
+using SkiaSharp;
 
 
 namespace SunlightCentralizedControlManagement_SCCM_.View
@@ -69,6 +70,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             maxDate = minDate.AddDays(1);
             //添加表右键功能
             ganttTaskContextMenuItems.Add(new ContextMenuItem(ViewClicked, Properties.Resources.View + "..."));
+            ganttTaskContextMenuItems.Add(new ContextMenuItem(ViewClicked, Properties.Resources.Advance + "..."));
+            ganttTaskContextMenuItems.Add(new ContextMenuItem(ViewClicked, Properties.Resources.Delayed + "..."));
             ganttTaskContextMenuItems.Add(new ContextMenuItem(EditClicked, Properties.Resources.edit + "..."));
             ganttTaskContextMenuItems.Add(new ContextMenuItem(DeleteClicked, Properties.Resources.Delete + "..."));
             GanttChart.GanttTaskContextMenuItems = ganttTaskContextMenuItems;
@@ -105,6 +108,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
                 for (int j = 0; j < dataRows.Count(); j++) //列表排程
                 {
+                  //  if(string.IsNullOrEmpty(dataRows[j].Field<string>("color")))
+
                     GanttChart.AddGanttTask(row, new GanttTask() { 
                         Start = DateTime.Parse(dataRows[j].Field<string>("StartTime")), 
                         End = DateTime.Parse(dataRows[j].Field<string>("EndTime")), 
@@ -123,13 +128,18 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         }
         private void DeleteClicked(GanttTask ganttTask)//删除
         {
+            if (System.Windows.Forms.MessageBox.Show(Properties.Resources.Confirm + Properties.Resources.Delete + ganttTask.Name, "Delete ",
+               System.Windows.Forms.MessageBoxButtons.OKCancel, System.Windows.Forms.MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.OK)
+            {
+                ///执行删除
                 SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
                 SQLiteHelpers.Open();  //打开数据库                       
                 SQLiteHelpers.Delete(
-                "WorkOrder", "StartTime='" + ganttTask.Start + "'and EndTime='"+ ganttTask .End+ "'", null);
+                    "WorkOrder", "StartTime='" + ganttTask.Start + "'and EndTime='" + ganttTask.End + "'", null);
                 SQLiteHelpers.Close();
                 GanttChartNEW();
             }
+        }
         private string FormatYear(Period period)
         {
             return period.Start.Year.ToString();
@@ -162,17 +172,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
      
         }
 
-        private void ListViewItem_edit(object sender, System.Windows.Input.MouseButtonEventArgs e)//编辑事件
+
+
+
+        private void WorkOrderNumder_Click(object sender, RoutedEventArgs e)
         {
-            
+            // Select_WorkOrderNumder.Text;
         }
-
-        private void ListViewItem_Insert(object sender, System.Windows.Input.MouseButtonEventArgs e)//插入事件
-        {
-        }
-
-     
-
         private void ListViewItem_Before(object sender, MouseButtonEventArgs e)//前一天
         {
             Sdatepicker.Text = DateTime.Parse(Sdatepicker.Text).AddDays(-1).ToString("yyyy/MM/dd");

ViewModel/ProductionPlanningModel.cs

@@ -38,7 +38,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
     public partial class ProductionPlanningModel : ObservableObject//ViewModelBase
     {
         //x轴时间格式    
-        public Axis[] XAxes { get; set; } =
+      /*  public Axis[] XAxes { get; set; } =
         {
             new DateTimeAxis(TimeSpan.FromSeconds(5) , date => date.ToString("yyyy-MM-dd HH:mm"))
             {
@@ -90,7 +90,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
             };
         }
 
-        public ISeries[] Series { get; set; } 
+        public ISeries[] Series { get; set; } */
 
     }
 }