From 667b0179fe49d304df1e01b5cd2cba1e9e434dcb Mon Sep 17 00:00:00 2001 From: liuwf Date: Sat, 7 Sep 2024 17:33:20 +0800 Subject: [PATCH] =?UTF-8?q?add-=E6=89=80=E6=9C=89=E6=A5=BC=E5=B1=82?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=BB=E5=BA=93=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs | 44 ++++++++++++++++++++++++++ src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs | 44 ++++++++++++++++++++++++++ src/Khd.Core.Wpf/Form/FormBoardT.xaml | 2 +- 3 files changed, 89 insertions(+), 1 deletion(-) diff --git a/src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs b/src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs index 3d6bda1..73f68e7 100644 --- a/src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs +++ b/src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs @@ -886,6 +886,50 @@ namespace Khd.Core.Wcs.Wcs }); dbContext.Remove(item); dbContext.WcsTaskLog.Where(t => t.objid == item.objid).Update(t => new WcsTaskLog() { taskStatus = 8 }); + + #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 = wmsProductStock.productBatch; + wmsMove.MaterialId = wmsProductStock.productId; + 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)wmsProductStock.productId; + 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 + + transaction.Commit(); dbContext.SaveChanges(); _logger.Info("二楼AGV线程完成任务" + item.objid); diff --git a/src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs b/src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs index 60b5b43..3f612d6 100644 --- a/src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs +++ b/src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs @@ -599,6 +599,50 @@ 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(); transaction.Commit(); } diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml index 3535b2b..e26dcf6 100644 --- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml +++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml @@ -401,7 +401,7 @@ -