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

添加开始工单

Browse Source
master
zhaojian 2 years ago
parent 3a067640b4
commit 8fb5c22370
4 changed files with 96 additions and 30 deletions
Show Stats Download Patch File Download Diff File

2
shangjian/XGLFinishPro/LoginPage.xaml
Unescape Escape View File

@ -50,7 +50,7 @@
<TextBox x:Name="username" materialDesign:HintAssist.Hint="账号" Margin="0,5" FontFamily="Champagne &amp; Limousines" FontSize="18"></TextBox> <TextBox x:Name="username" materialDesign:HintAssist.Hint="账号" Margin="0,5" FontFamily="Champagne &amp; Limousines" FontSize="18"></TextBox>
<PasswordBox x:Name="userpwd" materialDesign:HintAssist.Hint="密码" Margin="0,10" FontFamily="Champagne &amp; Limousines" FontSize="18"></PasswordBox> <PasswordBox x:Name="userpwd" materialDesign:HintAssist.Hint="密码" Margin="0,10" FontFamily="Champagne &amp; Limousines" FontSize="18"></PasswordBox>
<ComboBox x:Name="comboBoxTeam" Margin="0,5"/> <!--<ComboBox x:Name="comboBoxTeam" Margin="0,5"/>-->
<ComboBox x:Name="comboBoxShift" Margin="0,5"/> <ComboBox x:Name="comboBoxShift" Margin="0,5"/>
<DatePicker x:Name="datepickerWorkDate" Margin="0,5"/> <DatePicker x:Name="datepickerWorkDate" Margin="0,5"/>
</StackPanel> </StackPanel>

44
shangjian/XGLFinishPro/LoginPage.xaml.cs
Unescape Escape View File

@ -41,7 +41,7 @@ namespace XGLFinishPro
//Main mainWindow = new Main(); //Main mainWindow = new Main();
//mainWindow.Show(); //mainWindow.Show();
InitVersion(); InitVersion();
InitTeamInfo(); //InitTeamInfo();
InitShiftInfo(); InitShiftInfo();
} }
@ -64,22 +64,22 @@ namespace XGLFinishPro
comboBoxShift.DisplayMemberPath = "shift_desc"; comboBoxShift.DisplayMemberPath = "shift_desc";
} }
private void InitTeamInfo() //private void InitTeamInfo()
{ //{
DataTable dt = formingMachineService.GetTeamList(); // DataTable dt = formingMachineService.GetTeamList();
if (dt == null) // if (dt == null)
{ // {
CustomMessageBox.Show("没有查询到班组信息，请联系管理员！", CustomMessageBoxIcon.Warning); // CustomMessageBox.Show("没有查询到班组信息，请联系管理员！", CustomMessageBoxIcon.Warning);
return; // return;
} // }
List<TeamInfoModel> listTeam = Utils.ToDataList<TeamInfoModel>(dt); // List<TeamInfoModel> listTeam = Utils.ToDataList<TeamInfoModel>(dt);
//绑定 // //绑定
comboBoxTeam.ItemsSource = listTeam; // comboBoxTeam.ItemsSource = listTeam;
comboBoxTeam.SelectedValuePath = "team_id"; // comboBoxTeam.SelectedValuePath = "team_id";
comboBoxTeam.DisplayMemberPath = "team_desc"; // comboBoxTeam.DisplayMemberPath = "team_desc";
} //}
private void InitVersion() private void InitVersion()
{ {
@ -99,12 +99,12 @@ namespace XGLFinishPro
//this.dldh.IsActive = true;//遮罩层可见 //this.dldh.IsActive = true;//遮罩层可见
this.dldh.Visibility = Visibility.Visible;//遮罩层可见 this.dldh.Visibility = Visibility.Visible;//遮罩层可见
zzdl.Visibility = Visibility.Visible; zzdl.Visibility = Visibility.Visible;
if (comboBoxTeam.SelectedValue == null || string.IsNullOrEmpty(comboBoxTeam.SelectedValue.ToString())) //if (comboBoxTeam.SelectedValue == null || string.IsNullOrEmpty(comboBoxTeam.SelectedValue.ToString()))
{ //{
CustomMessageBox.Show("登录失败，请选择班组", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Error); // CustomMessageBox.Show("登录失败，请选择班组", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Error);
comboBoxTeam.Focus(); // comboBoxTeam.Focus();
return; // return;
} //}
if (comboBoxShift.SelectedValue == null || string.IsNullOrEmpty(comboBoxShift.SelectedValue.ToString())) if (comboBoxShift.SelectedValue == null || string.IsNullOrEmpty(comboBoxShift.SelectedValue.ToString()))
{ {
CustomMessageBox.Show("登录失败，请选择班次", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Error); CustomMessageBox.Show("登录失败，请选择班次", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Error);
@ -124,7 +124,7 @@ namespace XGLFinishPro
username = username.Text.Trim(), username = username.Text.Trim(),
pwd = userpwd.Password.Trim(), pwd = userpwd.Password.Trim(),
IsChecked = rememberpwd.IsChecked, IsChecked = rememberpwd.IsChecked,
teamID = comboBoxTeam.SelectedValue.ToString(), //teamID = comboBoxTeam.SelectedValue.ToString(),
shiftID = comboBoxShift.SelectedValue.ToString(), shiftID = comboBoxShift.SelectedValue.ToString(),
workDate = datepickerWorkDate.Text, workDate = datepickerWorkDate.Text,
startTime = lst.Shift_Start_Time, startTime = lst.Shift_Start_Time,

33
shangjian/XGLFinishPro/Views/LanJu_Operator.xaml
Unescape Escape View File

@ -193,6 +193,27 @@
Grid.Row="0" Grid.Row="0"
Grid.Column="0" Grid.Column="0"
Height="90"> Height="90">
<Button
x:Name="btnPause1"
Click="btnPause1_Click"
Style="{StaticResource btnKey}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="#2B7EE6">
<Button.Content>
<TextBlock
VerticalAlignment="Center"
FontSize="20"
Foreground="White"
Text="开始工单" />
</Button.Content>
</Button>
</StackPanel>
<StackPanel
Background="#F2F3F5"
Grid.Row="0"
Grid.Column="1"
Height="90">
<Button <Button
x:Name="btnPause" x:Name="btnPause"
Click="btnPause_Click" Click="btnPause_Click"
@ -212,7 +233,7 @@
<StackPanel <StackPanel
Background="#F2F3F5" Background="#F2F3F5"
Grid.Row="0" Grid.Row="0"
Grid.Column="1" Grid.Column="2"
Height="90"> Height="90">
<Button x:Name="btnRecover" <Button x:Name="btnRecover"
Style="{StaticResource btnKey}" Style="{StaticResource btnKey}"
@ -231,7 +252,7 @@
<StackPanel <StackPanel
Background="#F2F3F5" Background="#F2F3F5"
Grid.Row="0" Grid.Row="0"
Grid.Column="2" Grid.Column="3"
Height="90"> Height="90">
<Button <Button
Style="{StaticResource btnKey}" Style="{StaticResource btnKey}"
@ -251,7 +272,7 @@
<StackPanel <StackPanel
Background="#F2F3F5" Background="#F2F3F5"
Grid.Row="0" Grid.Row="0"
Grid.Column="3" Grid.Column="4"
Height="90"> Height="90">
<Button <Button
Style="{StaticResource btnKey}" Style="{StaticResource btnKey}"
@ -271,7 +292,7 @@
<StackPanel <StackPanel
Background="#F2F3F5" Background="#F2F3F5"
Grid.Row="0" Grid.Row="0"
Grid.Column="4" Grid.Column="5"
> >
<Button <Button
Style="{StaticResource btnKey}" Style="{StaticResource btnKey}"
@ -344,7 +365,7 @@
<StackPanel <StackPanel
Background="#F2F3F5" Background="#F2F3F5"
Grid.Row="0" Grid.Row="0"
Grid.Column="6" Grid.Column="7"
> >
<Button <Button
x:Name="btnRefresh" x:Name="btnRefresh"
@ -360,7 +381,7 @@
<StackPanel <StackPanel
Background="#F2F3F5" Background="#F2F3F5"
Grid.Row="0" Grid.Row="0"
Grid.Column="5" Grid.Column="6"
Height="90" Visibility="Visible"> Height="90" Visibility="Visible">
<Button Style="{StaticResource btnKey}" <Button Style="{StaticResource btnKey}"
x:Name="btnComplete" x:Name="btnComplete"

47
shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs
Unescape Escape View File

@ -11,6 +11,7 @@ using XGL.Data.DBService;
using XGL.Dats.DBServiceFinishProd; using XGL.Dats.DBServiceFinishProd;
using XGL.Models.Model.FoamingMac; using XGL.Models.Model.FoamingMac;
using XGL.Models.Model.OrderPrepare; using XGL.Models.Model.OrderPrepare;
using XGL.Thrift;
namespace XGLFinishPro.Views namespace XGLFinishPro.Views
@ -97,13 +98,14 @@ namespace XGLFinishPro.Views
timerDeciveState.Interval = Utils.GetAppSetting("GetDeviceStateInterval") == "" ? 15000 : Convert.ToInt32(Utils.GetAppSetting("GetDeviceStateInterval")); timerDeciveState.Interval = Utils.GetAppSetting("GetDeviceStateInterval") == "" ? 15000 : Convert.ToInt32(Utils.GetAppSetting("GetDeviceStateInterval"));
timerDeciveState.Elapsed += TimerDeciveState_Elapsed; timerDeciveState.Elapsed += TimerDeciveState_Elapsed;
timerDeciveState.Start(); timerDeciveState.Start();
Complete_Click(null,null);
GetWorkOrderInfo(); GetWorkOrderInfo();
} }
string isbaiye; string isbaiye;
string plantime; string plantime;
private void TimerDeciveState_Elapsed(object sender, ElapsedEventArgs e) private void TimerDeciveState_Elapsed(object sender, ElapsedEventArgs e)
{ {
if (Utils.isAnyBodyPerating) return; //if (Utils.isAnyBodyPerating) return;
try try
{ {
List<FoamingMacModel> orderList = new List<FoamingMacModel>(); List<FoamingMacModel> orderList = new List<FoamingMacModel>();
@ -423,6 +425,10 @@ namespace XGLFinishPro.Views
string newReportCode = ""; string newReportCode = "";
DataTable dtNewReportCode = formingMachineService.GetReportCode(); DataTable dtNewReportCode = formingMachineService.GetReportCode();
if (dtNewReportCode == null || dtNewReportCode.Rows.Count == 0) if (dtNewReportCode == null || dtNewReportCode.Rows.Count == 0)
{
newReportCode = DateTime.Now.ToString("yyyyMMdd")+"0001";
}
else
{ {
newReportCode = (Convert.ToInt64(dtNewReportCode.Rows[0]["report_code"].ToString()) + 1).ToString(); newReportCode = (Convert.ToInt64(dtNewReportCode.Rows[0]["report_code"].ToString()) + 1).ToString();
} }
@ -505,6 +511,45 @@ namespace XGLFinishPro.Views
HBLogWin HFPlcWin = new HBLogWin(); HBLogWin HFPlcWin = new HBLogWin();
HFPlcWin.ShowDialog(); HFPlcWin.ShowDialog();
} }
private void btnPause1_Click(object sender, RoutedEventArgs e)
{
CheckUserWin checkUserWin = new CheckUserWin();
checkUserWin.ShowDialog();
if (!checkUserWin.loginFlag)
{
CustomMessageBox.Show("请先校验用户！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
return;
}
if (dgWorkOrderInfo.SelectedItems.Count == 0)
{
CustomMessageBox.Show("请选择要开始的工单！", CustomMessageBoxIcon.Warning);
return;
}
string workorderID = (dgWorkOrderInfo.SelectedItem as DataRowView)["workorder_id"].ToString();
string status = (dgWorkOrderInfo.SelectedItem as DataRowView)["status"].ToString();
if (!status.Equals("w1"))
{
if (status != "")
{
CustomMessageBox.Show("该工单不符合条件，请选择其他的工单！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
return;
}
}
//更新工单状态
var updatestatus = userDbWareHouse.UpdateSycnFlag(workorderID);
if (!updatestatus)
{
CustomMessageBox.Show("开始工单失败！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
}
else
{
TimerDeciveState_Elapsed(null,null);
}
}
} }
public class ReportWork public class ReportWork
{ {

Write Preview
Loading…
Cancel
Save