|
|
|
@ -1,11 +1,17 @@
|
|
|
|
using Khd.Core.Domain.Models;
|
|
|
|
using Khd.Core.Domain.Models;
|
|
|
|
using Khd.Core.EntityFramework;
|
|
|
|
using Khd.Core.EntityFramework;
|
|
|
|
|
|
|
|
using Khd.Core.Wpf.Scan;
|
|
|
|
using Khd.Core.Wpf.TaskForm.Inventory;
|
|
|
|
using Khd.Core.Wpf.TaskForm.Inventory;
|
|
|
|
|
|
|
|
using Masuit.Tools.Logging;
|
|
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
|
|
using Microsoft.Extensions.Hosting;
|
|
|
|
using Microsoft.Extensions.Hosting;
|
|
|
|
|
|
|
|
using System;
|
|
|
|
using System.Collections.Generic;
|
|
|
|
using System.Collections.Generic;
|
|
|
|
using System.Linq;
|
|
|
|
using System.Linq;
|
|
|
|
|
|
|
|
using System.Threading;
|
|
|
|
using System.Windows;
|
|
|
|
using System.Windows;
|
|
|
|
|
|
|
|
using System.Windows.Controls;
|
|
|
|
|
|
|
|
using System.Windows.Input;
|
|
|
|
|
|
|
|
|
|
|
|
namespace Khd.Core.Wpf.TaskForm
|
|
|
|
namespace Khd.Core.Wpf.TaskForm
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -14,30 +20,79 @@ namespace Khd.Core.Wpf.TaskForm
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
|
public partial class InventoryTaskForm : Window
|
|
|
|
public partial class InventoryTaskForm : Window
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
private readonly IHost _host;
|
|
|
|
private readonly IHost _host;
|
|
|
|
|
|
|
|
|
|
|
|
public InventoryTaskForm(IHost host)
|
|
|
|
public InventoryTaskForm(IHost host)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
InitializeComponent();
|
|
|
|
InitializeComponent();
|
|
|
|
_host = host;
|
|
|
|
_host = host;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Thread scanThread = new Thread(ScanMessage);
|
|
|
|
|
|
|
|
scanThread.IsBackground = true;
|
|
|
|
|
|
|
|
scanThread.Start();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void Window_Loaded(object sender, RoutedEventArgs e)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void ScanMessage()
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
while (true)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
try
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (SystemData.isUpdate)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (!string.IsNullOrEmpty(SystemData.message))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
Dispatcher.Invoke(() =>
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
var focusedElement = FocusManager.GetFocusedElement(this);
|
|
|
|
|
|
|
|
if (focusedElement is TextBox textBox)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
textBox.Text = SystemData.message;
|
|
|
|
|
|
|
|
SystemData.isUpdate = false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
catch (Exception ex)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
LogManager.Error(ex);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
Thread.Sleep(500);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void txtInBox_TextChanged(object sender, RoutedEventArgs e)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if(txtInBox.Text.Length == 15)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
GetData(txtInBox.Text);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
this.InventoryDataGrid.ItemsSource = null;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
private void Window_Loaded(object sender, RoutedEventArgs e)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
try
|
|
|
|
try
|
|
|
|
{
|
|
|
|
{
|
|
|
|
using var scope = _host.Services.CreateScope();
|
|
|
|
using var scope = _host.Services.CreateScope();
|
|
|
|
var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
|
|
|
|
var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
|
|
|
|
var wcsTasks = dbContext.WcsTask.Where(t => t.taskType == 100 && t.taskStatus == 6).ToList();
|
|
|
|
var wcsTasks = dbContext.WcsTask.Where(t => t.taskType == 100 && t.taskStatus == 6).ToList();
|
|
|
|
if (wcsTasks.Count > 0)
|
|
|
|
//if (wcsTasks.Count > 0)
|
|
|
|
{
|
|
|
|
//{
|
|
|
|
this.ContainerCodeBox.ItemsSource = wcsTasks.Distinct();
|
|
|
|
// this.ContainerCodeBox.ItemsSource = wcsTasks.Distinct();
|
|
|
|
}
|
|
|
|
//}
|
|
|
|
else
|
|
|
|
//else
|
|
|
|
{
|
|
|
|
//{
|
|
|
|
HandyControl.Controls.MessageBox.Show("未找到盘库已完成的小车任务！");
|
|
|
|
// HandyControl.Controls.MessageBox.Show("未找到盘库已完成的小车任务！");
|
|
|
|
this.Close();
|
|
|
|
// this.Close();
|
|
|
|
}
|
|
|
|
//}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch
|
|
|
|
catch
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -45,19 +100,23 @@ namespace Khd.Core.Wpf.TaskForm
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void GetData()
|
|
|
|
private void GetData(string containerNo)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (this.ContainerCodeBox.SelectedItem is WcsTask task)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
using var scope = _host.Services.CreateScope();
|
|
|
|
using var scope = _host.Services.CreateScope();
|
|
|
|
var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
|
|
|
|
var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
|
|
|
|
var wcsTask = dbContext.WcsTask
|
|
|
|
var wcsTask = dbContext.WcsTask
|
|
|
|
.Where(t => t.taskType == 100)
|
|
|
|
.Where(t => t.taskType == 100)
|
|
|
|
.Where(t => t.containerNo == task.containerNo).FirstOrDefault();
|
|
|
|
.Where(t => t.containerNo == containerNo).FirstOrDefault();
|
|
|
|
if (wcsTask != null)
|
|
|
|
if (wcsTask != null)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
WmsInventoryCheck check = dbContext.WmsInventoryCheck.Where(x => x.CheckStatus == "1").FirstOrDefault();
|
|
|
|
|
|
|
|
if (check == null)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
HandyControl.Controls.MessageBox.Show("当前无正在执行的盘库任务");
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
var wmsInventoryCheckDetails = dbContext.WmsInventoryCheckDetail
|
|
|
|
var wmsInventoryCheckDetails = dbContext.WmsInventoryCheckDetail
|
|
|
|
.Where(t => t.InventoryCheckId == wcsTask.orderId)
|
|
|
|
.Where(t => t.InventoryCheckId == check.InventoryCheckId)
|
|
|
|
.Where(t => t.LocationCode == wcsTask.currPointNo)
|
|
|
|
.Where(t => t.LocationCode == wcsTask.currPointNo)
|
|
|
|
.Where(t => t.CheckStatus == "1")
|
|
|
|
.Where(t => t.CheckStatus == "1")
|
|
|
|
.ToList();
|
|
|
|
.ToList();
|
|
|
|
@ -66,8 +125,10 @@ namespace Khd.Core.Wpf.TaskForm
|
|
|
|
this.InventoryDataGrid.ItemsSource = wmsInventoryCheckDetails.GroupBy(t => t.MaterialId).Select(t =>
|
|
|
|
this.InventoryDataGrid.ItemsSource = wmsInventoryCheckDetails.GroupBy(t => t.MaterialId).Select(t =>
|
|
|
|
new
|
|
|
|
new
|
|
|
|
{
|
|
|
|
{
|
|
|
|
ContainerNo = wcsTask.containerNo,
|
|
|
|
//ContainerNo = wcsTask.containerNo,
|
|
|
|
MaterialName = mesBaseMaterialInfos.FirstOrDefault(m => m.MaterialId == t.Key)?.MaterialSpec,
|
|
|
|
MaterialBatch = t.FirstOrDefault(n => n.MaterialId == t.Key)?.MaterialBatch,
|
|
|
|
|
|
|
|
MaterialSpec = mesBaseMaterialInfos.FirstOrDefault(m => m.MaterialId == t.Key)?.MaterialSpec,
|
|
|
|
|
|
|
|
MaterialName = mesBaseMaterialInfos.FirstOrDefault(m => m.MaterialId == t.Key)?.MaterialName,
|
|
|
|
StockAmount = t.Sum(n => n.StockAmount),
|
|
|
|
StockAmount = t.Sum(n => n.StockAmount),
|
|
|
|
LocationCode = wcsTask.currPointNo,
|
|
|
|
LocationCode = wcsTask.currPointNo,
|
|
|
|
MaterialId = t.Key,
|
|
|
|
MaterialId = t.Key,
|
|
|
|
@ -78,20 +139,51 @@ namespace Khd.Core.Wpf.TaskForm
|
|
|
|
{
|
|
|
|
{
|
|
|
|
HandyControl.Controls.MessageBox.Show("该料箱为空料箱");
|
|
|
|
HandyControl.Controls.MessageBox.Show("该料箱为空料箱");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
HandyControl.Controls.MessageBox.Show("请先选择料箱号！");
|
|
|
|
HandyControl.Controls.MessageBox.Show("请扫描盘库任务里面的料箱");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void SearchBtn_Click(object sender, RoutedEventArgs e)
|
|
|
|
private void SearchBtn_Click(object sender, RoutedEventArgs e)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
GetData();
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void EditBtn_Click(object sender, RoutedEventArgs e)
|
|
|
|
private void EditBtn_Click(object sender, RoutedEventArgs e)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
//if (this.InventoryDataGrid.SelectedItem != null)
|
|
|
|
|
|
|
|
//{
|
|
|
|
|
|
|
|
// dynamic item = this.InventoryDataGrid.SelectedItem;
|
|
|
|
|
|
|
|
// long materialId = item.MaterialId;
|
|
|
|
|
|
|
|
// string containerNo = item.ContainerNo;
|
|
|
|
|
|
|
|
// string materialName = item.MaterialName;
|
|
|
|
|
|
|
|
// string locationCode = item.LocationCode;
|
|
|
|
|
|
|
|
// InventoryTaskEditForm editForm = new InventoryTaskEditForm(_host, materialId, containerNo, materialName, locationCode, this);
|
|
|
|
|
|
|
|
// this.Hide();
|
|
|
|
|
|
|
|
// editForm.ShowDialog();
|
|
|
|
|
|
|
|
// GetData();
|
|
|
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
//else
|
|
|
|
|
|
|
|
//{
|
|
|
|
|
|
|
|
// if (this.ContainerCodeBox.SelectedItem is WcsTask task)
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// InventoryTaskEditForm editForm = new InventoryTaskEditForm(_host, 0, task.containerNo, "", task.currPointNo, this);
|
|
|
|
|
|
|
|
// this.Hide();
|
|
|
|
|
|
|
|
// editForm.ShowDialog();
|
|
|
|
|
|
|
|
// GetData();
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// else
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// HandyControl.Controls.MessageBox.Show("请先选择料箱号！");
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void Update_Click(object sender, RoutedEventArgs e)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (this.InventoryDataGrid.SelectedItem != null)
|
|
|
|
if (this.InventoryDataGrid.SelectedItem != null)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -100,25 +192,10 @@ namespace Khd.Core.Wpf.TaskForm
|
|
|
|
string containerNo = item.ContainerNo;
|
|
|
|
string containerNo = item.ContainerNo;
|
|
|
|
string materialName = item.MaterialName;
|
|
|
|
string materialName = item.MaterialName;
|
|
|
|
string locationCode = item.LocationCode;
|
|
|
|
string locationCode = item.LocationCode;
|
|
|
|
InventoryTaskEditForm editForm = new InventoryTaskEditForm(_host, materialId, containerNo, materialName, locationCode, this);
|
|
|
|
|
|
|
|
this.Hide();
|
|
|
|
GetData(item.ContainerNo);
|
|
|
|
editForm.ShowDialog();
|
|
|
|
|
|
|
|
GetData();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (this.ContainerCodeBox.SelectedItem is WcsTask task)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
InventoryTaskEditForm editForm = new InventoryTaskEditForm(_host, 0, task.containerNo, "", task.currPointNo, this);
|
|
|
|
|
|
|
|
this.Hide();
|
|
|
|
|
|
|
|
editForm.ShowDialog();
|
|
|
|
|
|
|
|
GetData();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
HandyControl.Controls.MessageBox.Show("请先选择料箱号！");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
liuwf
1 year ago