|
|
|
@ -6,8 +6,8 @@ using Aucma.Core.Palletiz.Models;
|
|
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
|
|
using System.Collections.ObjectModel;
|
|
|
|
using System.Collections.ObjectModel;
|
|
|
|
using System.Linq;
|
|
|
|
using System.Linq;
|
|
|
|
using GalaSoft.MvvmLight;
|
|
|
|
|
|
|
|
using Aucma.Core.Palletiz.Views;
|
|
|
|
using Aucma.Core.Palletiz.Views;
|
|
|
|
|
|
|
|
using CommunityToolkit.Mvvm.ComponentModel;
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
/*
|
|
|
|
* 成品分垛入库首页信息
|
|
|
|
* 成品分垛入库首页信息
|
|
|
|
@ -15,7 +15,7 @@ using Aucma.Core.Palletiz.Views;
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
namespace Aucma.Core.Palletiz.ViewModels
|
|
|
|
namespace Aucma.Core.Palletiz.ViewModels
|
|
|
|
{
|
|
|
|
{
|
|
|
|
internal class IndexControlViewModel : ViewModelBase
|
|
|
|
internal class IndexControlViewModel : ObservableObject
|
|
|
|
{
|
|
|
|
{
|
|
|
|
private InStoreBusiness inStoreBusiness;
|
|
|
|
private InStoreBusiness inStoreBusiness;
|
|
|
|
|
|
|
|
|
|
|
|
@ -51,65 +51,49 @@ namespace Aucma.Core.Palletiz.ViewModels
|
|
|
|
public string ProductSNCode
|
|
|
|
public string ProductSNCode
|
|
|
|
{
|
|
|
|
{
|
|
|
|
get { return this.productSNCode; }
|
|
|
|
get { return this.productSNCode; }
|
|
|
|
set
|
|
|
|
set => SetProperty(ref productSNCode, value);
|
|
|
|
{
|
|
|
|
|
|
|
|
productSNCode = value;
|
|
|
|
|
|
|
|
RaisePropertyChanged(nameof(ProductSNCode));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public string productModel = string.Empty;
|
|
|
|
public string productModel = string.Empty;
|
|
|
|
public string ProductModel
|
|
|
|
public string ProductModel
|
|
|
|
{
|
|
|
|
{
|
|
|
|
get { return this.productModel; }
|
|
|
|
get { return this.productModel; }
|
|
|
|
set
|
|
|
|
set => SetProperty(ref productModel, value);
|
|
|
|
{
|
|
|
|
|
|
|
|
productModel = value;
|
|
|
|
|
|
|
|
RaisePropertyChanged(nameof(ProductModel));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public string orderCode = string.Empty;
|
|
|
|
public string orderCode = string.Empty;
|
|
|
|
public string OrderCode
|
|
|
|
public string OrderCode
|
|
|
|
{
|
|
|
|
{
|
|
|
|
get { return this.orderCode; }
|
|
|
|
get { return this.orderCode; }
|
|
|
|
set
|
|
|
|
set => SetProperty(ref orderCode, value);
|
|
|
|
{
|
|
|
|
|
|
|
|
orderCode = value;
|
|
|
|
|
|
|
|
RaisePropertyChanged(nameof(OrderCode));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public string productScanTime = string.Empty;
|
|
|
|
public string productScanTime = string.Empty;
|
|
|
|
public string ProductScanTime
|
|
|
|
public string ProductScanTime
|
|
|
|
{
|
|
|
|
{
|
|
|
|
get { return this.productScanTime; }
|
|
|
|
get { return this.productScanTime; }
|
|
|
|
set
|
|
|
|
|
|
|
|
{
|
|
|
|
set => SetProperty(ref productScanTime, value);
|
|
|
|
productScanTime = value;
|
|
|
|
|
|
|
|
RaisePropertyChanged(nameof(ProductScanTime));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public string msg = string.Empty;
|
|
|
|
public string msg = string.Empty;
|
|
|
|
public string Msg
|
|
|
|
public string Msg
|
|
|
|
{
|
|
|
|
{
|
|
|
|
get { return this.msg; }
|
|
|
|
get { return this.msg; }
|
|
|
|
set
|
|
|
|
set => SetProperty(ref msg, value);
|
|
|
|
{
|
|
|
|
|
|
|
|
msg = value;
|
|
|
|
|
|
|
|
RaisePropertyChanged(nameof(Msg));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
public string inStoreAmount = "入库数量:";
|
|
|
|
public string inStoreAmount = "入库数量:";
|
|
|
|
public string InStoreAmount
|
|
|
|
public string InStoreAmount
|
|
|
|
{
|
|
|
|
{
|
|
|
|
get { return this.inStoreAmount; }
|
|
|
|
get { return this.inStoreAmount; }
|
|
|
|
set
|
|
|
|
set => SetProperty(ref inStoreAmount, value);
|
|
|
|
{
|
|
|
|
|
|
|
|
inStoreAmount = value;
|
|
|
|
|
|
|
|
RaisePropertyChanged(nameof(InStoreAmount));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public System.Windows.Controls.UserControl _content;
|
|
|
|
public System.Windows.Controls.UserControl _content;
|
|
|
|
@ -117,11 +101,10 @@ namespace Aucma.Core.Palletiz.ViewModels
|
|
|
|
public System.Windows.Controls.UserControl InStoreTaskContent
|
|
|
|
public System.Windows.Controls.UserControl InStoreTaskContent
|
|
|
|
{
|
|
|
|
{
|
|
|
|
get { return this._content; }
|
|
|
|
get { return this._content; }
|
|
|
|
set
|
|
|
|
set => SetProperty(ref _content, value);
|
|
|
|
{
|
|
|
|
|
|
|
|
_content = value;
|
|
|
|
|
|
|
|
RaisePropertyChanged(nameof(InStoreTaskContent));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
@ -132,7 +115,8 @@ namespace Aucma.Core.Palletiz.ViewModels
|
|
|
|
public ObservableCollection<BaseSpaceInfo> AreaA_SpaceInfo
|
|
|
|
public ObservableCollection<BaseSpaceInfo> AreaA_SpaceInfo
|
|
|
|
{
|
|
|
|
{
|
|
|
|
get { return _areaA_SpaceInfo; }
|
|
|
|
get { return _areaA_SpaceInfo; }
|
|
|
|
set { _areaA_SpaceInfo = value; RaisePropertyChanged(nameof(AreaA_SpaceInfo)); }
|
|
|
|
set => SetProperty(ref _areaA_SpaceInfo, value);
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
@ -143,7 +127,8 @@ namespace Aucma.Core.Palletiz.ViewModels
|
|
|
|
public ObservableCollection<BaseSpaceInfo> AreaB_SpaceInfo
|
|
|
|
public ObservableCollection<BaseSpaceInfo> AreaB_SpaceInfo
|
|
|
|
{
|
|
|
|
{
|
|
|
|
get { return _areaB_SpaceInfo; }
|
|
|
|
get { return _areaB_SpaceInfo; }
|
|
|
|
set { _areaB_SpaceInfo = value; RaisePropertyChanged(nameof(AreaB_SpaceInfo)); }
|
|
|
|
set => SetProperty(ref _areaB_SpaceInfo, value);
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endregion
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
|
|
@ -197,23 +182,23 @@ namespace Aucma.Core.Palletiz.ViewModels
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var info2 = inStoreBusiness.GetBaseSpaceinfos("A");
|
|
|
|
//var info2 = inStoreBusiness.GetBaseSpaceinfos("A");
|
|
|
|
info2 = info2.OrderBy(x => x.ObjId).ToList();
|
|
|
|
//info2 = info2.OrderBy(x => x.ObjId).ToList();
|
|
|
|
if (info2 != null)
|
|
|
|
//if (info2 != null)
|
|
|
|
{
|
|
|
|
//{
|
|
|
|
App.Current.Dispatcher.BeginInvoke((Action)(() =>
|
|
|
|
// App.Current.Dispatcher.BeginInvoke((Action)(() =>
|
|
|
|
{
|
|
|
|
// {
|
|
|
|
if (spaceItemsB.Count > 0)
|
|
|
|
// if (spaceItemsB.Count > 0)
|
|
|
|
{
|
|
|
|
// {
|
|
|
|
spaceItemsB.Clear();
|
|
|
|
// spaceItemsB.Clear();
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
foreach (var item in info2)
|
|
|
|
// foreach (var item in info2)
|
|
|
|
{
|
|
|
|
// {
|
|
|
|
spaceItemsB.Add(item);
|
|
|
|
// spaceItemsB.Add(item);
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
AreaB_SpaceInfo = spaceItemsB;
|
|
|
|
// AreaB_SpaceInfo = spaceItemsB;
|
|
|
|
}));
|
|
|
|
// }));
|
|
|
|
}
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
liuwf
10 months ago