泡前库逻辑修改

dev
liulb@mesnac.com 11 months ago
parent bf1b9ff1c1
commit 8fbb2ad83d

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
9eb9c3343bb1a3a8e3426fc92f4e398af1f4cb1ade520efc3416cbca1a18e1cd 09e70017c9bba340185d279a719dbcbda4ae15b3c3762baa2bc1b80903fb62bd

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
a165af674a441087eb22ae19c77f979a6da84cbec6e5cbc681f8782efbaf2a96 62c372c21881cc0a3cf18ed9ccd3281daa887a1a4ca7f4ee3d294ea0404fcb2b

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
50db5bdaed5a2e50771f8e9b59e9015f322c4f69836771d4f10280033baddf0f 19d97d4aad1e5f6c727e3cec4adacff61b3a7c7bd32d69c8972a032c9273ee13

@ -10,5 +10,6 @@ namespace Admin.Core.IRepository
public interface IRecordInStoreRepository : IBaseRepository<RecordInStore> public interface IRecordInStoreRepository : IBaseRepository<RecordInStore>
{ {
Task<bool> SaveRecordToDb(RecordInStore store, RealTaskInfo realTask, BaseSpaceInfo baseSpaceInfo, BaseSpaceDetail baseDetail); Task<bool> SaveRecordToDb(RecordInStore store, RealTaskInfo realTask, BaseSpaceInfo baseSpaceInfo, BaseSpaceDetail baseDetail);
Task<bool> SaveRecord(RecordInStore store, RealTaskInfo realTask, BaseSpaceInfo baseSpaceInfo, BaseSpaceDetail baseDetail);
} }
} }

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
340b53e9f3980b2f035b259b8c24855db503861dc7ce044dd8125b484ea52e3e f1bcb3e30d597461cd7b4a6e828ff284b1b41e27582d847c26cbc7fdb28431c0

@ -28,5 +28,12 @@ namespace Admin.Core.IService
/// <param name="endTime">结束时间</param> /// <param name="endTime">结束时间</param>
/// <returns>入库记录集合</returns> /// <returns>入库记录集合</returns>
Task<List<RecordInStore>> queryRecordToDb(string storeCode,DateTime startTime, DateTime endTime); Task<List<RecordInStore>> queryRecordToDb(string storeCode,DateTime startTime, DateTime endTime);
/// <summary>
/// 泡前库货道信息更新
/// </summary>
/// <param name="store"></param>
/// <param name="baseSpaceInfo"></param>
/// <returns></returns>
Task<bool> SaveRecord(RecordInStore store, RealTaskInfo realTask, BaseSpaceInfo baseSpaceInfo, BaseSpaceDetail baseDetail);
} }
} }

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
1771f1e0c2289705e94aa4abfed5bb91ff856e44a3ad0211a3208ce94b3dc6ec 0d0764005bd65b273c0508565a549cd7307506af4e8920b4795d4d8f39986518

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
9068062e57a5b81a7148289fc74572e59369ccf4ef2cbf765ccb11dfb12a171b 5773f152df26b95087e08348c9bda19c1be708fc03119089543692f612cbff29

@ -25,7 +25,7 @@ namespace Admin.Core.Repository
Db.CopyNew().Updateable(baseSpaceInfo).ExecuteCommand(); Db.CopyNew().Updateable(baseSpaceInfo).ExecuteCommand();
Db.CopyNew().Insertable(store).ExecuteCommand(); Db.CopyNew().Insertable(store).ExecuteCommand();
// 不控制出库,没必要添加货道明细 // 不控制出库,没必要添加货道明细
// Db.Insertable(baseDetail).ExecuteCommand(); Db.Insertable(baseDetail).ExecuteCommand();
Db.CopyNew().Ado.CommitTran(); Db.CopyNew().Ado.CommitTran();
return true; return true;
} }
@ -37,6 +37,27 @@ namespace Admin.Core.Repository
} }
} }
public async Task<bool> SaveRecord(RecordInStore store, RealTaskInfo realTask, BaseSpaceInfo baseSpaceInfo, BaseSpaceDetail baseDetail)
{
try
{
Db.CopyNew().Ado.BeginTran();
Db.CopyNew().Deleteable(realTask).ExecuteCommand();
Db.CopyNew().Updateable(baseSpaceInfo).ExecuteCommand();
Db.CopyNew().Insertable(store).ExecuteCommand();
// 不控制出库,没必要添加货道明细
//Db.Insertable(baseDetail).ExecuteCommand();
Db.CopyNew().Ado.CommitTran();
return true;
}
catch (Exception ex)
{
await Db.CopyNew().Ado.RollbackTranAsync();
logHelper.Error($"箱体入库更新异常:{ex.Message}");
return false;
}
}
} }
} }

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
093f57870764331d57de6cafb70e8f3a16edeae5233ad8a1eddbd307df44fba2 71714e5e63310566fa090718f0555bff735e2e784a813bbab00e8f701d48c3b3

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
ec73500b8c3ed36309792e9a99c4baf2dda48b653bd87333e427a308f0235421 ce41c6807cfbdb8eff45c5405f4984b42d6d923756e6e213836d5b9c510a3e3c

@ -36,6 +36,17 @@ namespace Admin.Core.Service
{ {
return await _recordInstoreRepository.SaveRecordToDb(store, realTask, baseSpaceInfo, baseDetail); return await _recordInstoreRepository.SaveRecordToDb(store, realTask, baseSpaceInfo, baseDetail);
} }
/// <summary>
/// 更新货道信息、入库记录、实时任务
/// </summary>
/// <param name="store"></param>
/// <param name="realTask"></param>
/// <param name="baseSpaceInfo"></param>
/// <returns></returns>
public async Task<bool> SaveRecord(RecordInStore store, RealTaskInfo realTask, BaseSpaceInfo baseSpaceInfo, BaseSpaceDetail baseDetail)
{
return await _recordInstoreRepository.SaveRecord( store, realTask, baseSpaceInfo, baseDetail);
}
/// <summary> /// <summary>
/// 查询入库记录 /// 查询入库记录

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
684ec858c0135ef17a23f6f4ba9440db1d8c00ab0db171f9b67e882bc38e153d 51f44909201dbd9241b4779a73b8b672cb1f3a748f196d413168252d62b5138c

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
bc3b83989d0a9bbe7fbe3b0dd43a98d703c9202d722100e83165ea0560759ef7 2906f3a415f186cbcb70496e9279b2f10c55fe29e20ba6540a209d684a48975e

@ -157,7 +157,7 @@
"ConnectionString": "127.0.0.1:6379" "ConnectionString": "127.0.0.1:6379"
}, },
"Common": { "Common": {
"TemperatureApiAddRess": "http://10.100.72.10:8080" "StationName": "2009"
}, },
"RabbitMQ": { "RabbitMQ": {
"Enabled": true, "Enabled": true,

File diff suppressed because it is too large Load Diff

@ -2,6 +2,7 @@
using Admin.Core.IService; using Admin.Core.IService;
using Admin.Core.Model; using Admin.Core.Model;
using Admin.Core.Service; using Admin.Core.Service;
using Aucma.Core.BoxFoam.Business;
using Aucma.Core.BoxFoam.Models; using Aucma.Core.BoxFoam.Models;
using Aucma.Core.BoxFoam.Views.UserPage; using Aucma.Core.BoxFoam.Views.UserPage;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
@ -39,6 +40,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
_baseSpaceInfoServices = App.ServiceProvider.GetService<IBaseSpaceInfoServices>(); _baseSpaceInfoServices = App.ServiceProvider.GetService<IBaseSpaceInfoServices>();
SetBoxTypeViewModel.RefreshPageEvent += LoadSpaceStoreMedthAsync; SetBoxTypeViewModel.RefreshPageEvent += LoadSpaceStoreMedthAsync;
SelectTypeViewModel.RefreshPageEvent += LoadSpaceStoreMedthAsync; SelectTypeViewModel.RefreshPageEvent += LoadSpaceStoreMedthAsync;
InStoreBusiness.RefreshPageDelegateEvent += LoadSpaceStoreMedthAsync;
this.LoadSpaceStoreMedthAsync(); this.LoadSpaceStoreMedthAsync();
} }
#region 参数定义 #region 参数定义
@ -96,8 +98,9 @@ namespace Aucma.Core.BoxFoam.ViewModels
private void LoadSpaceStoreMedthAsync() private void LoadSpaceStoreMedthAsync()
{ {
string storeCode = Appsettings.app("StoreInfo", "BeforeStoreCode");//泡前库code string storeCode = Appsettings.app("StoreInfo", "BeforeStoreCode");//泡前库code
System.Windows.Application.Current.Dispatcher.Invoke((Action)(() =>
var baseSpaceInfolist = _baseSpaceInfoServices.QueryAsync(d => d.StoreCode==storeCode).Result;//仓库 {
var baseSpaceInfolist = _baseSpaceInfoServices.QueryAsync(d => d.StoreCode == storeCode).Result;//仓库
if (baseSpaceInfolist == null) return; if (baseSpaceInfolist == null) return;
if (baseSpaceInfolist.Count > 0) if (baseSpaceInfolist.Count > 0)
@ -107,7 +110,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
Shapes.Clear(); Shapes.Clear();
foreach (var item in baseSpaceInfolist) foreach (var item in baseSpaceInfolist)
{ {
SpaceInfoModel model=new SpaceInfoModel(); SpaceInfoModel model = new SpaceInfoModel();
model.spaceCode = item.SpaceCode; model.spaceCode = item.SpaceCode;
model.spaceStock = item.SpaceStock; model.spaceStock = item.SpaceStock;
model.onTheWay = item.OnRouteAmount; model.onTheWay = item.OnRouteAmount;
@ -130,7 +133,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
else else
{ {
model.isFlag = item.IsFlag.ToString(); //禁用状态 model.isFlag = item.IsFlag.ToString(); //禁用状态
model.inStoreFlag ="White"; model.inStoreFlag = "White";
} }
model.onlyOne = 1; model.onlyOne = 1;
@ -138,6 +141,8 @@ namespace Aucma.Core.BoxFoam.ViewModels
Shapes.Add(model); Shapes.Add(model);
} }
}));
} }
#endregion #endregion

@ -30,18 +30,10 @@ namespace Aucma.Core.BoxFoam.ViewModels
private InStoreBusiness inStoreBusiness = InStoreBusiness.Instance; private InStoreBusiness inStoreBusiness = InStoreBusiness.Instance;
public IndexPageViewModel() public IndexPageViewModel()
{ {
// inStoreBusiness.init();//初始化界面?
_recordInstoreServices = App.ServiceProvider.GetService<IRecordInStoreServices>(); _recordInstoreServices = App.ServiceProvider.GetService<IRecordInStoreServices>();
_realTaskInfoService =App.ServiceProvider.GetService<IRealTaskInfoServices>(); _realTaskInfoService =App.ServiceProvider.GetService<IRealTaskInfoServices>();
//Job_BoxFoamInStoreTask_Quartz.RefreshDataGridDelegateEvent += LoadData;//刷新底部列表
InStoreBusiness.RefreshDataGridDelegateEvent += LoadData;//刷新底部列表 InStoreBusiness.RefreshDataGridDelegateEvent += LoadData;//刷新底部列表
// Job_TestTask_Quartz.DataGridDelegateEvent += ExecMethod;//刷新日志
// Job_BoxFoamInStoreTask_Quartz.RefreshScanMateriaCodeEvent += RefreshScanInfo;//扫码信息刷新
InStoreBusiness.RefreshScanMateriaCodeEvent += RefreshScanInfo;//扫码信息刷新 InStoreBusiness.RefreshScanMateriaCodeEvent += RefreshScanInfo;//扫码信息刷新
// Job_BoxFoamInStoreTask_Quartz.LogDelegateEvent += PrintMessageToListBox;//入库日志事件
InStoreBusiness.LogDelegateEvent += PrintMessageToListBox;//入库日志事件 InStoreBusiness.LogDelegateEvent += PrintMessageToListBox;//入库日志事件
LoadData(); LoadData();
} }
@ -57,7 +49,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
var storeCode = Appsettings.app("StoreInfo", "BeforeStoreCode"); var storeCode = Appsettings.app("StoreInfo", "BeforeStoreCode");
DateTime startTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00")); DateTime startTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
DateTime endTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59")); DateTime endTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59"));
List<RealTaskInfo> list = _realTaskInfoService.QueryAsync(x=>x.StoreCode.Equals(storeCode)).Result.OrderBy(x=>x.CreateTime).Take(4).ToList(); List<RecordInStore> list = _recordInstoreServices.QueryAsync(x=>x.StoreCode.Equals(storeCode)).Result.OrderBy(x=>x.CreatedTime).Take(10).ToList();
System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () => System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () =>
{ {
PlanInfoDataGrid.Clear(); PlanInfoDataGrid.Clear();
@ -66,15 +58,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
{ {
foreach (var item in list) foreach (var item in list)
{ {
PlanInfoDataGrid.Add(new RealTaskInfo() PlanInfoDataGrid.Add(item);
{
TaskCode = item.TaskCode,
MaterialCode = item.MaterialCode,
MaterialType = item.MaterialType,
SpaceName = item.SpaceName,
CreateTime = item.CreateTime,
TaskStatus = item.TaskStatus
});
i++; i++;
}; };
} }
@ -90,8 +74,8 @@ namespace Aucma.Core.BoxFoam.ViewModels
#endregion #endregion
#region 初始化datagrid #region 初始化datagrid
private ObservableCollection<RealTaskInfo> planInfoDataGrid = new ObservableCollection<RealTaskInfo>(); private ObservableCollection<RecordInStore> planInfoDataGrid = new ObservableCollection<RecordInStore>();
public ObservableCollection<RealTaskInfo> PlanInfoDataGrid public ObservableCollection<RecordInStore> PlanInfoDataGrid
{ {
get { return planInfoDataGrid; } get { return planInfoDataGrid; }
set set

@ -21,8 +21,8 @@ namespace Aucma.Core.BoxFoam.ViewModels
{ {
private static readonly log4net.ILog log = LogManager.GetLogger(typeof(MainWindowViewModel)); private static readonly log4net.ILog log = LogManager.GetLogger(typeof(MainWindowViewModel));
private IndexPageView firstPage = new IndexPageView();//首页 private IndexPageView firstPage = new IndexPageView();//首页
//CollectionFoamLine line = new CollectionFoamLine(); CollectionFoamLine line = new CollectionFoamLine();
//CollectionFoamMachine machine = new CollectionFoamMachine(); CollectionFoamMachine machine = new CollectionFoamMachine();
RealTimeInventoryPageView realTimeInventoryPage = new RealTimeInventoryPageView(); RealTimeInventoryPageView realTimeInventoryPage = new RealTimeInventoryPageView();
EnterWarehouseStatisticsPageView enterWarehouseStatisticsPage = new EnterWarehouseStatisticsPageView(); EnterWarehouseStatisticsPageView enterWarehouseStatisticsPage = new EnterWarehouseStatisticsPageView();
FoamPlanPageView foamPlanPageView = new FoamPlanPageView(); FoamPlanPageView foamPlanPageView = new FoamPlanPageView();

@ -188,18 +188,24 @@
<DataGrid Grid.Row="0" ItemsSource="{Binding PlanInfoDataGrid}" Background="#00000000" <DataGrid Grid.Row="0" ItemsSource="{Binding PlanInfoDataGrid}" Background="#00000000"
ColumnHeaderHeight="35" Height="{Binding Path=ActualHeight, ElementName=ScanPanel}" ColumnHeaderHeight="35" Height="{Binding Path=ActualHeight, ElementName=ScanPanel}"
RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" FontSize="20" RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" FontSize="20"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Auto" GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Auto" LoadingRow="dgvMH_LoadingRow"
ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True" ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
Foreground="White" > Foreground="White" >
<!--修改选中字体颜色--> <!--修改选中字体颜色-->
<DataGrid.Columns> <DataGrid.Columns>
<!--<DataGridTextColumn Binding="{Binding No}" Header="编号" Width="auto" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>--> <DataGridTemplateColumn Width="55" Header="序号" >
<DataGridTextColumn Binding="{Binding TaskCode}" Header="任务编号" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTemplateColumn.CellTemplate>
<DataGridTextColumn Binding="{Binding MaterialCode}" Header="物料条码" Width="2*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataTemplate>
<DataGridTextColumn Binding="{Binding MaterialType}" Header="物料类型" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" /> <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" FontSize="18" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0"></TextBlock>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<!--<DataGridTextColumn Binding="{Binding TaskCode}" Header="任务编号" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>-->
<DataGridTextColumn Binding="{Binding BarCodeCode}" Header="物料条码" Width="2*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding MaterialCode}" Header="物料类型" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<!--<DataGridTextColumn Binding="{Binding MaterialName}" Header="物料名称" Width="2*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />--> <!--<DataGridTextColumn Binding="{Binding MaterialName}" Header="物料名称" Width="2*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />-->
<DataGridTextColumn Binding="{Binding SpaceName}" Header="入库货道" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Binding="{Binding SpaceName}" Header="入库货道" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" Visibility="Collapsed" />
<DataGridTextColumn Binding="{Binding CreateTime,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="创建时间" Width="1.5*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Binding="{Binding CreateTime,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="创建时间" Width="1.5*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" Visibility="Collapsed"/>
<DataGridTextColumn Binding="{Binding TaskStatus}" Header="状态" Width="0.5*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Binding="{Binding TaskStatus}" Header="状态" Width="0.5*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<!--<DataGridTextColumn Binding="{Binding CompleteAmount}" Header="设备号" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>--> <!--<DataGridTextColumn Binding="{Binding CompleteAmount}" Header="设备号" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>-->
</DataGrid.Columns> </DataGrid.Columns>

@ -27,6 +27,11 @@ namespace Aucma.Core.BoxFoam.Views
InitializeComponent(); InitializeComponent();
this.DataContext = new IndexPageViewModel(); this.DataContext = new IndexPageViewModel();
} }
//在载入行的时候在行表头添加编号
private void dgvMH_LoadingRow(object sender, DataGridRowEventArgs e)
{
e.Row.Header = (e.Row.GetIndex() + 1).ToString();
}
} }
} }

@ -152,7 +152,8 @@ namespace Aucma.Core.TemperatureTask
completion.MaterialBarcode = temperatureHistory.CpNo; completion.MaterialBarcode = temperatureHistory.CpNo;
completion.MaterialCode = barcode.MaterialCode; completion.MaterialCode = barcode.MaterialCode;
completion.MaterialName = barcode.MaterialName; completion.MaterialName = barcode.MaterialName;
completion.StationName = "测温检验01"; string stationName = Appsettings.app("Common", "StationName");
completion.StationName = stationName;
completion.ProductLineCode = "CX_02"; completion.ProductLineCode = "CX_02";
completion.CompleteDate = DateTime.Now; completion.CompleteDate = DateTime.Now;
completionList.Add(completion); completionList.Add(completion);

Loading…
Cancel
Save