Yangwl
/
lanju-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加关闭工单按钮

Browse Source
master
zhaojian 11 months ago
parent 53b1e21447
commit d9f18a2636
4 changed files with 187 additions and 4 deletions
Show Stats Download Patch File Download Diff File

13
shangjian/XGL.Data/DBService/FormingMachineService.cs
Unescape Escape View File

@ -64,6 +64,8 @@ namespace XGL.Data.DBService
ord.route_code,
ord.attr1,
ord.shift_id,
ord.start_work_time,
ord.end_work_time,
shift.Shift_Desc,'0' as totalCount
FROM
pro_order_workorder ord WITH (NOLOCK)
@ -1189,7 +1191,16 @@ where machine_code = 'X1' and bind_status = '0' order by update_time DESC";
}
return reportList;
}
public int uporderstarttime(string id)
{
string sql = $@"update [dbo].[pro_order_workorder] set start_work_time='{DateTime.Now}' where workorder_id='{id}'";
return Utils.netClientDBHelper.executeUpdate(sql);
}
public int uporderendtime(string id)
{
string sql = $@"update [dbo].[pro_order_workorder] set end_work_time='{DateTime.Now}' where workorder_id='{id}'";
return Utils.netClientDBHelper.executeUpdate(sql);
}
public int EditReport(report report)
{
string sql = $@"update [dbo].[mes_report] set team='{report.team}',OpenLineCheckBox='{report.OpenLineCheckBox}',ReplaceLineCheckBox='{report.ReplaceLineCheckBox}',unqualified='{report.unqualified}',clear='{report.clear}',residue='{report.residue}',lineClear='{report.lineClear}',UserKnow='{report.UserKnow}',qualified='{report.qualified}',equipStatus='{report.equipStatus}',StampCorrect='{report.StampCorrect}',isClear='{report.isClear}',positionCorrect='{report.positionCorrect}',isLineClear='{report.isLineClear}' where Id='{report.Id}'";

2
shangjian/XGL.Model/Model/FoamingMac/FoamingMacModel.cs
Unescape Escape View File

@ -34,5 +34,7 @@ namespace XGL.Models.Model.FoamingMac
public string totalCount { get; set; }
public string isbai { get; set;}
public string shift_id { get; set; }
public DateTime start_work_time { get; set; }
public DateTime end_work_time { get; set; }
}
}

35
shangjian/XGL/Views/LanJu_Operator.xaml
Unescape Escape View File

@ -443,6 +443,37 @@ Background="#F2F3F5"
Click="jilu_Click" Content="记录"></Button>
</StackPanel>
<StackPanel
Grid.Row="0"
Grid.Column="8"
>
<Button
x:Name="start"
Visibility="Collapsed"
Style="{StaticResource btnKey}"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Background="#2B7EE6"
FontSize="20"
Foreground="White"
Click="start_Click" Content="开始"></Button>
</StackPanel>
<StackPanel
Grid.Row="0"
Grid.Column="8"
>
<Button
x:Name="end"
Margin="0,3,0,0"
Visibility="Collapsed"
Style="{StaticResource btnKey}"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Background="#2B7EE6"
FontSize="20"
Foreground="White"
Click="end_Click" Content="结束"></Button>
</StackPanel>
<StackPanel
Grid.Row="0"
Grid.Column="9"
>
@ -474,7 +505,7 @@ Background="#F2F3F5"
CellStyle="{StaticResource CustomCellStyle}"
HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True"
AutoGenerateColumns="False" CanUserAddRows="False" SelectionChanged="dgWorkOrderInfo_SelectionChanged">
AutoGenerateColumns="False" CanUserAddRows="False" SelectionChanged="dgWorkOrderInfo_SelectionChanged">
<DataGrid.ColumnHeaderStyle >
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center" />
@ -509,6 +540,8 @@ Background="#F2F3F5"
<DataGridTextColumn Width="140" Header="工单完成数" Binding="{Binding attr1}" />
<DataGridTextColumn Width="180" Header="当前机台完成数" Binding="{Binding totalCount}" />
<DataGridTextColumn Width="180" Header="班次" Binding="{Binding shift_id}" />
<DataGridTextColumn Width="250" Header="开始时间" Binding="{Binding start_work_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" />
<DataGridTextColumn Width="250" Header="结束时间" Binding="{Binding end_work_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" />
<!--<DataGridTextColumn Width="340" Header="流转码" Binding="{Binding work_batch_code}" />-->
<!--<DataGridTextColumn Width="60" Header="出入" Binding="{Binding taskcode,Converter={StaticResource TaskCodeConverter}}"/>-->

141
shangjian/XGL/Views/LanJu_Operator.xaml.cs
Unescape Escape View File

@ -50,8 +50,6 @@ namespace XGL.Views
}
public void WindowChange(WindowID windowID)
{
Window1.Content = frame;
@ -206,6 +204,8 @@ namespace XGL.Views
order.attr1 = i["attr1"].ToString();
order.shift_id = i["Shift_Desc"].ToString();
order.totalCount = i["totalCount"].ToString();
order.start_work_time = Convert.ToDateTime(i["start_work_time"].ToString());
order.end_work_time = Convert.ToDateTime(i["end_work_time"].ToString());
//if (isbaiye=="5")
//{
// order.isbai = "白班";
@ -335,6 +335,14 @@ namespace XGL.Views
order.attr1 = i["attr1"].ToString();
order.totalCount = i["totalCount"].ToString();
order.shift_id = i["Shift_Desc"].ToString();
if (i["start_work_time"] != DBNull.Value && !string.IsNullOrEmpty(i["start_work_time"].ToString()))
{
order.start_work_time = Convert.ToDateTime(i["start_work_time"].ToString());
}
if (i["end_work_time"] != DBNull.Value && !string.IsNullOrEmpty(i["end_work_time"].ToString()))
{
order.end_work_time = Convert.ToDateTime(i["end_work_time"].ToString());
}
orderList.Add(order);
}
@ -558,6 +566,24 @@ VALUES
return;
}
_workOrderCode = (dgWorkOrderInfo.SelectedItem as FoamingMacModel).workorder_code;
if ((dgWorkOrderInfo.SelectedItem as FoamingMacModel).start_work_time == DateTime.MinValue&&
(dgWorkOrderInfo.SelectedItem as FoamingMacModel).end_work_time == DateTime.MinValue)
{
start.Visibility = Visibility.Visible;
end.Visibility = Visibility.Collapsed;
}
else if((dgWorkOrderInfo.SelectedItem as FoamingMacModel).start_work_time != DateTime.MinValue &&
(dgWorkOrderInfo.SelectedItem as FoamingMacModel).end_work_time != DateTime.MinValue)
{
start.Visibility = Visibility.Collapsed;
end.Visibility = Visibility.Collapsed;
}
else
{
start.Visibility = Visibility.Collapsed;
end.Visibility = Visibility.Visible;
}
InOut_Click(null,null);
}
@ -628,5 +654,116 @@ VALUES
{
new ReportForm().ShowDialog(); ;
}
private void start_Click(object sender, RoutedEventArgs e)
{
List<FoamingMacModel> orderList = new List<FoamingMacModel>();
var sele = dgWorkOrderInfo.SelectedItem as FoamingMacModel;
if (sele != null)
{
var result = MessageBox.Show("确定要开始该工单吗?", "确认", MessageBoxButton.YesNo, MessageBoxImage.Question);
if (result == MessageBoxResult.Yes)
{
var aaa= formingMachineService.uporderstarttime(sele.workorder_id);
if (aaa>0)
{
start.Visibility = Visibility.Collapsed;
end.Visibility = Visibility.Visible;
MessageBox.Show("工单已开始");
DataTable dt = formingMachineService.GetFormingMachineInfo(deviceCode, LoginUser.WorkDate);
if (dt == null) return;
foreach (DataRow i in dt.Rows)
{
FoamingMacModel order = new FoamingMacModel();
order.workorder_id = i["workorder_id"].ToString();
order.workorder_code = i["workorder_code"].ToString();
order.product_name = i["product_name"].ToString();
order.product_code = i["product_code"].ToString();
order.car_num = Convert.ToInt32(i["car_num"].ToString());
order.plan_time = Convert.ToDateTime(i["plan_time"].ToString());
order.status = i["status"].ToString();
order.process_id = i["route_code"].ToString();
order.attr1 = i["attr1"].ToString();
order.totalCount = i["totalCount"].ToString();
order.shift_id = i["Shift_Desc"].ToString();
if (i["start_work_time"] != DBNull.Value && !string.IsNullOrEmpty(i["start_work_time"].ToString()))
{
order.start_work_time = Convert.ToDateTime(i["start_work_time"].ToString());
}
if (i["end_work_time"] != DBNull.Value && !string.IsNullOrEmpty(i["end_work_time"].ToString()))
{
order.end_work_time = Convert.ToDateTime(i["end_work_time"].ToString());
}
orderList.Add(order);
}
this.dgWorkOrderInfo.ItemsSource = null;
this.dgWorkOrderInfo.ItemsSource = orderList;//dt.DefaultView;
}
else
{
MessageBox.Show("失败");
}
}
}
}
private void end_Click(object sender, RoutedEventArgs e)
{
List<FoamingMacModel> orderList = new List<FoamingMacModel>();
var sele = dgWorkOrderInfo.SelectedItem as FoamingMacModel;
if (sele != null)
{
var result = MessageBox.Show("确定要结束该工单吗?", "确认", MessageBoxButton.YesNo, MessageBoxImage.Question);
if (result == MessageBoxResult.Yes)
{
var aaa= formingMachineService.uporderendtime(sele.workorder_id);
if (aaa > 0)
{
start.Visibility = Visibility.Collapsed;
end.Visibility = Visibility.Collapsed;
MessageBox.Show("工单已结束");
DataTable dt = formingMachineService.GetFormingMachineInfo(deviceCode, LoginUser.WorkDate);
if (dt == null) return;
foreach (DataRow i in dt.Rows)
{
FoamingMacModel order = new FoamingMacModel();
order.workorder_id = i["workorder_id"].ToString();
order.workorder_code = i["workorder_code"].ToString();
order.product_name = i["product_name"].ToString();
order.product_code = i["product_code"].ToString();
order.car_num = Convert.ToInt32(i["car_num"].ToString());
order.plan_time = Convert.ToDateTime(i["plan_time"].ToString());
order.status = i["status"].ToString();
order.process_id = i["route_code"].ToString();
order.attr1 = i["attr1"].ToString();
order.totalCount = i["totalCount"].ToString();
order.shift_id = i["Shift_Desc"].ToString();
if (i["start_work_time"] != DBNull.Value && !string.IsNullOrEmpty(i["start_work_time"].ToString()))
{
order.start_work_time = Convert.ToDateTime(i["start_work_time"].ToString());
}
if (i["end_work_time"] != DBNull.Value && !string.IsNullOrEmpty(i["end_work_time"].ToString()))
{
order.end_work_time = Convert.ToDateTime(i["end_work_time"].ToString());
}
orderList.Add(order);
}
this.dgWorkOrderInfo.ItemsSource = null;
this.dgWorkOrderInfo.ItemsSource = orderList;//dt.DefaultView;
}
else
{
MessageBox.Show("失败");
}
}
}
}
}
}

Write Preview
Loading…
Cancel
Save