liulb
/
AUCMA_SCADA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 成品下线质检页面

Browse Source
dev
liuwf 1 year ago
parent d0f6e4134d
commit 5f018c793c
5 changed files with 80 additions and 71 deletions
Show Stats Download Patch File Download Diff File

33
Aucma.Core.ProductOffLine/Models/SelectQualityModel.cs
Unescape Escape View File

@ -0,0 +1,33 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Aucma.Core.ProductOffLine.Models
{
public class SelectQualityModel
{
/// <summary>
/// 序号
/// </summary>
public int No { get; set; }
/// <summary>
/// 物料成品主键
/// </summary>
public int ObjId { get; set; }
/// <summary>
/// 物料编号
/// </summary>
public string? MaterialCode { get; set; }
/// <summary>
/// 物料名称
/// </summary>
public string? MaterialName { get; set; }
/// <summary>
/// 货道编号
/// </summary>
public string? SpaceCode { get; set; }
}
}

53
Aucma.Core.ProductOffLine/ViewModels/SelectQualityViewModel.cs
Unescape Escape View File

@ -9,10 +9,14 @@ using NPOI.SS.Formula.Functions;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
@ -23,6 +27,7 @@ namespace Aucma.Core.ProductOffLine.ViewModels
public ICommand QueryCommand { get; set; }
public ICommand SaveCommand { get; set; }
private readonly IBaseMaterialInfoServices? _baseMaterialInfoServices;
public SelectQualityViewModel() {
_baseMaterialInfoServices = App.ServiceProvider.GetService<IBaseMaterialInfoServices>();
@ -33,60 +38,20 @@ namespace Aucma.Core.ProductOffLine.ViewModels
/// <summary>
/// 3.查询BASE_MATERIALINFO表存在的成品类型以供修改
/// </summary>
public void Init()
public void Init()
{
ExecuteQuery();
}
private async void ExecuteQuery()
{
MaterialDataGrid.Clear();
// 处理查询按钮点击事件
// 1.先查出BASE_MATERIALINFO中存在但BASE_SPACEINFO不存在的成品类型(说明该类型未分配货道)
List<BaseMaterialInfo> materialInfoList = await _baseMaterialInfoServices.query();
int count = 0;
Application.Current.Dispatcher.Invoke(() =>
{
foreach (BaseMaterialInfo materialInfo in materialInfoList)
{
MaterialDataGrid.Add(new DirectionEditModel() { No = ++count, ObjId = materialInfo.ObjId, MaterialCode = materialInfo.MaterialCode, MaterialName = materialInfo.MaterialName, SpaceCode = materialInfo.InboundDirection });
}
});
}
private async void ExecuteSave()
{
List<BaseMaterialInfo> list = new List<BaseMaterialInfo>();
// 处理保存按钮点击事件
foreach (DirectionEditModel item in MaterialDataGrid)
{
if ((!"A".Equals(item.SpaceCode) && !"B".Equals(item.SpaceCode)))
{
MessageBox.Show("产品编号:" + item.MaterialCode + " 产品型号:" + item.MaterialName + " 入库方向必须为A或B");
return;
}
list.Add(new BaseMaterialInfo()
{
ObjId = item.ObjId,
MaterialCode = item.MaterialCode,
MaterialName = item.MaterialName,
InboundDirection = item.SpaceCode,
MaterialType = "FERT"
});
}
bool result = await _baseMaterialInfoServices.UpdateAsync(list);
if(result)
{
MessageBox.Show("保存成功");
}
else
{
MessageBox.Show("保存失败");
}
}
#region 初始化datagrid
private ObservableCollection<DirectionEditModel> materialDataGrid = new ObservableCollection<DirectionEditModel>();
public ObservableCollection<DirectionEditModel> MaterialDataGrid
@ -100,6 +65,6 @@ namespace Aucma.Core.ProductOffLine.ViewModels
}
#endregion
}
}

34
Aucma.Core.ProductOffLine/Views/QualityPageView.xaml
Unescape Escape View File

@ -31,7 +31,7 @@
</Grid.RowDefinitions>
<Grid Grid.Row="0">
<Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
<TextBlock Text="分垛配置" FontSize="20" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="基本配置" FontSize="20" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
</Grid>
<Grid Grid.Row="1">
@ -49,6 +49,7 @@
</WrapPanel>
</Border>
<Button Content="自动方向设置" Command="{Binding AutoDirectionCommand}" Margin="100,0,0,0" Background="Blue" Foreground="White" />
<Button Content="质检项设置" Command="{Binding SelectQualityCommand}" Background="Blue" Foreground="White" Width="120" VerticalAlignment="Top" HorizontalAlignment="Left"/>
</WrapPanel>
</Grid>
<Grid Grid.Row="2">
@ -57,7 +58,36 @@
</Border>
</Grid>
<Grid Grid.Row="3">
<Button Content="质检项设置" Command="{Binding SelectQualityCommand}" Background="Blue" Foreground="White" Width="120" VerticalAlignment="Top" HorizontalAlignment="Left"/>
<DataGrid Name="dataGrid" ItemsSource="{Binding MaterialDataGrid}" Background="Transparent"
FontSize="15" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False"
Foreground="#FFFFFF" SelectedItem="{Binding SelectedDataItem}" >
<!-- 表头剧中-->
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center">
</Setter>
<Setter Property="Background" Value="Transparent" />
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.CellStyle>
<Style TargetType="DataGridCell">
<Setter Property="HorizontalAlignment" Value="Center"/>
</Style>
</DataGrid.CellStyle>
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding No}" Header="序号" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding MaterialCode}" Header="产品条码" Width="2*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding MaterialCode}" Header="产品名称" Width="2*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding MaterialCode}" Header="内胆预装检漏" Width="2*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding MaterialName}" Header="成品检漏" Width="2*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding SpaceCode}" Header="终检" Width="*"/>
</DataGrid.Columns>
</DataGrid>
</Grid>
</Grid>

27
Aucma.Core.ProductOffLine/Views/SelectQualityView.xaml
Unescape Escape View File

@ -27,32 +27,13 @@
</StackPanel>
<!--计划列表-->
<Border Grid.Row="1" BorderBrush="#1254AB" BorderThickness="3" CornerRadius="5" Background="Transparent" Margin="1,1,5,5" Grid.ColumnSpan="2">
<DataGrid Name="dataGrid" ItemsSource="{Binding MaterialDataGrid}" Background="Transparent"
<DataGrid x:Name="dataShow" ItemsSource="{Binding Items}" AutoGenerateColumns="False" Background="Transparent"
FontSize="15" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
RowHeight="31" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False"
Foreground="#FFFFFF" SelectedItem="{Binding SelectedDataItem}">
<!-- 表头剧中-->
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center">
</Setter>
<Setter Property="Background" Value="Transparent" />
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.CellStyle>
<Style TargetType="DataGridCell">
<Setter Property="HorizontalAlignment" Value="Center"/>
</Style>
</DataGrid.CellStyle>
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding No}" Header="序号" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding MaterialCode}" Header="产品编号" Width="2*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding MaterialName}" Header="产品型号" Width="2*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding SpaceCode}" Header="入库方向" Width="*"/>
</DataGrid.Columns>
Foreground="#FFFFFF">
</DataGrid>
</Border>

4
Aucma.Core.ProductOffLine/Views/StatisticsPageView.xaml
Unescape Escape View File

@ -121,8 +121,8 @@
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding No}" Header="序号" />
<DataGridTextColumn Binding="{Binding ProductPlanCode}" Header="订单号" Width="1*" />
<DataGridTextColumn Binding="{Binding MaterialCode}" Header="物料条码" Width="3*" />
<DataGridTextColumn Binding="{Binding MaterialName}" Header="物料型号" Width="3*" />
<DataGridTextColumn Binding="{Binding MaterialCode}" Header="产品条码" Width="3*" />
<DataGridTextColumn Binding="{Binding MaterialName}" Header="产品型号" Width="3*" />
<DataGridTextColumn Binding="{Binding PlanAmount}" Header="物料编码" Width="3*" />
<DataGridTextColumn Binding="{Binding CompleteAmount}" Header="扫描时间" Width="2*" />
</DataGrid.Columns>

Write Preview
Loading…
Cancel
Save