辅助人员

master
1 year ago
parent dfe109eb44
commit 21f8c47d48

@ -642,8 +642,8 @@ VALUES
([id], [report_type], [report_code], [workorder_code], [product_code], [product_name], ([id], [report_type], [report_code], [workorder_code], [product_code], [product_name],
[spec], [unit], [quantity], [quantity_feedback], [quantity_qualified], [quantity_unqualified], [spec], [unit], [quantity], [quantity_feedback], [quantity_qualified], [quantity_unqualified],
[user_name], [nick_name], [feedback_channel], [feedback_time], [record_user], [status], [user_name], [nick_name], [feedback_channel], [feedback_time], [record_user], [status],
[reason], [work_time], [machine_code], [machine_name], [team_code], [shift_code], [remark], [work_time], [machine_code], [machine_name], [team_code], [shift_code],
[attr1], [attr2], [attr3], [attr4], [create_by], [create_time], [reason], [attr2], [attr3], [attr4], [create_by], [create_time],
[update_time], [update_by], [upload_status], [upload_msg], [prod_type], [update_time], [update_by], [upload_status], [upload_msg], [prod_type],
[use_man], [work_center],[del_flag],[batch],[end_report],[parent_order],[IP],[version]) [use_man], [work_center],[del_flag],[batch],[end_report],[parent_order],[IP],[version])
VALUES VALUES
@ -1451,7 +1451,7 @@ where machine_code = 'X1' and bind_status = '0' order by update_time DESC";
string sql = $@"select * from [dbo].[mes_table_self] where line_code='{lineCode}' and check_date='{checkDate}' and report_name='{reprot_name}'"; string sql = $@"select * from [dbo].[mes_table_self] where line_code='{lineCode}' and check_date='{checkDate}' and report_name='{reprot_name}'";
if (!string.IsNullOrEmpty(productCode)) if (!string.IsNullOrEmpty(productCode))
{ {
sql+= $@" and product_code='{productCode}'"; sql += $@" and product_name='{productCode}'";
} }
DataSet ds = Utils.netClientDBHelper.getDataSet(sql); DataSet ds = Utils.netClientDBHelper.getDataSet(sql);
if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0) if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
@ -1473,13 +1473,13 @@ where machine_code = 'X1' and bind_status = '0' order by update_time DESC";
update_time = dr["update_time"].ToString(), update_time = dr["update_time"].ToString(),
factory_code = dr["factory_code"].ToString(), factory_code = dr["factory_code"].ToString(),
del_flag = dr["del_flag"].ToString(), del_flag = dr["del_flag"].ToString(),
report_name=dr["report_name"].ToString(), report_name = dr["report_name"].ToString(),
}; };
} }
return null; return null;
} }
public List<MesTableSelfDetialModel> GetMesTableSelfDetial(string id,int count) public List<MesTableSelfDetialModel> GetMesTableSelfDetial(string id, int count)
{ {
string sql = $@"select * from [dbo].[mes_table_self_detial] where belong_to='{id}'"; string sql = $@"select * from [dbo].[mes_table_self_detial] where belong_to='{id}'";
DataSet ds = Utils.netClientDBHelper.getDataSet(sql); DataSet ds = Utils.netClientDBHelper.getDataSet(sql);
@ -1513,11 +1513,11 @@ where machine_code = 'X1' and bind_status = '0' order by update_time DESC";
table_line = dable_line, table_line = dable_line,
}); });
} }
list=list.OrderByDescending(t => t.table_line).ToList(); list = list.OrderByDescending(t => t.table_line).ToList();
var distinctList = list.OrderByDescending(t => t.table_line).Select(t => t.table_line).Distinct().ToList(); var distinctList = list.OrderByDescending(t => t.table_line).Select(t => t.table_line).Distinct().ToList();
for (int i = 0; i < distinctList.Count; i++) for (int i = 0; i < distinctList.Count; i++)
{ {
list.Where(t=>t.table_line==distinctList[i]).ToList().ForEach(t => list.Where(t => t.table_line == distinctList[i]).ToList().ForEach(t =>
{ {
t.index = i; t.index = i;
}); });
@ -1560,7 +1560,7 @@ where machine_code = 'X1' and bind_status = '0' order by update_time DESC";
public void UpdateMesTableSelf(string id, string text, string text1) public void UpdateMesTableSelf(string id, string text, string text1)
{ {
string sql= $@"update [dbo].[mes_table_self] set bz='{text}',create_by='{text1}' where id='{id}'"; string sql = $@"update [dbo].[mes_table_self] set bz='{text}',create_by='{text1}' where id='{id}'";
Utils.netClientDBHelper.executeUpdate(sql); Utils.netClientDBHelper.executeUpdate(sql);
} }
@ -1579,10 +1579,10 @@ where machine_code = 'X1' and bind_status = '0' order by update_time DESC";
return list; return list;
} }
public int InsertMesUnitPriceReport(string user_name, string nick_name, string post, string gs, string kk, string remark, string deviceCode) public int InsertMesUnitPriceReport(string user_name, string nick_name, string post, string gs, string kk, string remark, string deviceCode, string product_code, string product_name, string childprocess_code, string childprocess_name, string workorder_code, string workorder_code_sap, string workDate, string attr1)
{ {
string sql = $@"insert into mes_unitprice_report (id,user_name,nick_name,create_time,line_code,post,kk,attr2,remark) string sql = $@"insert into mes_unitprice_report (id,workorder_code,workorder_code_sap,product_name,product_code,childprocess_code,childprocess_name,user_name,nick_name,create_time,line_code,post,kk,attr2,remark,work_order_product_date,attr1)
values ('{Guid.NewGuid().ToString().Substring(0,32)}','{user_name}','{nick_name}',GetDate(),'{deviceCode}','{post}',{kk},'{gs}','{remark}')"; values ('{Guid.NewGuid().ToString().Substring(0, 32)}','{workorder_code}','{workorder_code_sap}','{product_name}','{product_code}','{childprocess_code}','{childprocess_name}','{user_name}','{nick_name}',GetDate(),'{deviceCode}','{post}',{kk},'{gs}','{remark}','{workDate}','{attr1}')";
return Utils.netClientDBHelper.executeUpdate(sql); return Utils.netClientDBHelper.executeUpdate(sql);
} }
} }

@ -317,12 +317,12 @@ namespace XGLFinishPro
{ {
} }
private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{ {
this.DragMove();//窗体可移动 this.DragMove();//窗体可移动
} }
/// <summary> /// <summary>
/// 更新按钮 /// 更新按钮
/// </summary> /// </summary>

@ -0,0 +1,6 @@
namespace XGLFinishPro
{
internal class ReprotPageSelect
{
}
}

@ -24,6 +24,8 @@
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Text="辅助人员数据输入" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.ColumnSpan="2" FontSize="25"/> <TextBlock Text="辅助人员数据输入" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.ColumnSpan="2" FontSize="25"/>
<TextBlock Text="姓名:" Grid.Column="0" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="25"/> <TextBlock Text="姓名:" Grid.Column="0" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="25"/>
@ -31,13 +33,17 @@
VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="25"/> VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="25"/>
<TextBlock Text="岗位:" Grid.Column="0" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="25"/> <TextBlock Text="岗位:" Grid.Column="0" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="25"/>
<TextBlock x:Name="Position" Grid.Column="1" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="25"/> <TextBlock x:Name="Position" Grid.Column="1" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="25"/>
<TextBlock Text="工时:" Grid.Column="0" Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="25"/> <TextBlock Text="订单编号:" Grid.Column="0" Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="25"/>
<TextBox x:Name="HourlyWage" Grid.Column="1" Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Left" Width="300" Height="50" FontSize="25"/> <TextBlock x:Name="OrderNumber" Grid.Column="1" Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="25"/>
<TextBlock Text="扣款:" Grid.Column="0" Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="25"/> <TextBlock Text="产品名称:" Grid.Column="0" Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="25"/>
<TextBox x:Name="Deduction" Grid.Column="1" Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Left" Width="300" Height="50" FontSize="25"/> <TextBlock x:Name="ProductName" Grid.Column="1" Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="25"/>
<TextBlock Text="备注信息:" Grid.Column="0" Grid.Row="5" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="25"/> <TextBlock Text="工时:" Grid.Column="0" Grid.Row="5" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="25"/>
<TextBox x:Name="Description" Grid.Column="1" Grid.Row="5" VerticalAlignment="Center" HorizontalAlignment="Left" Width="300" Height="50" FontSize="25"/> <TextBox x:Name="HourlyWage" Grid.Column="1" Grid.Row="5" VerticalAlignment="Center" HorizontalAlignment="Left" Width="300" FontSize="25"/>
<StackPanel Orientation="Horizontal" Grid.Row="6" Grid.ColumnSpan="2" HorizontalAlignment="Center"> <TextBlock Text="扣款:" Grid.Column="0" Grid.Row="6" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="25"/>
<TextBox x:Name="Deduction" Grid.Column="1" Grid.Row="6" VerticalAlignment="Center" HorizontalAlignment="Left" Width="300" FontSize="25"/>
<TextBlock Text="备注信息:" Grid.Column="0" Grid.Row="7" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="25"/>
<TextBox x:Name="Description" Grid.Column="1" Grid.Row="7" VerticalAlignment="Center" HorizontalAlignment="Left" Width="300" FontSize="25"/>
<StackPanel Orientation="Horizontal" Grid.Row="8" Grid.ColumnSpan="2" HorizontalAlignment="Center">
<Button x:Name="AddButton" Grid.Column="0" Grid.Row="6" Content="保存" VerticalAlignment="Center" Background="#2B7EE6" Foreground="White" HorizontalAlignment="Center" Width="100" Height="65" FontSize="25" Click="AddButton_Click"/> <Button x:Name="AddButton" Grid.Column="0" Grid.Row="6" Content="保存" VerticalAlignment="Center" Background="#2B7EE6" Foreground="White" HorizontalAlignment="Center" Width="100" Height="65" FontSize="25" Click="AddButton_Click"/>
<Button x:Name="CancelButton" Grid.Column="1" Grid.Row="6" Content="取消" VerticalAlignment="Center" Background="#2B7EE6" Foreground="White" HorizontalAlignment="Center" Width="100" Height="65" FontSize="25" Margin="100,0,0,0" Click="CancelButton_Click"/> <Button x:Name="CancelButton" Grid.Column="1" Grid.Row="6" Content="取消" VerticalAlignment="Center" Background="#2B7EE6" Foreground="White" HorizontalAlignment="Center" Width="100" Height="65" FontSize="25" Margin="100,0,0,0" Click="CancelButton_Click"/>
</StackPanel> </StackPanel>

@ -1,4 +1,5 @@
using CommonFunc.Tools; using CommonFunc;
using CommonFunc.Tools;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -29,11 +30,28 @@ namespace XGLFinishPro.Views
userDB usdb = new userDB(); userDB usdb = new userDB();
private List<sys_user> userList = new List<sys_user>(); private List<sys_user> userList = new List<sys_user>();
private readonly sys_user user; private readonly sys_user user;
private string childprocess_code;
public AuxiliaryPersonnel(sys_user user) private string childprocess_name;
private string workorder_code_sap;
private string product_code;
private string product_name;
private string workorder_code;
private string line_code;
private string attr1;
public AuxiliaryPersonnel(sys_user user, string childprocess_code, string childprocess_name, string workorder_code, string workorder_code_sap, string product_code, string product_name, string line_code, string attr1)
{ {
InitializeComponent(); InitializeComponent();
this.user = user; this.user = user;
this.workorder_code = workorder_code;
this.childprocess_code = childprocess_code;
this.childprocess_name = childprocess_name;
this.workorder_code_sap = workorder_code_sap;
this.product_code = product_code;
this.product_name = product_name;
this.line_code = line_code;
this.OrderNumber.Text = workorder_code;
this.ProductName.Text = product_name;
this.attr1 = attr1;
} }
private void Window_Loaded(object sender, RoutedEventArgs e) private void Window_Loaded(object sender, RoutedEventArgs e)
@ -44,11 +62,21 @@ namespace XGLFinishPro.Views
private void AddButton_Click(object sender, RoutedEventArgs e) private void AddButton_Click(object sender, RoutedEventArgs e)
{ {
int rows = dbService.InsertMesUnitPriceReport(user.user_name, user.nick_name, user.post, this.HourlyWage.Text, this.Deduction.Text, this.Description.Text, Utils.GetAppSetting("DeviceCode")); int rows = dbService.InsertMesUnitPriceReport(user.user_name,
if (rows <= 0) user.nick_name, user.post,
{ this.HourlyWage.Text,
rows = dbService.InsertMesUnitPriceReport(user.user_name, user.nick_name, user.post, this.HourlyWage.Text, this.Deduction.Text, this.Description.Text, Utils.GetAppSetting("DeviceCode")); this.Deduction.Text,
} this.Description.Text,
line_code,
"0000000" + product_code,
product_name,
childprocess_code,
childprocess_name,
workorder_code,
workorder_code_sap,
LoginUser.WorkDate,
attr1
);
if (rows > 0) if (rows > 0)
MessageBox.Show("保存成功!"); MessageBox.Show("保存成功!");
else else

@ -38,16 +38,17 @@ namespace XGLFinishPro.Views
private static double MainLineWidth = 150; private static double MainLineWidth = 150;
private static double MainLineHeight = 50; private static double MainLineHeight = 50;
string deviceCode = Utils.GetAppSetting("DeviceCode"); string deviceCode = Utils.GetAppSetting("DeviceCode");
string productName = string.Empty;
private string product_code = string.Empty; private string product_code = string.Empty;
private readonly List<string> _hours = new List<string>() { "00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23" }; private readonly List<string> _hours = new List<string>() { "00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23" };
private bool isUpdate = false; private bool isUpdate = false;
private readonly List<string> _minutes = new List<string> { "00", "05", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55" }; private readonly List<string> _minutes = new List<string> { "00", "05", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55" };
private string LineStr = ""; private string LineStr = "";
private readonly List<string> teamGroup = new List<string>() { "A", "B", "C", "D", "E", "F" }; private readonly List<string> teamGroup = new List<string>() { "A", "B", "C", "D", "E", "F" };
public LanJu_Check_Report(string date) public LanJu_Check_Report()
{ {
InitializeComponent(); InitializeComponent();
this.date = date; this.date = LoginUser.WorkDate;
} }
private List<ConveterData> list = new List<ConveterData>(); private List<ConveterData> list = new List<ConveterData>();
@ -101,7 +102,10 @@ namespace XGLFinishPro.Views
bz = string.Empty, bz = string.Empty,
report_name = "CheckReport" report_name = "CheckReport"
}; };
dbService.InsertMesTableSelf(mesTableSelf); //if (!string.IsNullOrEmpty(productName))
//{
dbService.InsertMesTableSelf(mesTableSelf);
//}
} }
belong_to = mesTableSelf.id; belong_to = mesTableSelf.id;
@ -654,13 +658,18 @@ namespace XGLFinishPro.Views
FontWeight = FontWeights.Bold, FontWeight = FontWeights.Bold,
}; };
stackPanel.Children.Add(textBlock); stackPanel.Children.Add(textBlock);
textBlock = new TextBlock() var datePicker = new DatePicker()
{ {
Text = date,
FontSize = 18, FontSize = 18,
FontWeight = FontWeights.Bold, FontWeight = FontWeights.Bold,
SelectedDate = DateTime.Parse(date)
}; };
stackPanel.Children.Add(textBlock); datePicker.SelectedDateChanged += (s, e) =>
{
date = ((DatePicker)s).SelectedDate.Value.ToString("yyyy-MM-dd");
LoadData();
};
stackPanel.Children.Add(datePicker);
Grid.SetColumn(stackPanel, 2); Grid.SetColumn(stackPanel, 2);
Grid.SetRow(stackPanel, 1); Grid.SetRow(stackPanel, 1);
this.MainGrid.Children.Add(stackPanel); this.MainGrid.Children.Add(stackPanel);
@ -711,7 +720,7 @@ namespace XGLFinishPro.Views
}; };
textBlock = new TextBlock() textBlock = new TextBlock()
{ {
Text = "班:", Text = "班:",
FontSize = 18, FontSize = 18,
FontWeight = FontWeights.Bold, FontWeight = FontWeights.Bold,
HorizontalAlignment = HorizontalAlignment.Center, HorizontalAlignment = HorizontalAlignment.Center,
@ -821,7 +830,7 @@ namespace XGLFinishPro.Views
} }
} }
mesTableSelf.create_by = LoginUser.UserName; mesTableSelf.create_by = LoginUser.UserName;
dbService.UpdateMesTableSelf(belong_to,"",LoginUser.UserName); dbService.UpdateMesTableSelf(belong_to, "", LoginUser.UserName);
MessageBox.Show("保存成功"); MessageBox.Show("保存成功");
LoadData(); LoadData();
} }

@ -129,7 +129,7 @@
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="0" Grid.Row="2"> <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.Row="2">
<TextBlock Text="产品名称:" Style="{StaticResource TextBlockStyle}"/> <TextBlock Text="产品名称:" Style="{StaticResource TextBlockStyle}"/>
<TextBlock x:Name="ProductName" Style="{StaticResource TextBlockStyle}"/> <ComboBox x:Name="ProductName" DisplayMemberPath="WorkName" Width="400" SelectionChanged="LeftProductName_SelectionChanged"/>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="1"> <StackPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="1">
<TextBlock Text="生成产线:" Style="{StaticResource TextBlockStyle}"/> <TextBlock Text="生成产线:" Style="{StaticResource TextBlockStyle}"/>
@ -141,10 +141,14 @@
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="2" Grid.Row="2"> <StackPanel Orientation="Horizontal" Grid.Column="2" Grid.Row="2">
<TextBlock Text="检查日期:" Style="{StaticResource TextBlockStyle}"/> <TextBlock Text="检查日期:" Style="{StaticResource TextBlockStyle}"/>
<TextBlock x:Name="CheckDate" Style="{StaticResource TextBlockStyle}"/> <DatePicker x:Name="CheckDate" FontSize="20" VerticalAlignment="Center" SelectedDateChanged="LeftCheckDate_SelectedDateChanged_1"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
<Grid x:Name="MainGrid" Grid.Row="1" Margin="10,10,10,0"> <Grid x:Name="MainGrid" Grid.Row="1" Margin="10,10,10,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1467*"/>
<ColumnDefinition Width="413*"/>
</Grid.ColumnDefinitions>
</Grid> </Grid>
<Border BorderThickness="1" Grid.Row="2" BorderBrush="Black" Margin="10,0,10,10" Height="100"> <Border BorderThickness="1" Grid.Row="2" BorderBrush="Black" Margin="10,0,10,10" Height="100">

@ -43,11 +43,10 @@ namespace XGLFinishPro.Views
string deviceCode = Utils.GetAppSetting("DeviceCode"); string deviceCode = Utils.GetAppSetting("DeviceCode");
private string date = string.Empty; private string date = string.Empty;
private string workId = string.Empty; private string workId = string.Empty;
public LanJu_Conversion_Report(string workId, string date) private string productName=string.Empty;
public LanJu_Conversion_Report()
{ {
InitializeComponent(); InitializeComponent();
this.date = date;
this.workId = workId;
} }
private string product_code = string.Empty; private string product_code = string.Empty;
@ -90,8 +89,7 @@ namespace XGLFinishPro.Views
private void MainWindow_OnLoaded(object sender, RoutedEventArgs e) private void MainWindow_OnLoaded(object sender, RoutedEventArgs e)
{ {
this.NickName.Text = LoginUser.UserName; this.NickName.Text = LoginUser.UserName;
this.CheckDate.Text = date; //this.CheckDate.Text = date;
try try
{ {
this.Line.Text = dbService.GetBaseEquipment(Utils.GetAppSetting("DeviceCode")); this.Line.Text = dbService.GetBaseEquipment(Utils.GetAppSetting("DeviceCode"));
@ -99,14 +97,13 @@ namespace XGLFinishPro.Views
DataTable dataTable = dbService.GetProOrderWorkorder(workId); DataTable dataTable = dbService.GetProOrderWorkorder(workId);
if (dataTable != null && dataTable.Rows.Count > 0) if (dataTable != null && dataTable.Rows.Count > 0)
{ {
this.ProductName.Text = dataTable.Rows[0]["product_name"].ToString(); //productName = dataTable.Rows[0]["product_name"].ToString();
product_code = dataTable.Rows[0]["product_code"].ToString(); product_code = dataTable.Rows[0]["product_code"].ToString();
} }
else else
{ {
MessageBox.Show($"当前产线{deviceCode}未查询到订单");
this.Close();
} }
this.CheckDate.SelectedDate = DateTime.Parse(LoginUser.WorkDate);
} }
catch catch
{ {
@ -132,6 +129,10 @@ namespace XGLFinishPro.Views
{ {
comboBox.Width = lineWidth - 10; comboBox.Width = lineWidth - 10;
comboBox.Height = lineHeight - 10; comboBox.Height = lineHeight - 10;
if (string.IsNullOrEmpty(productName))
{
comboBox.IsEnabled = false;
}
} }
} }
}); });
@ -162,14 +163,14 @@ namespace XGLFinishPro.Views
} }
TypeDic = mainTypeDic; TypeDic = mainTypeDic;
mesTableSelf = null; mesTableSelf = null;
mesTableSelf = dbService.GetMesTableSelf(deviceCode, this.ProductName.Text, this.CheckDate.Text, "ConversionReport"); mesTableSelf = dbService.GetMesTableSelf(deviceCode, productName, this.CheckDate.Text, "ConversionReport");
if (mesTableSelf == null) if (mesTableSelf == null)
{ {
mesTableSelf = new MesTableSelf() mesTableSelf = new MesTableSelf()
{ {
id = Guid.NewGuid().ToString(), id = Guid.NewGuid().ToString(),
line_code = deviceCode, line_code = deviceCode,
product_name = this.ProductName.Text, product_name = productName,
check_date = this.CheckDate.Text, check_date = this.CheckDate.Text,
product_code = product_code, product_code = product_code,
factory_code = Utils.GetAppSetting("SiteCode"), factory_code = Utils.GetAppSetting("SiteCode"),
@ -178,7 +179,10 @@ namespace XGLFinishPro.Views
bz = string.Empty, bz = string.Empty,
report_name = "ConversionReport" report_name = "ConversionReport"
}; };
dbService.InsertMesTableSelf(mesTableSelf); if (!string.IsNullOrEmpty(productName))
{
dbService.InsertMesTableSelf(mesTableSelf);
}
} }
belong_to = mesTableSelf.id; belong_to = mesTableSelf.id;
data = dbService.GetMesTableSelfDetial(belong_to, 7); data = dbService.GetMesTableSelfDetial(belong_to, 7);
@ -784,6 +788,44 @@ namespace XGLFinishPro.Views
LoadData(); LoadData();
MessageBox.Show("提交成功"); MessageBox.Show("提交成功");
} }
private void LeftCheckDate_SelectedDateChanged_1(object sender, SelectionChangedEventArgs e)
{
this.date = this.CheckDate.SelectedDate.Value.ToString("yyyy-MM-dd");
DataTable dataTable = dbService.GetProOrderWorkorder(deviceCode, date);
List<OrderWork> orderWorks = new List<OrderWork>();
if (dataTable == null || dataTable.Rows.Count == 0)
{
MessageBox.Show("没有查询到工单信息!");
}
else
{
foreach (DataRow row in dataTable.Rows)
{
orderWorks.Add(new OrderWork()
{
WorkId = row["workorder_id"].ToString(),
WorkName = row["product_name"].ToString(),
});
}
}
this.ProductName.ItemsSource = orderWorks;
this.ProductName.Items.Refresh();
this.workId = string.Empty;
this.productName = string.Empty;
LoadData();
}
private void LeftProductName_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
if (sender is ComboBox comboBox)
{
if (comboBox.SelectedItem is OrderWork orderWork)
{
this.workId = orderWork.WorkId;
this.productName= orderWork.WorkName;
}
}
LoadData();
}
} }
} }

@ -116,9 +116,6 @@
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="2*"/> <RowDefinition Height="2*"/>
@ -143,7 +140,7 @@
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="0" Grid.Row="2"> <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.Row="2">
<TextBlock Text="产品名称:" Style="{StaticResource TextBlockStyle}"/> <TextBlock Text="产品名称:" Style="{StaticResource TextBlockStyle}"/>
<TextBlock x:Name="LeftProductName" Style="{StaticResource TextBlockStyle}"/> <ComboBox x:Name="LeftProductName" DisplayMemberPath="WorkName" Width="400" SelectionChanged="LeftProductName_SelectionChanged"/>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="1"> <StackPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="1">
<TextBlock Text="生成产线:" Style="{StaticResource TextBlockStyle}"/> <TextBlock Text="生成产线:" Style="{StaticResource TextBlockStyle}"/>
@ -155,10 +152,10 @@
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="2" Grid.Row="2"> <StackPanel Orientation="Horizontal" Grid.Column="2" Grid.Row="2">
<TextBlock Text="检查日期:" Style="{StaticResource TextBlockStyle}"/> <TextBlock Text="检查日期:" Style="{StaticResource TextBlockStyle}"/>
<TextBlock x:Name="LeftCheckDate" Width="160" FontSize="20" VerticalAlignment="Center"/> <DatePicker x:Name="LeftCheckDate" FontSize="20" VerticalAlignment="Center" SelectedDateChanged="LeftCheckDate_SelectedDateChanged_1"/>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="3" Grid.Row="1"> <!--<StackPanel Orientation="Horizontal" Grid.Column="3" Grid.Row="1">
<TextBlock Text="生产车间:黑蚊香车间" Style="{StaticResource TextBlockStyle}"/> <TextBlock Text="生产车间:黑蚊香车间" Style="{StaticResource TextBlockStyle}"/>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="3" Grid.Row="2"> <StackPanel Orientation="Horizontal" Grid.Column="3" Grid.Row="2">
@ -176,20 +173,18 @@
<StackPanel Orientation="Horizontal" Grid.Column="5" Grid.Row="2"> <StackPanel Orientation="Horizontal" Grid.Column="5" Grid.Row="2">
<TextBlock Text="检查日期:" Style="{StaticResource TextBlockStyle}"/> <TextBlock Text="检查日期:" Style="{StaticResource TextBlockStyle}"/>
<TextBlock x:Name="RightCheckDate" Style="{StaticResource TextBlockStyle}"/> <TextBlock x:Name="RightCheckDate" Style="{StaticResource TextBlockStyle}"/>
</StackPanel> </StackPanel>-->
</Grid> </Grid>
</Grid> </Grid>
<Grid Grid.Row="1" Margin="10,0,10,0"> <Grid Grid.Row="1" Margin="10,0,10,0" Grid.ColumnSpan="3">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="10"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid Grid.Column="0" x:Name="LeftGrid"> <Grid Grid.Column="0" x:Name="Left">
</Grid> </Grid>
<Grid Grid.Column="2" x:Name="RightGrid"> <Grid Grid.Column="2" x:Name="Right" Visibility="Collapsed">
</Grid> </Grid>
</Grid> </Grid>

@ -39,7 +39,7 @@ namespace XGLFinishPro.Views
private static double MainLineWidth = 80; private static double MainLineWidth = 80;
private static double MainLineHeight = 50; private static double MainLineHeight = 50;
string deviceCode = Utils.GetAppSetting("DeviceCode"); string deviceCode = Utils.GetAppSetting("DeviceCode");
private string LProductName = string.Empty;
private string product_code = string.Empty; private string product_code = string.Empty;
private bool isUpdate = false; private bool isUpdate = false;
private List<string> DefaultTypeDic = new List<string>() { string.Empty, "√", "x" }; private List<string> DefaultTypeDic = new List<string>() { string.Empty, "√", "x" };
@ -49,27 +49,32 @@ namespace XGLFinishPro.Views
private List<ConveterData> list = new List<ConveterData>(); private List<ConveterData> list = new List<ConveterData>();
private readonly List<string> _minutes = new List<string> { "00", "05", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55" }; private readonly List<string> _minutes = new List<string> { "00", "05", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55" };
private readonly string workId = string.Empty; private string workId = string.Empty;
private readonly string date = string.Empty; private string date = string.Empty;
public LanJu_First_Inspection_Reprot(string workId, string date) public LanJu_First_Inspection_Reprot()
{ {
InitializeComponent(); InitializeComponent();
this.workId = workId;
this.date = date;
} }
private void Window_Loaded(object sender, RoutedEventArgs e) private void Window_Loaded(object sender, RoutedEventArgs e)
{ {
try try
{ {
this.RightNickName.Text = LoginUser.UserName; //this.RightNickName.Text = LoginUser.UserName;
this.LeftNickName.Text = LoginUser.UserName; this.LeftNickName.Text = LoginUser.UserName;
this.LeftCheckDate.Text = date; try
this.RightCheckDate.Text = DateTime.Parse(this.LeftCheckDate.Text).AddDays(1).ToString("yyyy/MM/dd"); {
this.LeftCheckDate.SelectedDate = DateTime.Parse(LoginUser.WorkDate);
}
catch
{
}
//this.RightCheckDate.Text = DateTime.Parse(this.LeftCheckDate.Text).AddDays(1).ToString("yyyy/MM/dd");
this.LeftLine.Text = dbService.GetBaseEquipment(Utils.GetAppSetting("DeviceCode")); this.LeftLine.Text = dbService.GetBaseEquipment(Utils.GetAppSetting("DeviceCode"));
this.RightLine.Text = this.LeftLine.Text; //this.RightLine.Text = this.LeftLine.Text;
product_code = string.Empty; product_code = string.Empty;
} }
@ -87,17 +92,16 @@ namespace XGLFinishPro.Views
DataTable dataTable = dbService.GetProOrderWorkorder(workId); DataTable dataTable = dbService.GetProOrderWorkorder(workId);
if (dataTable != null && dataTable.Rows.Count > 0) if (dataTable != null && dataTable.Rows.Count > 0)
{ {
this.LeftProductName.Text = dataTable.Rows[0]["product_name"].ToString(); //LProductName = dataTable.Rows[0]["product_name"].ToString();
this.RightProductName.Text = dataTable.Rows[0]["product_name"].ToString(); //this.RightProductName.Text = dataTable.Rows[0]["product_name"].ToString();
product_code = dataTable.Rows[0]["product_code"].ToString(); product_code = dataTable.Rows[0]["product_code"].ToString();
} }
var leftHearList = dbService.GetSelfCheckInfo("first_inspection_left").OrderBy(t => t.dict_sort).ToList(); var leftHearList = dbService.GetSelfCheckInfo("first_inspection_left").OrderBy(t => t.dict_sort).ToList();
var leftMainList = dbService.GetSelfCheckInfo("first_inspection_left_info").OrderBy(t => t.dict_sort).ToList(); var leftMainList = dbService.GetSelfCheckInfo("first_inspection_left_info").OrderBy(t => t.dict_sort).ToList();
var rightHearList = dbService.GetSelfCheckInfo("first_inspection_right").OrderBy(t => t.dict_sort).ToList(); var rightHearList = dbService.GetSelfCheckInfo("first_inspection_right").OrderBy(t => t.dict_sort).ToList();
var rightMainList = dbService.GetSelfCheckInfo("first_inspection_right_info").OrderBy(t => t.dict_sort).ToList(); var rightMainList = dbService.GetSelfCheckInfo("first_inspection_right_info").OrderBy(t => t.dict_sort).ToList();
GetMesTableSeft(); GetMesTableSeft();
leftData = dbService.GetMesTableSelfDetial(leftbelong_to, 6); leftData = dbService.GetMesTableSelfDetial(leftbelong_to, 6);
rightData = dbService.GetMesTableSelfDetial(rightbelong_to, 6); rightData = dbService.GetMesTableSelfDetial(rightbelong_to, 6);
if (addLine) if (addLine)
@ -214,9 +218,10 @@ namespace XGLFinishPro.Views
var dictionary = mesTableSelfDetialModels.ToDictionary(t => t.index); var dictionary = mesTableSelfDetialModels.ToDictionary(t => t.index);
rightDic.Add(item.info_name, dictionary); rightDic.Add(item.info_name, dictionary);
} }
list.ForEach(t => t.value.Remove(9, 11));
list.ForEach(t => t.value = t.value.Insert(0, "A")); list.ForEach(t => t.value = t.value.Insert(0, "A"));
MakeHeaderData(this.LeftGrid); MakeHeaderData(this.Left);
MakeHeaderData(this.RightGrid); //MakeHeaderData(this.Right);
var leftTypeDic = new Dictionary<string, List<string>>(); var leftTypeDic = new Dictionary<string, List<string>>();
foreach (var item in leftHearList) foreach (var item in leftHearList)
@ -242,55 +247,59 @@ namespace XGLFinishPro.Views
} }
} }
MainValueData(this.LeftGrid, leftHearList, leftDic, leftTypeDic); MainValueData(this.Left, leftHearList, leftDic, leftTypeDic);
MainValueData(this.RightGrid, rightHearList, rightDic, rightTypeDic); //MainValueData(this.Right, rightHearList, rightDic, rightTypeDic);
UpdateUi(this.LeftGrid); UpdateUi(this.Left);
UpdateUi(this.RightGrid); //UpdateUi(this.Right);
isUpdate = false; isUpdate = false;
} }
private void GetMesTableSeft() private void GetMesTableSeft()
{ {
MesTableSelf leftmesTableSelf = dbService.GetMesTableSelf(deviceCode, this.LeftProductName.Text, this.LeftCheckDate.Text, "ConversionReportLeft"); MesTableSelf leftmesTableSelf = dbService.GetMesTableSelf(deviceCode, LProductName, this.LeftCheckDate.Text, "ConversionReportLeft");
if (leftmesTableSelf == null) if (leftmesTableSelf == null)
{ {
leftmesTableSelf = new MesTableSelf() if (!string.IsNullOrEmpty(LProductName))
{ {
id = Guid.NewGuid().ToString(), leftmesTableSelf = new MesTableSelf()
line_code = deviceCode, {
product_name = this.LeftProductName.Text, id = Guid.NewGuid().ToString(),
check_date = this.LeftCheckDate.Text, line_code = deviceCode,
product_code = product_code, product_name = LProductName,
factory_code = Utils.GetAppSetting("SiteCode"), check_date = this.LeftCheckDate.Text,
del_flag = "0", product_code = product_code,
product_date = this.LeftCheckDate.Text, factory_code = Utils.GetAppSetting("SiteCode"),
bz = string.Empty, del_flag = "0",
report_name = "ConversionReportLeft" product_date = this.LeftCheckDate.Text,
}; bz = string.Empty,
report_name = "ConversionReportLeft"
};
}
dbService.InsertMesTableSelf(leftmesTableSelf); dbService.InsertMesTableSelf(leftmesTableSelf);
} }
//7c9070ea-75f9-42ad-bf6b-3638f4745141
leftbelong_to = leftmesTableSelf.id; leftbelong_to = leftmesTableSelf.id;
MesTableSelf rightmesTableSelf = dbService.GetMesTableSelf(deviceCode, this.LeftProductName.Text, this.RightCheckDate.Text, "ConversionReportRight"); //MesTableSelf rightmesTableSelf = dbService.GetMesTableSelf(deviceCode, LProductName, this.RightCheckDate.Text, "ConversionReportRight");
if (rightmesTableSelf == null) //if (rightmesTableSelf == null)
{ //{
rightmesTableSelf = new MesTableSelf() // rightmesTableSelf = new MesTableSelf()
{ // {
id = Guid.NewGuid().ToString(), // id = Guid.NewGuid().ToString(),
line_code = deviceCode, // line_code = deviceCode,
product_name = this.LeftProductName.Text, // product_name = LProductName,
check_date = this.RightCheckDate.Text, // //check_date = this.RightCheckDate.Text,
product_code = product_code, // product_code = product_code,
factory_code = Utils.GetAppSetting("SiteCode"), // factory_code = Utils.GetAppSetting("SiteCode"),
del_flag = "0", // del_flag = "0",
product_date = this.RightCheckDate.Text, // //product_date = this.RightCheckDate.Text,
bz = string.Empty, // bz = string.Empty,
report_name = "ConversionReportRight" // report_name = "ConversionReportRight"
}; // };
dbService.InsertMesTableSelf(rightmesTableSelf); // dbService.InsertMesTableSelf(rightmesTableSelf);
} //}
rightbelong_to = rightmesTableSelf.id; //rightbelong_to = rightmesTableSelf.id;
} }
private void MainValueData(Grid grid, List<BaseDictData> HearListDic, Dictionary<string, Dictionary<int, MesTableSelfDetialModel>> data, Dictionary<string, List<string>> typeList) private void MainValueData(Grid grid, List<BaseDictData> HearListDic, Dictionary<string, Dictionary<int, MesTableSelfDetialModel>> data, Dictionary<string, List<string>> typeList)
@ -392,39 +401,64 @@ namespace XGLFinishPro.Views
{ {
SelectedItem = model.check_result; SelectedItem = model.check_result;
} }
ComboBox comboBox = new ComboBox() if (key.Contains("灌装量"))
{ {
Name = $"{grid.Name}{list.First(t => t.label == key).value}{j}", TextBox textBox = new TextBox()
ItemsSource = hasType ? type : DefaultTypeDic, {
SelectedItem = SelectedItem, Name = $"{grid.Name}{list.First(t => t.label == key).value}{j}",
Width = MainLineWidth, Text = SelectedItem,
Height = MainLineHeight Width = MainLineWidth,
}; Height = MainLineHeight,
comboBox.SelectionChanged += SelectionChanged; VerticalAlignment = VerticalAlignment.Center,
Grid.SetRow(comboBox, i); HorizontalAlignment = HorizontalAlignment.Center,
Grid.SetColumn(comboBox, j); FontSize = 20,
grid.Children.Add(comboBox); TextWrapping = TextWrapping.Wrap,
AcceptsReturn = true,
};
textBox.LostFocus += TextBox_LostFocus;
Grid.SetRow(textBox, i);
Grid.SetColumn(textBox, j);
grid.Children.Add(textBox);
}
else
{
ComboBox comboBox = new ComboBox()
{
Name = $"{grid.Name}{list.First(t => t.label == key).value}{j}",
ItemsSource = hasType ? type : DefaultTypeDic,
SelectedItem = SelectedItem,
Width = MainLineWidth,
Height = MainLineHeight
};
comboBox.SelectionChanged += SelectionChanged;
Grid.SetRow(comboBox, i);
Grid.SetColumn(comboBox, j);
grid.Children.Add(comboBox);
}
} }
} }
} }
List<string> batchCodes = dbService.GetBatchCode(workId); List<string> batchCodes = dbService.GetBatchCode(workId);
foreach (var item in this.LeftGrid.Children) foreach (var item in this.Left.Children)
{ {
if (item is ComboBox box) if (item is ComboBox box)
{ {
if (box.Name.Contains("日期码") || box.Name.Contains("生产批号")) string label = list.Where(t => t.value == box.Name.Substring(0, box.Name.Length - 1).Replace("Left", "").Replace("Right", "")).First().label;
if (label.Contains("日期码") || label.Contains("生产批号"))
{ {
box.ItemsSource = batchCodes; box.ItemsSource = batchCodes;
} }
} }
} }
foreach (var item in this.RightGrid.Children) foreach (var item in this.Right.Children)
{ {
if (item is ComboBox box) if (item is ComboBox box)
{ {
if (box.Name.Contains("日期码") || box.Name.Contains("生产批号")) string v = box.Name.Substring(0, box.Name.Length - 1);
string label = list.Where(t => t.value == box.Name.Substring(0, box.Name.Length - 1).Replace("Left", "").Replace("Right", "")).First().label;
if (label.Contains("日期码") || label.Contains("生产批号"))
{ {
box.ItemsSource = batchCodes; box.ItemsSource = batchCodes;
} }
@ -432,6 +466,37 @@ namespace XGLFinishPro.Views
} }
} }
private void TextBox_LostFocus(object sender, RoutedEventArgs e)
{
try
{
if (isUpdate)
{
return;
}
if (sender is TextBox textBox)
{
string name = textBox.Name.Replace("Left", "").Replace("Right", "");
string index = name.Substring(name.Length - 1, 1);
string key = list.First(t => t.value == name.Substring(0, name.Length - 1)).label;
var mesTableSelfDetialModel = leftData.Where(t => t.info_name == key && t.index == int.Parse(index) - 1).FirstOrDefault();
if (mesTableSelfDetialModel != null)
{
if (string.IsNullOrEmpty(mesTableSelfDetialModel.id))
{
mesTableSelfDetialModel.id = Guid.NewGuid().ToString();
mesTableSelfDetialModel.belong_to = leftbelong_to;
}
mesTableSelfDetialModel.check_result = textBox.Text;
}
}
}
catch
{
}
}
private void UpdateUi(Grid grid) private void UpdateUi(Grid grid)
{ {
Dispatcher.Invoke(() => Dispatcher.Invoke(() =>
@ -448,7 +513,21 @@ namespace XGLFinishPro.Views
{ {
comboBox.Width = lineWidth - 10; comboBox.Width = lineWidth - 10;
comboBox.Height = lineHeight - 10; comboBox.Height = lineHeight - 10;
if (string.IsNullOrEmpty(LProductName))
{
comboBox.IsEnabled = false;
}
} }
if (item is TextBox textBox)
{
textBox.Width = lineWidth - 10;
textBox.Height = lineHeight - 10;
if (string.IsNullOrEmpty(LProductName))
{
textBox.IsReadOnly = false;
}
}
} }
}); });
} }
@ -611,17 +690,15 @@ namespace XGLFinishPro.Views
} }
if (sender is ComboBox comboBox) if (sender is ComboBox comboBox)
{ {
string name = comboBox.Name.Replace(this.LeftGrid.Name, "").Replace(this.RightGrid.Name, ""); string name = comboBox.Name.Replace("Left", "").Replace("Right", "");
string index = name.Substring(name.Length - 1, 1); string index = name.Substring(name.Length - 1, 1);
string key = list.First(t => t.value == name.Substring(0, name.Length - 1)).label;
string Hour = "00"; string Hour = "00";
string Minute = "00"; string Minute = "00";
if (comboBox.Name.Contains("Hour") || comboBox.Name.Contains("Minute")) if (comboBox.Name.Contains("Hour") || comboBox.Name.Contains("Minute"))
{ {
if (comboBox.Name.Contains("Left"))
if (comboBox.Name.Contains(this.LeftGrid.Name))
{ {
foreach (var item in LeftGrid.Children) foreach (var item in Left.Children)
{ {
if (item is StackPanel stackPanel) if (item is StackPanel stackPanel)
{ {
@ -646,9 +723,9 @@ namespace XGLFinishPro.Views
t.check_time_s = Hour + ":" + Minute; t.check_time_s = Hour + ":" + Minute;
}); });
} }
else if (comboBox.Name.Contains(this.RightGrid.Name)) else if (comboBox.Name.Contains("Left"))
{ {
foreach (var item in RightGrid.Children) foreach (var item in Right.Children)
{ {
if (item is StackPanel stackPanel) if (item is StackPanel stackPanel)
{ {
@ -676,7 +753,8 @@ namespace XGLFinishPro.Views
} }
else else
{ {
if (comboBox.Name.Contains(this.LeftGrid.Name)) string key = list.First(t => t.value == name.Substring(0, name.Length - 1)).label;
if (comboBox.Name.Contains("Left"))
{ {
var mesTableSelfDetialModel = leftData.Where(t => t.info_name == key && t.index == int.Parse(index) - 1).FirstOrDefault(); var mesTableSelfDetialModel = leftData.Where(t => t.info_name == key && t.index == int.Parse(index) - 1).FirstOrDefault();
if (mesTableSelfDetialModel != null) if (mesTableSelfDetialModel != null)
@ -690,7 +768,7 @@ namespace XGLFinishPro.Views
} }
string hour = string.Empty; string hour = string.Empty;
string minute = string.Empty; string minute = string.Empty;
foreach (var item in LeftGrid.Children) foreach (var item in Left.Children)
{ {
if (item is StackPanel stackPanel) if (item is StackPanel stackPanel)
{ {
@ -715,7 +793,7 @@ namespace XGLFinishPro.Views
t.check_time_s = hour + ":" + minute; t.check_time_s = hour + ":" + minute;
}); });
} }
else if (comboBox.Name.Contains(this.RightGrid.Name)) else if (comboBox.Name.Contains("Left"))
{ {
var mesTableSelfDetialModel = rightData.Where(t => t.info_name == key && t.index == int.Parse(index)).FirstOrDefault(); var mesTableSelfDetialModel = rightData.Where(t => t.info_name == key && t.index == int.Parse(index)).FirstOrDefault();
if (mesTableSelfDetialModel != null) if (mesTableSelfDetialModel != null)
@ -729,7 +807,7 @@ namespace XGLFinishPro.Views
} }
string hour = string.Empty; string hour = string.Empty;
string minute = string.Empty; string minute = string.Empty;
foreach (var item in LeftGrid.Children) foreach (var item in Left.Children)
{ {
if (item is StackPanel stackPanel) if (item is StackPanel stackPanel)
{ {
@ -838,14 +916,54 @@ namespace XGLFinishPro.Views
this.Close(); this.Close();
} }
private void LeftCheckDate_SelectedDateChanged(object sender, SelectionChangedEventArgs e) //private void LeftCheckDate_SelectedDateChanged(object sender, SelectionChangedEventArgs e)
//{
// if (sender is DatePicker date)
// {
// this.LeftCheckDate.Text = date.SelectedDate.Value.ToString("yyyy/MM/dd");
// //this.RightCheckDate.Text = DateTime.Parse(this.LeftCheckDate.Text).AddDays(1).ToString("yyyy/MM/dd");
// LoadData();
// }
//}
private void LeftCheckDate_SelectedDateChanged_1(object sender, SelectionChangedEventArgs e)
{ {
if (sender is DatePicker date) this.date = this.LeftCheckDate.SelectedDate.Value.ToString("yyyy-MM-dd");
DataTable dataTable = dbService.GetProOrderWorkorder(deviceCode, date);
List<OrderWork> orderWorks = new List<OrderWork>();
if (dataTable == null || dataTable.Rows.Count == 0)
{ {
this.LeftCheckDate.Text = date.SelectedDate.Value.ToString("yyyy/MM/dd"); MessageBox.Show("没有查询到工单信息!");
this.RightCheckDate.Text = DateTime.Parse(this.LeftCheckDate.Text).AddDays(1).ToString("yyyy/MM/dd");
LoadData();
} }
else
{
foreach (DataRow row in dataTable.Rows)
{
orderWorks.Add(new OrderWork()
{
WorkId = row["workorder_id"].ToString(),
WorkName = row["product_name"].ToString(),
});
}
}
this.LeftProductName.ItemsSource = orderWorks;
this.LeftProductName.Items.Refresh();
this.workId = string.Empty;
this.LProductName = string.Empty;
LoadData();
}
private void LeftProductName_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
if (sender is ComboBox comboBox)
{
if (comboBox.SelectedItem is OrderWork orderWork)
{
this.workId = orderWork.WorkId;
this.LProductName = orderWork.WorkName;
}
}
LoadData();
} }
} }
} }

@ -492,6 +492,7 @@ Background="#F2F3F5"
> >
<Button <Button
Style="{StaticResource btnKey}" Style="{StaticResource btnKey}"
Visibility="Collapsed"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="#2B7EE6" Background="#2B7EE6"

@ -977,7 +977,7 @@ namespace XGLFinishPro.Views
{ {
//先判断是否为管理人员 //先判断是否为管理人员
var sys_users = usdb.GetUserList(LoginUser.UserId); var sys_users = usdb.GetUserList(LoginUser.UserId);
if (sys_users.Count == 0 || sys_users[0].user_m_type == null || sys_users[0].user_m_type.ToUpper() != "g") if (sys_users.Count == 0 || sys_users[0].user_m_type == null || sys_users[0].user_m_type.ToLower() != "g")
{ {
CustomMessageBox.Show("你不是管理人员,无权操作!", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning); CustomMessageBox.Show("你不是管理人员,无权操作!", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
return; return;

@ -37,10 +37,12 @@
<TextBlock Text="类型:" VerticalAlignment="Center" Margin="10,0,0,0"/> <TextBlock Text="类型:" VerticalAlignment="Center" Margin="10,0,0,0"/>
<ComboBox x:Name="UserType" VerticalAlignment="Center" Width="150" hc:InfoElement.ShowClearButton="True"> <ComboBox x:Name="UserType" VerticalAlignment="Center" Width="150" hc:InfoElement.ShowClearButton="True">
<ComboBoxItem Content="辅助人员"/> <ComboBoxItem Content="辅助人员"/>
<ComboBoxItem Content="一线员工"/> <ComboBoxItem Content="管理人员"/>
<ComboBoxItem Content="其他"/>
</ComboBox> </ComboBox>
<Button x:Name="QueryBtn" Style="{StaticResource ButtonPrimary}" Background="#2B7EE6" Foreground="White" Content="查询" Click="QueryBtn_Click"/> <Button x:Name="QueryBtn" Style="{StaticResource ButtonPrimary}" Background="#2B7EE6" Foreground="White" Content="查询" Click="QueryBtn_Click"/>
<Button x:Name="AddBtn" Style="{StaticResource ButtonPrimary}" Background="#2B7EE6" Foreground="White" Content="计件信息填写" Margin="10,0,0,0" Click="AddBtn_Click"/> <Button x:Name="AddBtn" Style="{StaticResource ButtonPrimary}" Background="#2B7EE6" Foreground="White" Content="计件信息填写" Margin="10,0,0,0" Click="AddBtn_Click"/>
<Button Style="{StaticResource ButtonPrimary}" Background="#2B7EE6" Foreground="White" Content="关闭" Margin="10,0,0,0" Click="Button_Click"/>
</StackPanel> </StackPanel>
<DataGrid <DataGrid
Style="{StaticResource DataGridStyle}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Style="{StaticResource DataGridStyle}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"

@ -22,24 +22,24 @@ namespace XGLFinishPro.Views
/// </summary> /// </summary>
public partial class PersonView : Window public partial class PersonView : Window
{ {
public PersonView()
{
InitializeComponent();
}
private int PageIndex = 0; private int PageIndex = 0;
private int PageSize = 10; private int PageSize = 10;
private int PageMax = 0; private int PageMax = 0;
userDB usdb = new userDB(); userDB usdb = new userDB();
FormingMachineService formingMachineService = new FormingMachineService(); FormingMachineService formingMachineService = new FormingMachineService();
List<sys_user> users; List<sys_user> users;
public PersonView()
{
InitializeComponent();
}
private void QueryBtn_Click(object sender, RoutedEventArgs e) private void QueryBtn_Click(object sender, RoutedEventArgs e)
{ {
PageIndex = 0; PageIndex = 0;
GetData(); GetDataFZ();
} }
private void GetData() private void GetDataFZ()
{ {
string type = ""; string type = "";
if (this.UserType.SelectionBoxItem != null && this.UserType.SelectionBoxItem.ToString() == "辅助人员") if (this.UserType.SelectionBoxItem != null && this.UserType.SelectionBoxItem.ToString() == "辅助人员")
@ -50,6 +50,10 @@ namespace XGLFinishPro.Views
{ {
type = "g"; type = "g";
} }
else
{
type = "";
}
users = usdb.GetUsers(this.RealName.Text, type, PageIndex, PageSize); users = usdb.GetUsers(this.RealName.Text, type, PageIndex, PageSize);
users.ForEach(t => users.ForEach(t =>
{ {
@ -62,7 +66,7 @@ namespace XGLFinishPro.Views
private void Window_Loaded(object sender, RoutedEventArgs e) private void Window_Loaded(object sender, RoutedEventArgs e)
{ {
GetData(); GetDataFZ();
} }
private void LastPage_Click(object sender, RoutedEventArgs e) private void LastPage_Click(object sender, RoutedEventArgs e)
@ -73,7 +77,7 @@ namespace XGLFinishPro.Views
this.LastPage.IsEnabled = false; this.LastPage.IsEnabled = false;
} }
this.NextPage.IsEnabled = true; this.NextPage.IsEnabled = true;
GetData(); GetDataFZ();
} }
private void NextPage_Click(object sender, RoutedEventArgs e) private void NextPage_Click(object sender, RoutedEventArgs e)
@ -84,15 +88,20 @@ namespace XGLFinishPro.Views
this.NextPage.IsEnabled = false; this.NextPage.IsEnabled = false;
} }
this.LastPage.IsEnabled = true; this.LastPage.IsEnabled = true;
GetData(); GetDataFZ();
} }
private void AddBtn_Click(object sender, RoutedEventArgs e) private void AddBtn_Click(object sender, RoutedEventArgs e)
{ {
if(this.MainGrid.SelectedItem is sys_user user) if(this.MainGrid.SelectedItem is sys_user user)
{ {
new AuxiliaryPersonnel(user).ShowDialog(); //new AuxiliaryPersonnel(user).ShowDialog();
} }
} }
private void Button_Click(object sender, RoutedEventArgs e)
{
this.Close();
}
} }
} }

@ -4,16 +4,16 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:XGLFinishPro.Views" xmlns:local="clr-namespace:XGLFinishPro.Views"
xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:hc="https://handyorg.github.io/handycontrol"
mc:Ignorable="d" mc:Ignorable="d"
Title="计件薪资" Height="800" Width="1200" WindowStartupLocation="CenterScreen" WindowStyle="None" Loaded="Window_Loaded" Closing="Window_Closing"> Title="计件薪资" Height="800" Width="1200" WindowStartupLocation="CenterScreen" WindowStyle="None" Loaded="Window_Loaded" Closing="Window_Closing">
<Window.Resources> <Window.Resources>
<SolidColorBrush x:Key="EvenRowBackground" Color="#E0E0E0"/> <SolidColorBrush x:Key="EvenRowBackground" Color="#E0E0E0"/>
<SolidColorBrush x:Key="OddRowBackground" Color="#FFFFFF"/> <SolidColorBrush x:Key="OddRowBackground" Color="#FFFFFF"/>
<Style x:Key="DataGridTextCenterColumnStyle" TargetType="DataGridCell" BasedOn="{StaticResource DataGridCellStyle}"> <!--<Style x:Key="DataGridTextCenterColumnStyle" TargetType="DataGridCell" BasedOn="{StaticResource DataGridCellStyle}">
<Setter Property="HorizontalContentAlignment" Value="Center"/> <Setter Property="HorizontalContentAlignment" Value="Center"/>
</Style> </Style>-->
<Style x:Key="ColumnHeaderGripperStyle" TargetType="DataGridColumnHeader"/> <Style x:Key="ColumnHeaderGripperStyle" TargetType="DataGridColumnHeader"/>
<Style x:Key="DataGridRowStyle" TargetType="DataGridRow"> <Style x:Key="DataGridRowStyle" TargetType="DataGridRow">
@ -357,8 +357,9 @@
<Button x:Name="btnCloseWin" Content="关闭" FontWeight="Bold" Width="100" Height="40" Style="{StaticResource btnKey}" Click="btnCloseWin_Click"/> <Button x:Name="btnCloseWin" Content="关闭" FontWeight="Bold" Width="100" Height="40" Style="{StaticResource btnKey}" Click="btnCloseWin_Click"/>
<CheckBox Content="为所有用户更改" x:Name="alluser" Margin="10,25,0,0"></CheckBox> <CheckBox Content="为所有用户更改" x:Name="alluser" Margin="10,25,0,0"></CheckBox>
</StackPanel> </StackPanel>
<TabControl Grid.Row="1" Grid.Column="0">
<DataGrid <TabItem Header="计件薪酬" IsSelected="True">
<DataGrid
Grid.Row="1" Grid.Column ="0" Grid.Row="1" Grid.Column ="0"
x:Name="dgUserInfo" x:Name="dgUserInfo"
MinWidth="200" MinWidth="200"
@ -376,41 +377,157 @@
VerticalAlignment="Top" VerticalContentAlignment="Center" VerticalAlignment="Top" VerticalContentAlignment="Center"
AutoGenerateColumns="False" CanUserAddRows="False" SelectionMode="Extended" SelectionUnit="FullRow" SelectionChanged="dgUserInfo_SelectionChanged" AutoGenerateColumns="False" CanUserAddRows="False" SelectionMode="Extended" SelectionUnit="FullRow" SelectionChanged="dgUserInfo_SelectionChanged"
CellEditEnding="dgUserInfo_CellEditEnding"> CellEditEnding="dgUserInfo_CellEditEnding">
<DataGrid.ColumnHeaderStyle > <DataGrid.ColumnHeaderStyle >
<Style TargetType="DataGridColumnHeader"> <Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="Height" Value="48" /> <Setter Property="Height" Value="48" />
<Setter Property="FontSize" Value="20" /> <Setter Property="FontSize" Value="20" />
<Setter Property="Foreground" Value="White" /> <Setter Property="Foreground" Value="White" />
<Setter Property="Background" Value="#2B7EE6" /> <Setter Property="Background" Value="#2B7EE6" />
</Style> </Style>
</DataGrid.ColumnHeaderStyle> </DataGrid.ColumnHeaderStyle>
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTemplateColumn Width="50"> <DataGridTemplateColumn Width="50">
<DataGridTemplateColumn.Header> <DataGridTemplateColumn.Header>
<CheckBox x:Name="cb_all" Click="cb_all_Click" HorizontalAlignment="Center" VerticalAlignment="Center" /> <CheckBox x:Name="cb_all" Click="cb_all_Click" HorizontalAlignment="Center" VerticalAlignment="Center" />
</DataGridTemplateColumn.Header> </DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<CheckBox x:Name="cb_child" Click="cb_child_Click" IsChecked="{Binding IsChecked}" HorizontalAlignment="Left" VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="15,0,0,0"/> <CheckBox x:Name="cb_child" Click="cb_child_Click" IsChecked="{Binding IsChecked}" HorizontalAlignment="Left" VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="15,0,0,0"/>
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>
<DataGridTemplateColumn Header="序号" Width="40" MinWidth="10" IsReadOnly="True"> <DataGridTemplateColumn Header="序号" Width="40" MinWidth="10" IsReadOnly="True">
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,0,0,0"/> <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,0,0,0"/>
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>
<DataGridTextColumn Width="130*" Header="编码" IsReadOnly="true" Binding="{Binding user_name}"/> <DataGridTextColumn Width="130*" Header="编码" IsReadOnly="true" Binding="{Binding user_name}"/>
<DataGridTextColumn Width="150*" Header="名称" IsReadOnly="true" Binding="{Binding nick_name}"/> <DataGridTextColumn Width="150*" Header="名称" IsReadOnly="true" Binding="{Binding nick_name}"/>
<DataGridTextColumn Width="190*" Header="岗位" IsReadOnly="true" Binding="{Binding post}"/> <DataGridTextColumn Width="190*" Header="岗位" IsReadOnly="true" Binding="{Binding post}"/>
<DataGridTextColumn Width="100*" Header="报工数" Binding="{Binding number}"/> <DataGridTextColumn Width="100*" Header="报工数" Binding="{Binding number}"/>
<DataGridTextColumn Width="100*" Header="工时" Binding="{Binding attr2}"/> <DataGridTextColumn Width="100*" Header="工时" Binding="{Binding attr2}"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
</TabItem>
<TabItem Header="辅助人员">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="*"/>
<RowDefinition Height="auto"/>
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" Grid.ColumnSpan="3">
<TextBlock Text="姓名:" VerticalAlignment="Center" Margin="10,0,0,0"/>
<TextBox x:Name="RealName" VerticalAlignment="Center" Width="150"/>
<TextBlock Text="类型:" VerticalAlignment="Center" Margin="10,0,0,0"/>
<ComboBox x:Name="UserType" VerticalAlignment="Center" Width="150" hc:InfoElement.ShowClearButton="True">
<ComboBoxItem Content="辅助人员"/>
<ComboBoxItem Content="管理人员"/>
<ComboBoxItem Content="其他"/>
</ComboBox>
<Button x:Name="QueryBtn" Background="#2B7EE6" Foreground="White" Content="查询" Click="QueryBtn_Click"/>
<Button x:Name="AddBtn" Background="#2B7EE6" Foreground="White" Content="计件信息填写" Margin="10,0,0,0" Click="AddBtn_Click"/>
</StackPanel>
<DataGrid
Grid.Row="1" Grid.Column ="0"
x:Name="MainGrid"
RowStyle="{StaticResource DataGridRowStyle}"
Margin="10,0,0,0"
MaxHeight="400"
AlternationCount="2"
FontSize="18"
LoadingRow="dgWorkOrderInfo_LoadingRow"
HeadersVisibility="Column"
HorizontalAlignment="Left"
VerticalAlignment="Top" VerticalContentAlignment="Center"
AutoGenerateColumns="False" CanUserAddRows="False" SelectionMode="Extended" SelectionUnit="FullRow" SelectionChanged="dgUserInfo_SelectionChanged"
CellEditEnding="dgUserInfo_CellEditEnding" Grid.ColumnSpan="3">
<DataGrid.ColumnHeaderStyle >
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="Height" Value="48" />
<Setter Property="FontSize" Value="20" />
<Setter Property="Foreground" Value="White" />
<Setter Property="Background" Value="#2B7EE6" />
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.Columns>
<DataGridTemplateColumn Width="50">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox x:Name="cb_child" Click="cb_child_Click" IsChecked="{Binding IsChecked}" HorizontalAlignment="Left" VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="15,0,0,0"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTemplateColumn Header="序号" Width="40" MinWidth="10" IsReadOnly="True">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,0,0,0"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTextColumn Width="130*" Header="编码" IsReadOnly="true" Binding="{Binding user_name}"/>
<DataGridTextColumn Width="150*" Header="名称" IsReadOnly="true" Binding="{Binding nick_name}"/>
<DataGridTextColumn Width="190*" Header="岗位" IsReadOnly="true" Binding="{Binding post}"/>
<DataGridTextColumn Width="100*" Header="报工数" Binding="{Binding number}"/>
<DataGridTextColumn Width="100*" Header="工时" Binding="{Binding attr2}"/>
</DataGrid.Columns>
</DataGrid>
<!--<DataGrid
RowStyle="{StaticResource DataGridRowStyle}"
x:Name="MainGrid" Grid.Row="1" hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
CanUserAddRows="False"
CanUserReorderColumns="False"
CanUserResizeColumns="False"
CanUserResizeRows="False"
HeadersVisibility="All" AutoGenerateColumns="False" Grid.ColumnSpan="2">
<DataGrid.Columns>
<DataGridTextColumn Width="130*" Header="编码" IsReadOnly="true" Binding="{Binding user_name}"/>
<DataGridTextColumn Width="150*" Header="名称" IsReadOnly="true" Binding="{Binding nick_name}"/>
<DataGridTextColumn Width="190*" Header="岗位" IsReadOnly="true" Binding="{Binding post}"/>
<DataGridTextColumn Width="100*" Header="报工数" Binding="{Binding number}"/>
<DataGridTextColumn Width="100*" Header="工时" Binding="{Binding attr2}"/>
-->
<!--<DataGridTextColumn Binding="{Binding user_id}" Header="编码" Width="*"/>
<DataGridTextColumn Binding="{Binding nick_name}" Header="名称" Width="*"/>
<DataGridTextColumn Binding="{Binding post}" Header="岗位" Width="*"/>
<DataGridTextColumn Binding="{Binding user_m_type}" Header="人员类型" Width="*"/>-->
<!--
</DataGrid.Columns>
<DataGrid.CellStyle>
<Style TargetType="{x:Type DataGridCell}">
<Setter Property="TextBlock.TextAlignment" Value="Center"/>
<Setter Property="VerticalAlignment" Value="Center"/>
-->
<!--<Setter Property="Margin" Value="5"/>-->
<!--
</Style>
</DataGrid.CellStyle>
<DataGrid.RowHeaderStyle>
<Style TargetType="{x:Type DataGridRowHeader}">
<Setter Property="HorizontalContentAlignment" Value="Center" />
</Style>
</DataGrid.RowHeaderStyle>
<DataGrid.ColumnHeaderStyle>
<Style TargetType="{x:Type DataGridColumnHeader}">
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="Margin" Value="0,0,0,0" />
<Setter Property="BorderThickness" Value="5" />
</Style>
</DataGrid.ColumnHeaderStyle>
</DataGrid>-->
<!--<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Left" Margin="178,5,0,5" Grid.Column="1">
<Button x:Name="LastPage" Style="{StaticResource ButtonPrimary}" IsEnabled="False" Background="#2B7EE6" Foreground="White" Content="上一页" Click="LastPage_Click"/>
<Button x:Name="NextPage" Style="{StaticResource ButtonPrimary}" Background="#2B7EE6" Foreground="White" Content="下一页" Margin="50,0,0,0" Click="NextPage_Click"/>
</StackPanel>-->
</Grid>
</TabItem>
</TabControl>
</Grid> </Grid>
<GroupBox Grid.Row="2" Grid.Column ="0" Grid.ColumnSpan ="2" Header="已分配的数据"> <GroupBox Grid.Row="2" Grid.Column ="0" Grid.ColumnSpan ="2" Header="已分配的数据">
<DataGrid <DataGrid
@ -445,6 +562,7 @@
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>
<DataGridTextColumn Width="0" Binding="{Binding workorder_code}" Visibility="Collapsed"/>
<DataGridTextColumn Width="100" Header="订单编码" Binding="{Binding workorder_code_sap}"/> <DataGridTextColumn Width="100" Header="订单编码" Binding="{Binding workorder_code_sap}"/>
<DataGridTextColumn Width="100" Header="用户编码" Binding="{Binding user_name}"/> <DataGridTextColumn Width="100" Header="用户编码" Binding="{Binding user_name}"/>
<DataGridTextColumn Width="100" Header="用户名称" Binding="{Binding nick_name}"/> <DataGridTextColumn Width="100" Header="用户名称" Binding="{Binding nick_name}"/>

@ -2,12 +2,13 @@
using CommonFunc.Tools; using CommonFunc.Tools;
using HandyControl.Tools.Extension; using HandyControl.Tools.Extension;
using PdfSharpCore;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data; using System.Windows.Data;
@ -17,7 +18,9 @@ using System.Windows.Media;
using System.Windows.Media.Imaging; using System.Windows.Media.Imaging;
using System.Windows.Shapes; using System.Windows.Shapes;
using XGL.Data; using XGL.Data;
using XGL.Data.DBService;
using XGL.Dats.DBServiceFinishProd; using XGL.Dats.DBServiceFinishProd;
using XGL.Models;
using XGL.Models.Model; using XGL.Models.Model;
namespace XGLFinishPro.Views namespace XGLFinishPro.Views
@ -28,15 +31,15 @@ namespace XGLFinishPro.Views
public partial class PieceSalaryCalWin : Window public partial class PieceSalaryCalWin : Window
{ {
FinishProdDBService prodDBService = new FinishProdDBService(); FinishProdDBService prodDBService = new FinishProdDBService();
string _deviceCode = "", _productCode= "",_workOrderCode="",_sapWorkOrderCode="",_productName="", _childprocessCode="", _childprocessName = ""; string _deviceCode = "", _productCode = "", _workOrderCode = "", _sapWorkOrderCode = "", _productName = "", _childprocessCode = "", _childprocessName = "";
string _LineCode = ""; string _LineCode = "";
string number= "0"; string number = "0";
public PieceSalaryCalWin() public PieceSalaryCalWin()
{ {
InitializeComponent(); InitializeComponent();
} }
public PieceSalaryCalWin(string productCode,string productName,string deviceCode,string workOrderCode,string sapWorkOrderCode) public PieceSalaryCalWin(string productCode, string productName, string deviceCode, string workOrderCode, string sapWorkOrderCode)
{ {
InitializeComponent(); InitializeComponent();
_LineCode = deviceCode; _LineCode = deviceCode;
@ -52,7 +55,7 @@ namespace XGLFinishPro.Views
e.Row.Header = (e.Row.GetIndex() + 1).ToString(); e.Row.Header = (e.Row.GetIndex() + 1).ToString();
} }
private void btnConfirm_Click(object sender, RoutedEventArgs e) private void btnConfirm_Click(object sender, RoutedEventArgs e)
{ {
try try
@ -85,9 +88,9 @@ namespace XGLFinishPro.Views
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.instance.log.Error("计件薪酬选择工序时发生异常:"+ex.Message); LogHelper.instance.log.Error("计件薪酬选择工序时发生异常:" + ex.Message);
} }
} }
private void lstSelectedStep_SelectionChanged(object sender, SelectionChangedEventArgs e) private void lstSelectedStep_SelectionChanged(object sender, SelectionChangedEventArgs e)
@ -100,13 +103,13 @@ namespace XGLFinishPro.Views
// _childprocessName = (lstSelectedStep.SelectedItem as ChildProcess).childprocess_name; // _childprocessName = (lstSelectedStep.SelectedItem as ChildProcess).childprocess_name;
//} //}
// DataTable dt = prodDBService.GetUnitPriceInfo(); // DataTable dt = prodDBService.GetUnitPriceInfo();
this.dgUserInfo.ItemsSource = null; this.dgUserInfo.ItemsSource = null;
checkedRowsCache.Clear(); checkedRowsCache.Clear();
//Utils.userList.ForEach(t => t.IsChecked = false); //Utils.userList.ForEach(t => t.IsChecked = false);
OnWorkUserList.ForEach(t => t.IsChecked = false); OnWorkUserList.ForEach(t => t.IsChecked = false);
dataSource = OnWorkUserList;// Utils.userList; dataSource = OnWorkUserList;// Utils.userList;
List<sys_user> usernumbers = new List< sys_user >(); List<sys_user> usernumbers = new List<sys_user>();
// if (dataSource.Count!=0) // if (dataSource.Count!=0)
//{ //{
// string num= prodDBService.GetUsernumbereData(_workOrderCode); // string num= prodDBService.GetUsernumbereData(_workOrderCode);
@ -163,8 +166,8 @@ namespace XGLFinishPro.Views
{ {
} }
} }
//从上下班的名单中找 //从上下班的名单中找
@ -182,24 +185,25 @@ namespace XGLFinishPro.Views
return; return;
} }
_deviceCode = ds.Tables[0].Rows[0][0].ToString(); _deviceCode = ds.Tables[0].Rows[0][0].ToString();
this.dgUserInfo1.ItemsSource = GetStepData(); this.dgUserInfo1.ItemsSource = GetStepData();
GetUserData(); GetUserData();
GetDataFZ();
GetData(); GetData();
} }
private void GetUserData() private void GetUserData()
{ {
OnWorkUserList = prodDBService.GetOnWorkUserList(_LineCode,LoginUser.WorkDate); OnWorkUserList = prodDBService.GetOnWorkUserList(_LineCode, LoginUser.WorkDate);
if (OnWorkUserList == null || OnWorkUserList.Count <= 0) if (OnWorkUserList == null || OnWorkUserList.Count <= 0)
{ {
CustomMessageBox.Show("没有找到上班的人员信息!", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning); CustomMessageBox.Show("没有找到上班的人员信息!", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
return; return;
} }
} }
private void GetData() private void GetData()
{ {
DataTable dt = prodDBService.GetUnitPriceData(_deviceCode ,LoginUser.WorkDate); DataTable dt = prodDBService.GetUnitPriceData(_deviceCode, LoginUser.WorkDate);
if (dt == null) if (dt == null)
{ {
this.dgCreatedUserInfo.ItemsSource = null; this.dgCreatedUserInfo.ItemsSource = null;
@ -208,7 +212,7 @@ namespace XGLFinishPro.Views
{ {
this.dgCreatedUserInfo.ItemsSource = null; this.dgCreatedUserInfo.ItemsSource = null;
this.dgCreatedUserInfo.ItemsSource = dt.DefaultView; this.dgCreatedUserInfo.ItemsSource = dt.DefaultView;
} }
} }
private void btnCloseWin_Click(object sender, RoutedEventArgs e) private void btnCloseWin_Click(object sender, RoutedEventArgs e)
@ -259,7 +263,7 @@ namespace XGLFinishPro.Views
catch (Exception ex) catch (Exception ex)
{ {
} }
} }
/// <summary> /// <summary>
@ -345,21 +349,21 @@ namespace XGLFinishPro.Views
bool isChecked; bool isChecked;
isChecked = cb.IsChecked == true ? true : false; isChecked = cb.IsChecked == true ? true : false;
sys_user curRow = (dgUserInfo.CurrentItem as sys_user); sys_user curRow = (dgUserInfo.CurrentItem as sys_user);
if (isChecked) if (isChecked)
{ {
//this.chkPrintBatch.IsChecked = false; //this.chkPrintBatch.IsChecked = false;
foreach (var item in dgUserInfo.Items) foreach (var item in dgUserInfo.Items)
{ {
// DataGridTemplateColumn templeColumn = dgUserInfo.Columns[0] as DataGridTemplateColumn; // DataGridTemplateColumn templeColumn = dgUserInfo.Columns[0] as DataGridTemplateColumn;
// FrameworkElement fwElement = dgUserInfo.Columns[0].GetCellContent(item); // FrameworkElement fwElement = dgUserInfo.Columns[0].GetCellContent(item);
// CheckBox cBox = templeColumn.CellTemplate.FindName("cb_child", fwElement) as CheckBox; // CheckBox cBox = templeColumn.CellTemplate.FindName("cb_child", fwElement) as CheckBox;
// //循环的行
// //DataRow tempRow = (item as DataRowView).Row;
// cBox.IsChecked = false;
// //循环的行
// //DataRow tempRow = (item as DataRowView).Row;
// cBox.IsChecked = false;
} }
checkedRowsCache.Add(curRow); checkedRowsCache.Add(curRow);
cb.IsChecked = true; cb.IsChecked = true;
@ -402,7 +406,7 @@ namespace XGLFinishPro.Views
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.instance.log.Error("计件薪酬选择工序数据时发生异常:" + ex.Message); LogHelper.instance.log.Error("计件薪酬选择工序数据时发生异常:" + ex.Message);
} }
} }
private void btnQueryUser_Click(object sender, RoutedEventArgs e) private void btnQueryUser_Click(object sender, RoutedEventArgs e)
@ -421,14 +425,13 @@ namespace XGLFinishPro.Views
private void txtP_TextChanged(object sender, TextChangedEventArgs e) private void txtP_TextChanged(object sender, TextChangedEventArgs e)
{ {
btnQueryUser_Click(null,null); btnQueryUser_Click(null, null);
} }
private void btnUserConfirm_Click(object sender, RoutedEventArgs e) private void btnUserConfirm_Click(object sender, RoutedEventArgs e)
{ {
try try
{ {
if (checkedRowsCache.Count == 0) if (checkedRowsCache.Count == 0)
{ {
CustomMessageBox.Show("请选择人员", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning); CustomMessageBox.Show("请选择人员", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
@ -452,7 +455,7 @@ namespace XGLFinishPro.Views
string sapCode = _deviceCode;//ds.Tables[0].Rows[0][0].ToString(); string sapCode = _deviceCode;//ds.Tables[0].Rows[0][0].ToString();
foreach (sys_user item in checkedRowsCache) foreach (sys_user item in checkedRowsCache)
{ {
if (item.number.IsNullOrEmpty()||item.number=="0") if (item.number.IsNullOrEmpty() || item.number == "0")
{ {
item.number = "0"; item.number = "0";
} }
@ -460,7 +463,7 @@ namespace XGLFinishPro.Views
{ {
item.attr2 = "0"; item.attr2 = "0";
} }
string sql = prodDBService.GetCreateUnitPriceInfo(item, _workOrderCode, _sapWorkOrderCode, _productCode, _productName, _childprocessCode, _childprocessName, sapCode, item.number,LoginUser.WorkDate,item.attr2,item.post); string sql = prodDBService.GetCreateUnitPriceInfo(item, _workOrderCode, _sapWorkOrderCode, _productCode, _productName, _childprocessCode, _childprocessName, sapCode, item.number, LoginUser.WorkDate, item.attr2, item.post);
CreateUnitPriceSqlList.Add(sql); CreateUnitPriceSqlList.Add(sql);
} }
//if (!name.IsNullOrEmpty()) //if (!name.IsNullOrEmpty())
@ -494,15 +497,15 @@ namespace XGLFinishPro.Views
else else
{ {
CustomMessageBox.Show("插入失败,请重试!", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning); CustomMessageBox.Show("插入失败,请重试!", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
CustomMessageBox.Show("插入失败:"+ex.Message, CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning); CustomMessageBox.Show("插入失败:" + ex.Message, CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
LogHelper.instance.log.Error("写入计件薪酬数据时发生异常:"+ex.Message); LogHelper.instance.log.Error("写入计件薪酬数据时发生异常:" + ex.Message);
} }
} }
private void btnSelectStep_Click(object sender, RoutedEventArgs e) private void btnSelectStep_Click(object sender, RoutedEventArgs e)
@ -530,7 +533,7 @@ namespace XGLFinishPro.Views
// lstBoxStep.Items.Clear(); // lstBoxStep.Items.Clear();
// lstBoxStep.ItemsSource = list;//dt.DefaultView; // lstBoxStep.ItemsSource = list;//dt.DefaultView;
//} //}
} }
private List<ChildProcess> GetStepData() private List<ChildProcess> GetStepData()
@ -556,7 +559,7 @@ namespace XGLFinishPro.Views
attr1 = TrimTrailingZeros(item["attr1"].ToString()) attr1 = TrimTrailingZeros(item["attr1"].ToString())
}); });
} }
} }
return list; return list;
} }
@ -575,9 +578,104 @@ namespace XGLFinishPro.Views
} }
return input; return input;
} }
private int PageIndex = 0;
private int PageSize = 10;
private int PageMax = 0;
userDB usdb = new userDB();
FormingMachineService formingMachineService = new FormingMachineService();
List<sys_user> users;
private void QueryBtn_Click(object sender, RoutedEventArgs e)
{
PageIndex = 0;
GetDataFZ();
}
private void GetDataFZ()
{
string type = "";
if (this.UserType.SelectionBoxItem != null && this.UserType.SelectionBoxItem.ToString() == "辅助人员")
{
type = "f";
}
else if (this.UserType.SelectionBoxItem != null && this.UserType.SelectionBoxItem.ToString() == "管理人员")
{
type = "g";
}
else
{
type = "";
}
users = usdb.GetUsers(this.RealName.Text, type, 0, 10000);
users.ForEach(t =>
{
t.user_m_type = t.user_m_type == "f" ? "辅助人员" : t.user_m_type == "g" ? "管理人员" : t.user_m_type == "p" ? "一线员工" : "其他";
});
usdb.GetUsersCount(this.RealName.Text, type, out var Count);
PageMax = Count / PageSize + (Count % PageSize > 0 ? 1 : 0);
this.MainGrid.ItemsSource = users;
}
//private void LastPage_Click(object sender, RoutedEventArgs e)
//{
// PageIndex--;
// if (PageIndex == 0)
// {
// this.LastPage.IsEnabled = false;
// }
// this.NextPage.IsEnabled = true;
// GetDataFZ();
//}
//private void NextPage_Click(object sender, RoutedEventArgs e)
//{
// PageIndex++;
// if (PageMax == PageIndex)
// {
// this.NextPage.IsEnabled = false;
// }
// this.LastPage.IsEnabled = true;
// GetDataFZ();
//}
private void AddBtn_Click(object sender, RoutedEventArgs e)
{
var row = dgCreatedUserInfo.SelectedItem as DataRowView;
if (row == null)
{
MessageBox.Show("请选择订单!");
return;
}
string workorder_code = row["workorder_code"].ToString();
//订单编码
string workorder_code_sap = row["workorder_code_sap"].ToString();
//产品编号
string product_code = row["product_code"].ToString();
//产品名称
string product_name = row["product_name"].ToString();
//线体
string line_code = row["line_code"].ToString();
string childprocess_code = row["childprocess_code"].ToString();
string childprocess_name = row["childprocess_name"].ToString();
//报工数量
string attr1 = row["attr1"].ToString();
if (this.MainGrid.SelectedItem is sys_user user)
{
new AuxiliaryPersonnel(user, childprocess_code, childprocess_name, workorder_code, workorder_code_sap, product_code, product_name, line_code, attr1).ShowDialog();
}
else
{
MessageBox.Show("请选择人员!");
}
}
} }
public class ChildProcess public class ChildProcess
{ {
public string childprocess_code { get; set; } public string childprocess_code { get; set; }
public string childprocess_name { get; set; } public string childprocess_name { get; set; }
@ -586,7 +684,7 @@ namespace XGLFinishPro.Views
public class remuneration public class remuneration
{ {
public string workorder_code_sap { get; set; } public string workorder_code_sap { get; set; }
public string nick_name { get; set; } public string nick_name { get; set; }
public DateTime create_time { get; set; } public DateTime create_time { get; set; }

@ -32,29 +32,29 @@ namespace XGLFinishPro.Views
private void Open_ReportForm(object sender, RoutedEventArgs e) private void Open_ReportForm(object sender, RoutedEventArgs e)
{ {
new OrderWorkIdSelect(true).ShowDialog(); //new OrderWorkIdSelect(true).ShowDialog();
if (OrderWorkIdSelect.IsSelect) //if (OrderWorkIdSelect.IsSelect)
{ //{
new LanJu_Check_Report(OrderWorkIdSelect.date).ShowDialog(); new LanJu_Check_Report().ShowDialog();
} //}
} }
private void Open_SelfForm(object sender, RoutedEventArgs e) private void Open_SelfForm(object sender, RoutedEventArgs e)
{ {
new OrderWorkIdSelect().ShowDialog(); //new OrderWorkIdSelect().ShowDialog();
if (OrderWorkIdSelect.IsSelect) //if (OrderWorkIdSelect.IsSelect)
{ //{
new LanJu_Conversion_Report(OrderWorkIdSelect.WorkId, OrderWorkIdSelect.date).ShowDialog(); new LanJu_Conversion_Report().ShowDialog();
} //}
} }
private void Open_FistForm(object sender, RoutedEventArgs e) private void Open_FistForm(object sender, RoutedEventArgs e)
{ {
new OrderWorkIdSelect().ShowDialog(); //new OrderWorkIdSelect().ShowDialog();
if (OrderWorkIdSelect.IsSelect) //if (OrderWorkIdSelect.IsSelect)
{ //{
new LanJu_First_Inspection_Reprot(OrderWorkIdSelect.WorkId, OrderWorkIdSelect.date).ShowDialog(); new LanJu_First_Inspection_Reprot().ShowDialog();
} //}
} }
} }
} }

@ -315,6 +315,7 @@
<Compile Include="FormItem\Main.xaml.cs"> <Compile Include="FormItem\Main.xaml.cs">
<DependentUpon>Main.xaml</DependentUpon> <DependentUpon>Main.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="ReprotPageSelect.cs" />
<Compile Include="snap7.net.cs" /> <Compile Include="snap7.net.cs" />
<Compile Include="Tools\BtnBackGroundColorConverter1.cs" /> <Compile Include="Tools\BtnBackGroundColorConverter1.cs" />
<Compile Include="Tools\BtnBackGroundColorConverter.cs" /> <Compile Include="Tools\BtnBackGroundColorConverter.cs" />

@ -4,9 +4,9 @@
<!--本地的业务数据库--> <!--本地的业务数据库-->
<MESClientConnectionString>vadMWi9D6ZBkwIr78LoLmGwiSCvVnpY3nMB7IyQlxFiV2OD5s5WUgOabwGwWK3THofFvPL2rHpOvJVIvtz0oZU/NFQyT8KQlbk0rHjUXoU7wgRdUumDJ1RrSFmIjPm8S</MESClientConnectionString> <MESClientConnectionString>vadMWi9D6ZBkwIr78LoLmGwiSCvVnpY3nMB7IyQlxFiV2OD5s5WUgOabwGwWK3THofFvPL2rHpOvJVIvtz0oZU/NFQyT8KQlbk0rHjUXoU7wgRdUumDJ1RrSFmIjPm8S</MESClientConnectionString>
<!--榄菊业务数据库--> <!--榄菊业务数据库-->
<!--<MESNetClientConnectionString>vadMWi9D6ZC3usVUY51rbTRH8TjL6CxlHbduXNDkc8suJwqe10me6ktk8XD3QU91A7V9zSnfhmhLWUQKZQdqof6chkC37l6QElb57z876mZdo9764iNmLGULHBiQyMu6PXowBdyaQVt17BPsWFn4EUs7Z7zTZwBP+2iJBVXitA3OF6EZXxAztmeZk/1iCwni+JzeWNpXqeOoGzkmSSzmVQH2Yf9m/mlqag2TbldSCcnUQl6lE7tcGg==</MESNetClientConnectionString>--> <MESNetClientConnectionString>vadMWi9D6ZC3usVUY51rbTRH8TjL6CxlHbduXNDkc8suJwqe10me6ktk8XD3QU91A7V9zSnfhmhLWUQKZQdqof6chkC37l6QElb57z876mZdo9764iNmLGULHBiQyMu6PXowBdyaQVt17BPsWFn4EUs7Z7zTZwBP+2iJBVXitA3OF6EZXxAztmeZk/1iCwni+JzeWNpXqeOoGzkmSSzmVQH2Yf9m/mlqag2TbldSCcnUQl6lE7tcGg==</MESNetClientConnectionString>
<!--榄菊云数据库--> <!--榄菊云数据库-->
<!--<CloudConnectionString>vadMWi9D6ZC3usVUY51rbTRH8TjL6CxlHbduXNDkc8suJwqe10me6ktk8XD3QU91ML11cYCqHcHmTXJFsNQamIbW3UEpkjgNPUcBwRfgP6AWftvk9YFyv7y7/6nzX/c+6z6xMDIdcjYVvfteU+7YtOQhJXTfF5ScosAA0GliBfD8dWAunW+ZCos5LemAj2xb2wvvCxlbnrof8IunWslCaBEAGrdC/KhE0qEfNbxydwc=</CloudConnectionString>--> <CloudConnectionString>vadMWi9D6ZC3usVUY51rbTRH8TjL6CxlHbduXNDkc8suJwqe10me6ktk8XD3QU91ML11cYCqHcHmTXJFsNQamIbW3UEpkjgNPUcBwRfgP6AWftvk9YFyv7y7/6nzX/c+6z6xMDIdcjYVvfteU+7YtOQhJXTfF5ScosAA0GliBfD8dWAunW+ZCos5LemAj2xb2wvvCxlbnrof8IunWslCaBEAGrdC/KhE0qEfNbxydwc=</CloudConnectionString>
@ -14,8 +14,8 @@
<!--本地的业务数据库--> <!--本地的业务数据库-->
<!--<MESClientConnectionString>vadMWi9D6ZBkwIr78LoLmGwiSCvVnpY3nMB7IyQlxFiV2OD5s5WUgOabwGwWK3THofFvPL2rHpOvJVIvtz0oZU/NFQyT8KQlbk0rHjUXoU7wgRdUumDJ1RrSFmIjPm8S</MESClientConnectionString>--> <!--<MESClientConnectionString>vadMWi9D6ZBkwIr78LoLmGwiSCvVnpY3nMB7IyQlxFiV2OD5s5WUgOabwGwWK3THofFvPL2rHpOvJVIvtz0oZU/NFQyT8KQlbk0rHjUXoU7wgRdUumDJ1RrSFmIjPm8S</MESClientConnectionString>-->
<!--榄菊业务数据库--> <!--榄菊业务数据库-->
<MESNetClientConnectionString>vadMWi9D6ZC3usVUY51rbTRH8TjL6CxlF0tM4FO8qPh090fSbocpFrq1jWXNjwNntlKCeRLc6CBQNAw+bzYK+yDKBny3FzdffaiQ/9ohZ/iFw6P/06Dz1d7Q8OX2fGT3YK8v2yeiGlLhRHNGlkzN6Okv9SEccNYXDHZKQND/31n9bbXRhaFERnPoCp+evwBwpKq0nDcp4lLRNDrJpG2b6nw1popy2st0u+eYfbIYddNpj2jZcnrJXg==</MESNetClientConnectionString> <!--<MESNetClientConnectionString>vadMWi9D6ZC3usVUY51rbTRH8TjL6CxlF0tM4FO8qPh090fSbocpFrq1jWXNjwNntlKCeRLc6CBQNAw+bzYK+yDKBny3FzdffaiQ/9ohZ/iFw6P/06Dz1d7Q8OX2fGT3YK8v2yeiGlLhRHNGlkzN6Okv9SEccNYXDHZKQND/31n9bbXRhaFERnPoCp+evwBwpKq0nDcp4lLRNDrJpG2b6nw1popy2st0u+eYfbIYddNpj2jZcnrJXg==</MESNetClientConnectionString>-->
<!--榄菊云数据库--> <!--榄菊云数据库-->
<CloudConnectionString>vadMWi9D6ZC3usVUY51rbTRH8TjL6CxlF0tM4FO8qPh090fSbocpFrq1jWXNjwNnXgKYRJ9zN5r4cTE3Hh+JS6lnhIJQCLO5Tn/1DUIbZe8kwpCPuiyxdQS9ApxjjxU3xmhgbAR3NfwaZV2/zLMECLZyTqYXOHwTHdkzxa9RyCzNcbpiSjkFFOVT9SrfkzeVUA+7kogOazAQ7II0ms/Pnls5vU+gUjP9JcI1Q6esb8M=</CloudConnectionString> <!--<CloudConnectionString>vadMWi9D6ZC3usVUY51rbTRH8TjL6CxlF0tM4FO8qPh090fSbocpFrq1jWXNjwNnXgKYRJ9zN5r4cTE3Hh+JS6lnhIJQCLO5Tn/1DUIbZe8kwpCPuiyxdQS9ApxjjxU3xmhgbAR3NfwaZV2/zLMECLZyTqYXOHwTHdkzxa9RyCzNcbpiSjkFFOVT9SrfkzeVUA+7kogOazAQ7II0ms/Pnls5vU+gUjP9JcI1Q6esb8M=</CloudConnectionString>-->
</ConnectionConfig> </ConnectionConfig>
Loading…
Cancel
Save