diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index 9e28e3c..65b4349 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -87,15 +87,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
- ///
- /// 查找类似 Abnormal 的本地化字符串。
- ///
- public static string Abnormal1 {
- get {
- return ResourceManager.GetString("Abnormal1", resourceCulture);
- }
- }
-
///
/// 查找类似 AddTheMedicine 的本地化字符串。
///
@@ -105,15 +96,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
- ///
- /// 查找类似 AddTheMedicine 的本地化字符串。
- ///
- public static string AddTheMedicine1 {
- get {
- return ResourceManager.GetString("AddTheMedicine1", resourceCulture);
- }
- }
-
///
/// 查找类似 Add water 的本地化字符串。
///
@@ -123,15 +105,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
- ///
- /// 查找类似 Add water 的本地化字符串。
- ///
- public static string AddWater1 {
- get {
- return ResourceManager.GetString("AddWater1", resourceCulture);
- }
- }
-
///
/// 查找类似 Advance 的本地化字符串。
///
@@ -141,15 +114,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
- ///
- /// 查找类似 Advance 的本地化字符串。
- ///
- public static string Advance1 {
- get {
- return ResourceManager.GetString("Advance1", resourceCulture);
- }
- }
-
///
/// 查找类似 Auto 的本地化字符串。
///
@@ -159,15 +123,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
- ///
- /// 查找类似 Auto 的本地化字符串。
- ///
- public static string Auto1 {
- get {
- return ResourceManager.GetString("Auto1", resourceCulture);
- }
- }
-
///
/// 查找类似 Await 的本地化字符串。
///
@@ -528,6 +483,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 Delayed 的本地化字符串。
+ ///
+ public static string Delayed {
+ get {
+ return ResourceManager.GetString("Delayed", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Delete 的本地化字符串。
///
diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx
index c6391c2..0f66e96 100644
--- a/Properties/Resources.en-US.resx
+++ b/Properties/Resources.en-US.resx
@@ -270,15 +270,9 @@
Abnormal
-
- Abnormal
-
Auto
-
- Auto
-
Await
@@ -384,9 +378,6 @@
Add water
-
- Add water
-
Cooling
@@ -447,9 +438,6 @@
Add The Medicine
-
- Add The Medicine
-
Call Distribution
@@ -567,9 +555,6 @@
Advance
-
- Advance
-
Beginning
@@ -945,4 +930,7 @@
View
+
+ Delayed
+
\ No newline at end of file
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index fe59b7a..a771db2 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -270,15 +270,9 @@
Abnormal
-
- Abnormal
-
Auto
-
- Auto
-
Await
@@ -384,9 +378,6 @@
Add water
-
- Add water
-
Cooling
@@ -447,9 +438,6 @@
AddTheMedicine
-
- AddTheMedicine
-
CallDistribution
@@ -567,9 +555,6 @@
Advance
-
- Advance
-
Beginning
@@ -945,4 +930,7 @@
View
+
+ Delayed
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx
index 25cd367..deaea11 100644
--- a/Properties/Resources.zh-CN.resx
+++ b/Properties/Resources.zh-CN.resx
@@ -270,15 +270,9 @@
异常
-
- 异常
-
自动
-
- 自动
-
等待命令
@@ -384,9 +378,6 @@
入水
-
- 入水
-
冷却
@@ -447,9 +438,6 @@
加药
-
- 加药
-
呼叫输送
@@ -567,9 +555,6 @@
提前
-
- 提前
-
开头
@@ -945,4 +930,7 @@
视图
+
+ 延后
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx
index f664ce4..9de8e42 100644
--- a/Properties/Resources.zh-TW.resx
+++ b/Properties/Resources.zh-TW.resx
@@ -270,15 +270,9 @@
異常
-
- 異常
-
自動
-
- 自動
-
等待命令
@@ -384,9 +378,6 @@
入水
-
- 入水
-
冷卻
@@ -447,9 +438,6 @@
加藥
-
- 加藥
-
呼叫輸送
@@ -567,9 +555,6 @@
提前
-
- 提前
-
開始
@@ -915,30 +900,30 @@
組
-
- 後一天
-
前一天
今天
+
+ 後一天
+
測試
-
- 模式
-
-
- 密碼
-
資料庫
伺服器
+
+ 密碼
+
+
+ 模式
+
跳步
diff --git a/SunlightCentralizedControlManagement_SCCM_.csproj b/SunlightCentralizedControlManagement_SCCM_.csproj
index 0274aa8..ac0596a 100644
--- a/SunlightCentralizedControlManagement_SCCM_.csproj
+++ b/SunlightCentralizedControlManagement_SCCM_.csproj
@@ -130,6 +130,9 @@
MachinesView.xaml
+
+ ProductionPlanningEdit.xaml
+
ProductionPlanningView.xaml
@@ -198,6 +201,10 @@
MSBuild:Compile
Designer
+
+ Designer
+ MSBuild:Compile
+
MSBuild:Compile
Designer
diff --git a/View/ProductionPlanningEdit.xaml b/View/ProductionPlanningEdit.xaml
new file mode 100644
index 0000000..2d590f7
--- /dev/null
+++ b/View/ProductionPlanningEdit.xaml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/View/ProductionPlanningEdit.xaml.cs b/View/ProductionPlanningEdit.xaml.cs
new file mode 100644
index 0000000..85dc9ef
--- /dev/null
+++ b/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
+{
+ ///
+ /// ProductionPlanningEdit.xaml 的交互逻辑
+ ///
+ 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;
+ }
+ }
+}
diff --git a/View/ProductionPlanningView.xaml b/View/ProductionPlanningView.xaml
index 184966f..4a73f08 100644
--- a/View/ProductionPlanningView.xaml
+++ b/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 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -71,22 +81,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/View/ProductionPlanningView.xaml.cs b/View/ProductionPlanningView.xaml.cs
index 3fdb490..92c1bcd 100644
--- a/View/ProductionPlanningView.xaml.cs
+++ b/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("color")))
+
GanttChart.AddGanttTask(row, new GanttTask() {
Start = DateTime.Parse(dataRows[j].Field("StartTime")),
End = DateTime.Parse(dataRows[j].Field("EndTime")),
@@ -123,12 +128,17 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
}
private void DeleteClicked(GanttTask ganttTask)//删除
{
- SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
- SQLiteHelpers.Open(); //打开数据库
- SQLiteHelpers.Delete(
- "WorkOrder", "StartTime='" + ganttTask.Start + "'and EndTime='"+ ganttTask .End+ "'", null);
- SQLiteHelpers.Close();
- GanttChartNEW();
+ 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);
+ SQLiteHelpers.Close();
+ GanttChartNEW();
+ }
}
private string FormatYear(Period period)
{
@@ -162,17 +172,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
}
- private void ListViewItem_edit(object sender, System.Windows.Input.MouseButtonEventArgs e)//编辑事件
- {
-
- }
- private void ListViewItem_Insert(object sender, System.Windows.Input.MouseButtonEventArgs e)//插入事件
- {
- }
-
+ private void WorkOrderNumder_Click(object sender, RoutedEventArgs e)
+ {
+ // Select_WorkOrderNumder.Text;
+ }
private void ListViewItem_Before(object sender, MouseButtonEventArgs e)//前一天
{
Sdatepicker.Text = DateTime.Parse(Sdatepicker.Text).AddDays(-1).ToString("yyyy/MM/dd");
diff --git a/ViewModel/ProductionPlanningModel.cs b/ViewModel/ProductionPlanningModel.cs
index 09bf960..b2a541f 100644
--- a/ViewModel/ProductionPlanningModel.cs
+++ b/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; } */
}
}