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

添加选择批次号和最终报工,但是确认按钮逻辑没写

Browse Source
master
zhaojian 2 years ago
parent 3498646ef6
commit b0f4d58240
7 changed files with 76 additions and 14 deletions
Show Stats Download Patch File Download Diff File

11
shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs
Unescape Escape View File

@ -187,7 +187,16 @@ where CONVERT(VARCHAR(10), upload_time , 120)= CONVERT(VARCHAR(10), GetDate() ,
}
return null;
}
public DataTable piciGetCostCenter(string workorder)
{
string sql = $" SELECT batch_code FROM pro_order_workorder_batch WHERE workorder_id='{workorder}' AND del_flag='0'";
DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
{
return dtset.Tables[0];
}
return null;
}
public DataTable GetFactoryInfo(string sitecode)
{
string sql = $"select factory_name from sys_factory where factory_code = '{sitecode}'";

4
shangjian/XGLFinishPro/App.config
Unescape Escape View File

@ -10,9 +10,9 @@
<!--车间编码-->
<add key="SiteCode" value="1000" />
<!--设备编码-->
<add key="DeviceCode" value="XL04" />
<add key="DeviceCode" value="XL01" />
<!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房,3:人员登录-->
<add key="ClientMode" value="0" />
<add key="ClientMode" value="1" />
<add key="SerialPort" value="COM5" />

19
shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml
Unescape Escape View File

@ -115,6 +115,7 @@
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Label Grid.ColumnSpan="2" x:Name="lbTitle" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24" Content="报工" FontWeight="Bold"></Label>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="1">
@ -137,12 +138,22 @@
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Margin="15,0,0,0">
<Label Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="24" Content="成本中心："></Label>
<ComboBox x:Name="comboBoxCostCenter" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="24" Width="360" Height="50" Style="{StaticResource ComboBoxStyle}"></ComboBox>
<ComboBox x:Name="comboBoxCostCenter" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="24" Width="360" Height="50" Style="{StaticResource ComboBoxStyle}" SelectionChanged="comboBoxCostCenter_SelectionChanged"></ComboBox>
</StackPanel>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" Margin="15,0,0,0">
<Label Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="24" Content="批 次 号： "></Label>
<ComboBox x:Name="pici" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="24" Margin="2,0,0,0" Width="360" Height="50" Style="{StaticResource ComboBoxStyle}"></ComboBox>
<Label Content="* 注不选批次号默认为该工单报工" Foreground="Red" VerticalAlignment="Center"></Label>
</StackPanel>
<Label x:Name="tbMsg" Width="500" Height="60" Grid.Row="4" Grid.ColumnSpan="2" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" FontSize="18" Foreground="Red" FontWeight="Bold"></Label>
<Button x:Name="btnOK" Grid.Row="5" Grid.Column="0" Width="120" Height="50" Content="确定" Margin="10" Background="#2F82E7" Foreground="White" FontSize="22" FontWeight="Bold" Click="btnOK_Click"/>
<Button x:Name="btnCancel" Grid.Row="5" Grid.Column="1" Width="120" Height="50" Content="取消" Margin="10" FontWeight="Bold" FontSize="22" Click="btnCancel_Click"/>
<Label x:Name="tbMsg" Width="500" Height="60" Grid.Row="5" Grid.ColumnSpan="2" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" FontSize="18" Foreground="Red" FontWeight="Bold"></Label>
<CheckBox Content="最终报工" Height="auto" FontSize="10" Grid.Row="6" IsChecked="False" HorizontalAlignment="Left" VerticalContentAlignment="Center" Name="xuanze9" >
<CheckBox.LayoutTransform >
<ScaleTransform ScaleX="2" ScaleY="2" />
</CheckBox.LayoutTransform>
</CheckBox>
<Button x:Name="btnOK" Grid.Row="6" Grid.Column="0" Width="120" Height="43" Content="确定" Margin="10" Background="#2F82E7" Foreground="White" FontSize="22" FontWeight="Bold" Click="btnOK_Click"/>
<Button x:Name="btnCancel" Grid.Row="6" Grid.Column="1" Width="120" Height="43" Content="取消" Margin="10" FontWeight="Bold" FontSize="22" Click="btnCancel_Click"/>
</Grid>

32
shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml.cs
Unescape Escape View File

@ -14,6 +14,7 @@ using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using Xceed.Wpf.DataGrid;
using XGL.Data;
using XGL.Dats.DBServiceFinishProd;
@ -30,14 +31,16 @@ namespace XGLFinishPro.Views
public string _useMan = "";
public string _costCenter = "";
public string _workQuntity = "";
public string workOrdercode = "";
public ExecReportWorkWin()
{
InitializeComponent();
}
public ExecReportWorkWin(string workOrder, string quantity)
public ExecReportWorkWin(string workOrder, string quantity,string workOrdercode)
{
InitializeComponent();
this.workOrdercode = workOrdercode;
this.lbCurrOrderNo.Content = workOrder;
this.txtQuantity.Text = quantity;
}
@ -117,6 +120,7 @@ namespace XGLFinishPro.Views
private void Window_Loaded(object sender, RoutedEventArgs e)
{
InitComBoboxData();
piciInitComBoboxData();
}
private void txtQuantity_TextChanged(object sender, TextChangedEventArgs e)
@ -183,6 +187,32 @@ namespace XGLFinishPro.Views
comboBoxCostCenter.DisplayMemberPath = "factory_name";
comboBoxCostCenter.SelectedIndex = 0;
}
private void piciInitComBoboxData()
{
DataTable dt = userDbWareHouse.piciGetCostCenter(this.workOrdercode);
if (dt == null)
{
CustomMessageBox.Show("没有找到批次号，请联系管理员！", CustomMessageBoxIcon.Warning);
return;
}
List<string> strings =new List<string>();
foreach (System.Data.DataRow row in dt.Rows)
{
strings.Add(row[0].ToString());
}
List<CostCenter> listCostCenter = Utils.ToDataList<CostCenter>(dt);
//comboDryRoomInfo.SelectedValuePath = "quipName";
//comboDryRoomInfo.DisplayMemberPath = "quipCode";
//comboDryRoomInfo.ItemsSource = listEquip;
//绑定
pici.ItemsSource = strings;
}
private void comboBoxCostCenter_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
}
}
public class CostCenter
{

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

@ -436,10 +436,11 @@
<DataGridTextColumn Width="250" Header="工单/SFC" Binding="{Binding workorder_id}" Visibility="Collapsed"/>
<DataGridTextColumn Width="300" Header="工单/SFC" Binding="{Binding workorder_code}" />
<!--<DataGridTextColumn Width="120" Header="RFID" Binding="{Binding rfid}"/>-->
<DataGridTextColumn Width="400" Header="产品名称" Binding="{Binding product_name}" />
<DataGridTextColumn Width="250" Header="产品型号" Binding="{Binding product_code}" />
<DataGridTextColumn Width="480" Header="产品名称" Binding="{Binding product_name}" />
<DataGridTextColumn Width="380" Header="批次号" Binding="{Binding batch_code}" />
<DataGridTextColumn Width="100" Header="数量" Binding="{Binding quantity_split}" />
<DataGridTextColumn Width="250" Header="计划时间" Binding="{Binding plan_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" />
<DataGridTextColumn Width="60" Header="状态" Binding="{Binding status,Converter={StaticResource MyConverter}}" >
<!--<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
@ -450,8 +451,10 @@
<!--<DataGridTextColumn Width="140" Header="工单完成数" Binding="{Binding attr1}" />
<DataGridTextColumn Width="180" Header="当前机台完成数" Binding="{Binding totalCount}" />-->
<DataGridTextColumn Width="180" Header="班次" Binding="{Binding shift_desc}" />
<DataGridTextColumn Width="180" Header="批次号" Binding="{Binding batch_code}" />
<DataGridTextColumn Width="250" Header="产品编码" Binding="{Binding product_code}" />
<DataGridTextColumn Width="180" Header="批次数量" Binding="{Binding batch_quantity}" />
<DataGridTextColumn Width="180" Header="工单code" Visibility="Hidden" Binding="{Binding workorder_id}" />
<DataGridTextColumn Width="250" Header="计划时间" Binding="{Binding plan_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}}"/>-->

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

@ -460,7 +460,7 @@ namespace XGLFinishPro.Views
}
ExecReportWorkWin execReport = new ExecReportWorkWin(selectedRow["workorder_code"].ToString(), selectedRow["quantity_split"].ToString());
ExecReportWorkWin execReport = new ExecReportWorkWin(selectedRow["workorder_code"].ToString(), selectedRow["quantity_split"].ToString(), selectedRow["workorder_id"].ToString());
if (execReport.ShowDialog() == true)
{
@ -592,6 +592,14 @@ namespace XGLFinishPro.Views
return true;
}
private void DatePicker_SelectedDateChanged(object sender, SelectionChangedEventArgs e)
{
if (sender is DatePicker datePicker)
{
DateTime selectedDate = datePicker.SelectedDate ?? DateTime.MinValue;
}
}
}
public class ReportWork
{

3
shangjian/XGLFinishPro/Views/LanJu_User.xaml.cs
Unescape Escape View File

@ -88,7 +88,8 @@ namespace XGLFinishPro.Views
if (isSucc)
{
CustomMessageBox.Show("打卡成功，祝您工作愉快！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
txtOnWorkUserID.Text = "";
txtOnWorkUserID.Focus();
Now_Click(null, null);
}
else {

Write Preview
Loading…
Cancel
Save