sc/SunlightCentralizedControlManagement
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sc committed 2025-01-07 23:40:51 +08:00
2 parents b278a10f9f 6e00adc64b
commit e940649023
7 files changed
+56 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Properties/Resources.Designer.cs
Generated
+9
View File
@@ -303,6 +303,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
/// <summary>
/// 查找类似 Color 的本地化字符串。
/// </summary>
public static string Color {
get {
return ResourceManager.GetString("Color", resourceCulture);
}
}
/// <summary>
/// 查找类似 Compute 的本地化字符串。
/// </summary>
Properties/Resources.en-US.resx
+3
View File
@@ -936,4 +936,7 @@
<data name="Multi" xml:space="preserve">
<value>Multi</value>
</data>
<data name="Color" xml:space="preserve">
<value>Color</value>
</data>
</root>
Properties/Resources.resx
+3
View File
@@ -936,4 +936,7 @@
<data name="Multi" xml:space="preserve">
<value>Multi</value>
</data>
<data name="Color" xml:space="preserve">
<value>Color</value>
</data>
</root>
Properties/Resources.zh-CN.resx
+3
View File
@@ -936,4 +936,7 @@
<data name="Multi" xml:space="preserve">
<value>多机</value>
</data>
<data name="Color" xml:space="preserve">
<value>颜色</value>
</data>
</root>
View/ProductionPlanningEdit.xaml
+2
View File
@@ -18,6 +18,8 @@
<ComboBox HorizontalAlignment="Left" Height="30" Margin="150,80,0,0" x:Name="comboBoxProgram" VerticalAlignment="Top" Width="270"
FontSize="15" IsEditable="True" BorderBrush="#FF673AB7" DropDownClosed="comboBoxProgram_DropDownClosed"
TextBoxBase.TextChanged="comboBoxProgram_TextChanged"/>
<TextBox x:Name="color_color" HorizontalAlignment="Left" Height="35" Margin="450,80,0,0" TextWrapping="Wrap" BorderBrush="#FF673AB7" Background="#FF336FA8"
VerticalAlignment="Top" Width="80" FontSize="20" MouseDoubleClick="color_color_MouseDoubleClick" IsReadOnly="True" Cursor="Arrow" BorderThickness="5,5,5,5" />
<TextBlock HorizontalAlignment="Left" Height="40" Margin="10,80,0,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.process}"
VerticalAlignment="Top" Width="120" FontSize="25"/>
<ComboBox HorizontalAlignment="Left" Height="30" Margin="150,130,0,0" x:Name="comboBoxDyelot" VerticalAlignment="Top" Width="270"
View/ProductionPlanningEdit.xaml.cs
+29 -11
View File
@@ -89,6 +89,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
string Machines_ = comboBoxMachine.Text;
string State_ = "100";
string Dyelot_ = comboBoxDyelot.Text;
string color_ = color_color.Background.ToString();
SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
SQLiteHelpers.Open(); //打开数据库
try
@@ -98,22 +99,22 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
Tables[0].Select().First().Field<object>("EndTime").ToString(); //读取计划表写入缓存
if (DateTime.Now < DateTime.Parse(sTime))
{
StartTime_=DateTime.Parse(sTime).AddMinutes(1).ToString("yy/MM/dd HH:mm:ss");
StartTime_=DateTime.Parse(sTime).AddMinutes(1).ToString("yyyy/M/d HH:mm:ss");
}
else
{
StartTime_= DateTime.Now.AddMinutes(1).ToString("yy/MM/dd HH:mm:ss");
StartTime_= DateTime.Now.AddMinutes(1).ToString("yyyy/M/d HH:mm:ss");
}
}
catch (Exception)
{
StartTime_= DateTime.Now.AddMinutes(1).ToString("yy/MM/dd HH:mm:ss");
StartTime_= DateTime.Now.AddMinutes(1).ToString("yyyy/M/d HH:mm:ss");
}
SQLiteHelpers.Close(); //关闭连接
string Time_ = DateTime.Parse(ProgramName.Select("ProgramName='" + ProgramName_ + "'").
First().Field<object>("Time").ToString()).ToString("HH:mm:ss");
string EndTime_ = (DateTime.Parse(StartTime_)+ DateTime.Parse(Time_).TimeOfDay).ToString();
string EndTime_ = (DateTime.Parse(StartTime_)+ DateTime.Parse(Time_).TimeOfDay).ToString("yyyy/M/d HH:mm:ss");
//插入数据信息
Dictionary<string, object> WorkOrder_new = new Dictionary<string, object>();//缓存函数
@@ -128,7 +129,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
WorkOrder_new.Add("Dyelot", Dyelot_);
WorkOrder_new.Add("Remark", null);
WorkOrder_new.Add("lock", 0);
WorkOrder_new.Add("color", null);
WorkOrder_new.Add("color", color_);
SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
SQLiteHelpers.Open(); //打开数据库
SQLiteHelpers.InsertData("WorkOrder", WorkOrder_new);// 执行插入
@@ -140,13 +141,14 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
{
string sTime;
string StartTime_;
string WorkOrder_ = sArray[i] + "_" + DateTime.Now.ToString("yyMMddHHmmss");
string WorkOrder_ = sArray[i] + "_" + DateTime.Now.ToString("yyMMddHHmmss")+i;
string ProgramName_ = comboBoxProgram.Text;
string ProgramID_ = ProgramName.Select("ProgramName='" + ProgramName_ + "'").
First().Field<object>("ProgramID").ToString();
string Machines_ = sArray[i];
string State_ = "100";
string Dyelot_ = comboBoxDyelot.Text;
string color_ = color_color.Background.ToString();
SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
SQLiteHelpers.Open(); //打开数据库
try
@@ -156,16 +158,16 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
Tables[0].Select().First().Field<object>("EndTime").ToString(); //读取计划表写入缓存
if (DateTime.Now < DateTime.Parse(sTime))
{
StartTime_ = DateTime.Parse(sTime).AddMinutes(1).ToString("yy/MM/dd HH:mm:ss");
StartTime_ = DateTime.Parse(sTime).AddMinutes(1).ToString("yyyy/M/d HH:mm:ss");
}
else
{
StartTime_ = DateTime.Now.AddMinutes(1).ToString("yy/MM/dd HH:mm:ss");
StartTime_ = DateTime.Now.AddMinutes(1).ToString("yyyy/M/d HH:mm:ss");
}
}
catch (Exception)
{
StartTime_ = DateTime.Now.AddMinutes(1).ToString("yy/MM/dd HH:mm:ss");
StartTime_ = DateTime.Now.AddMinutes(1).ToString("yyyy/M/d HH:mm:ss");
}
SQLiteHelpers.Close(); //关闭连接
@@ -186,7 +188,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
WorkOrder_new.Add("Dyelot", Dyelot_);
WorkOrder_new.Add("Remark", null);
WorkOrder_new.Add("lock", 0);
WorkOrder_new.Add("color", null);
WorkOrder_new.Add("color", color_);
SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
SQLiteHelpers.Open(); //打开数据库
SQLiteHelpers.InsertData("WorkOrder", WorkOrder_new);// 执行插入
@@ -258,12 +260,28 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
}
private void color_color_MouseDoubleClick(object sender, MouseButtonEventArgs e)
{
System.Windows.Forms.ColorDialog colorDialog = new System.Windows.Forms.ColorDialog();//使用调色盘控件ColorDialog
if (colorDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)//打开调色盘
{
System.Drawing.Color DColor = colorDialog.Color;////获取选中色彩信息
//System.Windows.Media.Color MColor = new System.Windows.Media.Color();//转换
System.Windows.Media.Color MColor = System.Windows.Media.Color.FromArgb(DColor.A, DColor.R, DColor.G, DColor.B);//转换并配置ARGB参数
color_color.Background = new SolidColorBrush(MColor);//ARGB参数输出至Color的背景色
//string colorCode = string.Format("{0:X2}", DColor.B) + string.Format("{0:X2}", DColor.G) + string.Format("{0:X2}", DColor.R);//反向十六进制RGB
//string colorCode = string.Format("{0:X2}", DColor.R) + string.Format("{0:X2}", DColor.G) + string.Format("{0:X2}", DColor.B);//正向十六进制RGB
//ColorCode_SQL = Convert.ToInt32(colorCode, 16);//十六进制RGB转存储数值
}
}
string ProgramID;
string ProgramNAME;
string Numder = null;
string ID = null;
string P1, P2, P3, P4, P5;
private void Grid_data_MouseDoubleClick(object sender, MouseButtonEventArgs e)
{
int rownum = Grid_data.SelectedIndex;//获取鼠标选中行并定义变量
View/ProductionPlanningView.xaml.cs
+7 -7
View File
@@ -67,7 +67,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
private DateTime maxDate;
private void UserControl_Loaded(object sender, RoutedEventArgs e)//打开页面时的操作
{
Sdatepicker.Text = DateTime.Now.ToString("yyyy/MM/dd");
Sdatepicker.Text = DateTime.Now.ToString("yyyy/M/d HH:mm:ss");
minDate = DateTime.Now.Date;
maxDate = minDate.AddDays(1);
//添加表右键功能
@@ -112,7 +112,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
System.Windows.Media.Color colorBackground = (System.Windows.Media.Color)System.Windows.Media.ColorConverter.ConvertFromString("#FF336FA8");
try
{
colorBackground = (System.Windows.Media.Color)System.Windows.Media.ColorConverter.ConvertFromString("#"+dataRows[j].Field<string>("color"));
colorBackground = (System.Windows.Media.Color)System.Windows.Media.ColorConverter.ConvertFromString(dataRows[j].Field<string>("color"));
}
catch (Exception) { }
//FF336FA8
@@ -122,6 +122,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
End = DateTime.Parse(dataRows[j].Field<string>("EndTime")),
Name = Properties.Resources.ProcessName + ";" + dataRows[j].Field<string>("ProgramName"),
Background = colorBackground,
ID = dataRows[j].Field<string>("WorkOrder"),
TaskProgressVisibility = System.Windows.Visibility.Hidden
});
}
@@ -143,8 +144,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
///执行删除
SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
SQLiteHelpers.Open(); //打开数据库
SQLiteHelpers.Delete(
"WorkOrder", "StartTime='" + ganttTask.Start + "'and EndTime='" + ganttTask.End + "'", null);
SQLiteHelpers.Delete("WorkOrder", "WorkOrder='" + ganttTask.ID + "'", null);
SQLiteHelpers.Close();
GanttChartNEW();
}
@@ -189,17 +189,17 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
private void ListViewItem_Before(object sender, MouseButtonEventArgs e)//前一天
{
Picture.Width = 0;
Sdatepicker.Text = DateTime.Parse(Sdatepicker.Text).AddDays(-1).ToString("yyyy/MM/dd");
Sdatepicker.Text = DateTime.Parse(Sdatepicker.Text).AddDays(-1).ToString("yyyy/M/d HH:mm:ss");
}
private void ListViewItem_Today(object sender, MouseButtonEventArgs e)//今天
{
Picture.Width = 0;
Sdatepicker.Text = DateTime.Now.ToString("yyyy/MM/dd");
Sdatepicker.Text = DateTime.Now.ToString("yyyy/M/d HH:mm:ss");
}
private void ListViewItem_DayAfter(object sender, MouseButtonEventArgs e)//后一天
{
Picture.Width = 0;
Sdatepicker.Text = DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd");
Sdatepicker.Text = DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/M/d HH:mm:ss");
}
private void Sdatepicker_SelectedDateChanged(object sender, SelectionChangedEventArgs e)//时间控件
{