From 938efc2e6b5620273b1a5ad0c849459a8b45ceb8 Mon Sep 17 00:00:00 2001 From: liuwf Date: Sat, 31 Aug 2024 10:41:20 +0800 Subject: [PATCH] . --- src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs | 48 +++++++++++++++------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs index 29cf594..dc42132 100644 --- a/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs +++ b/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs @@ -688,30 +688,34 @@ namespace Khd.Core.Wcs.Wcs updateDate = DateTime.Now, warehouseId = 511, }; - WmsRawInstock wmsRawInstock = new WmsRawInstock() - { - taskCode = item.taskCode, - materialBarCode = mesBaseBarcodeInfo.barcodeInfo, - materialBatchCode = mesBaseBarcodeInfo.batchCode, - applyBy = "wcs", - applyDate = System.DateTime.Now, - purchaseOrderId = mesBaseBarcodeInfo.PurchaseOrderId, + WmsRawInstock? WmsRawInstock = dbContext.WmsRawInstock.FirstOrDefault(t => t.materialBarCode == mesBasePalletInfo.materialBarcode); + WmsRawInstock.returnFlag = "1"; + WmsRawInstock.executeStatus = "2"; + WmsRawInstock.updateDate = DateTime.Now; + //WmsRawInstock wmsRawInstock = new WmsRawInstock() + //{ + // taskCode = item.taskCode, + // materialBarCode = mesBaseBarcodeInfo.barcodeInfo, + // materialBatchCode = mesBaseBarcodeInfo.batchCode, + // applyBy = "wcs", + // applyDate = System.DateTime.Now, + // purchaseOrderId = mesBaseBarcodeInfo.PurchaseOrderId, - beginTime = System.DateTime.Now, - endTime = DateTime.Now, - locationCode = wmsBaseLocation.locationCode, - executeStatus = "2", - instockAmount = 1, - instockType = "2", - - materialId = mesBaseBarcodeInfo.materialId, - operationType = "3", - palletInfoCode = mesBaseBarcodeInfo.palletInfoCode, - poNo = mesBaseBarcodeInfo.poNo, - warehouseId = 511 - }; + // beginTime = System.DateTime.Now, + // endTime = DateTime.Now, + // locationCode = wmsBaseLocation.locationCode, + // executeStatus = "2", + // instockAmount = 1, + // instockType = "2", + + // materialId = mesBaseBarcodeInfo.materialId, + // operationType = "3", + // palletInfoCode = mesBaseBarcodeInfo.palletInfoCode, + // poNo = mesBaseBarcodeInfo.poNo, + // warehouseId = 511 + //}; SystemData.UnLockOutLocation(wmsBaseLocation, dbContext); - dbContext.Add(wmsRawInstock); + dbContext.Update(WmsRawInstock); dbContext.Add(wmsRawStock); BaseEquip startEquip = StaticData.BaseEquip.First(t => t.objid == item.currPointId); startEquip.emptyCount = 0;