.

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",
+                                            //    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
-                                            };
+                                            //    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;