|
|
|
|
@ -7,6 +7,7 @@ using Khd.Core.Library.Mapper;
|
|
|
|
|
using Khd.Core.Plc.S7;
|
|
|
|
|
using Khd.Core.Wcs.Global;
|
|
|
|
|
using Masuit.Tools;
|
|
|
|
|
using Microsoft.AspNetCore.Razor.Language;
|
|
|
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
|
|
|
using Microsoft.Extensions.Hosting;
|
|
|
|
|
using Newtonsoft.Json;
|
|
|
|
|
@ -463,6 +464,48 @@ namespace Khd.Core.Wcs.Wcs
|
|
|
|
|
});
|
|
|
|
|
dbContext.Remove(item);
|
|
|
|
|
dbContext.WcsTaskLog.Where(t => t.objid == item.objid).Update(t => new WcsTaskLog() { taskStatus = 6 });
|
|
|
|
|
#region 插入移库记录
|
|
|
|
|
WmsMove wmsMove = new WmsMove();
|
|
|
|
|
wmsMove.MoveId = StaticData.SnowId.NextId();
|
|
|
|
|
wmsMove.TaskCode = StaticData.SnowId.NextId().ToString();
|
|
|
|
|
wmsMove.WarehouseId = wmsBaseLocation.warehouseId;
|
|
|
|
|
wmsMove.OriLocationCode = wmsBaseLocation.locationCode;
|
|
|
|
|
wmsMove.TargetLocationCode = toLocation.locationCode;
|
|
|
|
|
wmsMove.InstockBatch = wmsRawStock.instockBatch;
|
|
|
|
|
wmsMove.MaterialId = wmsRawStock.materialId;
|
|
|
|
|
wmsMove.PlanAmount = 1;
|
|
|
|
|
wmsMove.RealOutstockAmount = 1;
|
|
|
|
|
wmsMove.RealInstockAmount = 1;
|
|
|
|
|
wmsMove.OperationType = "3";
|
|
|
|
|
wmsMove.MoveWay = "2";
|
|
|
|
|
wmsMove.MoveType = "1";
|
|
|
|
|
wmsMove.AuditStatus = "1";
|
|
|
|
|
wmsMove.ExecuteStatus = "2";
|
|
|
|
|
wmsMove.UpdateBy = "WCS";
|
|
|
|
|
wmsMove.UpdateDate = DateTime.Now;
|
|
|
|
|
wmsMove.BeginTime = DateTime.Now;
|
|
|
|
|
wmsMove.EndTime = DateTime.Now;
|
|
|
|
|
|
|
|
|
|
WmsMoveDetail wmsMoveDetail = new WmsMoveDetail();
|
|
|
|
|
wmsMoveDetail.MoveId = wmsMove.MoveId;
|
|
|
|
|
wmsMoveDetail.MaterialBarcode = wmsMove.InstockBatch;
|
|
|
|
|
wmsMoveDetail.InstockBatch = wmsMove.InstockBatch;
|
|
|
|
|
wmsMoveDetail.MaterialId = (long)wmsRawStock.materialId;
|
|
|
|
|
wmsMoveDetail.LocationCode = toLocation.locationCode;
|
|
|
|
|
wmsMoveDetail.PlanAmount = 1;
|
|
|
|
|
wmsMoveDetail.RealInstockAmount = 1;
|
|
|
|
|
wmsMoveDetail.RealAmount = 1;
|
|
|
|
|
wmsMoveDetail.ExecuteStatus = "2";
|
|
|
|
|
wmsMoveDetail.ExecuteTime = DateTime.Now;
|
|
|
|
|
wmsMoveDetail.ExecuteEndTime = DateTime.Now;
|
|
|
|
|
wmsMoveDetail.ExecutePerson = "WCS";
|
|
|
|
|
wmsMoveDetail.UpdateBy = "WCS";
|
|
|
|
|
wmsMoveDetail.UpdateDate = DateTime.Now;
|
|
|
|
|
|
|
|
|
|
dbContext.WmsMove.Add(wmsMove);
|
|
|
|
|
dbContext.WmsMoveDetail.Add(wmsMoveDetail);
|
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
dbContext.SaveChanges();
|
|
|
|
|
dbContextTransaction.Commit();
|
|
|
|
|
}
|
|
|
|
|
|