From b682678073259d04e5a283ef7d7513231da2b9d6 Mon Sep 17 00:00:00 2001 From: liuwf Date: Tue, 10 Sep 2024 18:14:53 +0800 Subject: [PATCH] =?UTF-8?q?add-=20=E8=99=9A=E6=8B=9F=E6=89=98=E7=9B=98?= =?UTF-8?q?=E5=8F=B7,=E5=90=88=E5=B9=B6=E7=9A=84=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=88=86=E5=88=AB=E6=8F=92=E5=85=A5WmsRawInstock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs | 37 ++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs index f836a3a..fe84e42 100644 --- a/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs +++ b/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs @@ -810,22 +810,49 @@ namespace Khd.Core.Wcs.Wcs { if (mesBaseBarcodeInfo.PurchaseOrderId == -1) - { // 合并的物料 - // List mesSaleOrderRelates = dbContext.MesSaleOrderRelate.Where(x=>x.SaleOrderId==mesBaseBarcodeInfo.saleOrderId) + { // 虚拟托盘号,合并的物料 + List mesSaleOrderRelates = dbContext.MesSaleOrderRelate.Where(x => x.SaleOrderId == mesBaseBarcodeInfo.saleOrderId).ToList(); + List? wmsRawInstocks = new List(); + foreach(var mesSaleOrderRelate in mesSaleOrderRelates) + { + WmsRawInstock wmsRawInstock = new WmsRawInstock() + { + taskCode = StaticData.SnowId.NextId().ToString(), + materialBarCode = null, + materialBatchCode = null, + applyBy = "wcs", + applyDate = System.DateTime.Now, + purchaseOrderId = mesSaleOrderRelate.PurchaseOrderId, + beginTime = DateTime.Now, + endTime = DateTime.Now, + locationCode = wmsBaseLocation.locationCode, + executeStatus = "2", + instockAmount = mesSaleOrderRelate.RelateSaleOrderAmount, + instockType = "1", + materialId = mesBaseBarcodeInfo.materialId, + operationType = "3", + palletInfoCode = mesBaseBarcodeInfo.palletInfoCode, + poNo = mesBaseBarcodeInfo.poNo, + warehouseId = 511 + }; + wmsRawInstocks.Add(wmsRawInstock); + } + if(wmsRawInstocks.Count > 0) + { + dbContext.WmsRawInstock.AddRange(wmsRawInstocks); + } } else { WmsRawInstock wmsRawInstock = new WmsRawInstock() { - taskCode = item.taskCode, + taskCode = StaticData.SnowId.NextId().ToString(), materialBarCode = mesBaseBarcodeInfo.barcodeInfo, materialBatchCode = mesBaseBarcodeInfo.batchCode, applyBy = "wcs", applyDate = System.DateTime.Now, purchaseOrderId = mesBaseBarcodeInfo.PurchaseOrderId, - - beginTime = DateTime.Now, endTime = DateTime.Now, locationCode = wmsBaseLocation.locationCode,