ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-shmBinary files differ
ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-shmBinary files differ
ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs
@@ -283,7 +283,7 @@ Qty = row.BarcodeQty, BatchNo = row.BatchNo, SupplyCode = row.SupplyCode, Unit = row.Unit Unit = row.BarcodeUnit }).ToList() }).ToList(); allocatefeedmodel.Details = groupedData; @@ -399,11 +399,7 @@ var pendingDetails = orderDetails.Where(x => x.ReturnToMESStatus == 0).ToList(); foreach (var detail in pendingDetails) { if (detail.OverOutQuantity >= detail.NeedOutQuantity) { detailIds.Add(detail.Id); } else if (detail.OverOutQuantity < detail.NeedOutQuantity) { allCompleted = false; } @@ -449,7 +445,7 @@ }; // å¡«å æç»åæ¡ç ä¿¡æ¯ foreach (var detail in orderDetails.Where(x => detailIds.Contains(x.Id)).ToList()) foreach (var detail in orderDetails ) { // æ¥è¯¢è¯¥æç»å¯¹åºçéå®æ¡ç è®°å½ var detailLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>() @@ -473,27 +469,30 @@ // å¡«å æ¡ç ä¿¡æ¯ï¼å«åä½è½¬æ¢ï¼ foreach (var item in detailLocks) { var barModel = new WIDESEA_DTO.Outbound.BarcodesModel if (item.PickedQty > 0) { barcode = item.CurrentBarcode, supplyCode = item.SupplyCode, batchNo = item.BatchNo, unit = item.BarcodeUnit, qty = item.BarcodeQty }; var barModel = new WIDESEA_DTO.Outbound.BarcodesModel { barcode = item.CurrentBarcode, supplyCode = item.SupplyCode, batchNo = item.BatchNo, unit = item.BarcodeUnit, qty = item.BarcodeQty }; // åä½ä¸ä¸è´æ¶è½¬æ¢ if (item.BarcodeUnit != item.Unit) { var convertResult = await _materialUnitService.ConvertAsync( item.MaterielCode, item.BarcodeQty, item.Unit, item.BarcodeUnit); barModel.unit = convertResult.Unit; barModel.qty = convertResult.Quantity; // åä½ä¸ä¸è´æ¶è½¬æ¢ if (item.BarcodeUnit != item.Unit) { var convertResult = await _materialUnitService.ConvertAsync( item.MaterielCode, item.BarcodeQty, item.Unit, item.BarcodeUnit); barModel.unit = convertResult.Unit; barModel.qty = convertResult.Quantity; } detailModel.qty += barModel.qty; detailModel.currentDeliveryQty += barModel.qty; detailModel.barcodes.Add(barModel); } detailModel.qty += barModel.qty; detailModel.currentDeliveryQty += barModel.qty; detailModel.barcodes.Add(barModel); } feedModel.details.Add(detailModel); ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundLockInfo.cs
@@ -147,5 +147,7 @@ [SqlSugar.SugarColumn(IsIgnore = true)] public decimal RemainQuantity => AssignQuantity - PickedQty; public int ReturnToMESStatus { get; set; } } } ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs
@@ -477,10 +477,21 @@ var completedLockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>() .Where(it => it.CurrentBarcode == barcode && (it.Status == (int)OutLockStockStatusEnum.æ£éå®æ || it.Status == (int)OutLockStockStatusEnum.å·²éæ¾ || it.Status == (int)OutLockStockStatusEnum.å·²åèµ° || it.PickedQty >= it.AssignQuantity)).FirstAsync(); if (completedLockInfo != null) throw new Exception($"æ¡ç {barcode}å·²ç»å®æåæ£ï¼ä¸è½éå¤åæ£"); { string statusMsg = completedLockInfo.Status switch { (int)OutLockStockStatusEnum.æ£éå®æ => "å·²ç»å®æåæ£", (int)OutLockStockStatusEnum.å·²éæ¾ => "å·²ç»éæ¾", (int)OutLockStockStatusEnum.å·²åèµ° => "å·²ç»åèµ°", _ => "å·²ç»å®æåæ£" }; throw new Exception($"æ¡ç {barcode}{statusMsg}ï¼ä¸è½éå¤åæ£"); } else return null; } @@ -816,13 +827,13 @@ private async Task<bool> CanCancelPicking(Dt_OutStockLockInfo lockInfo, Dt_StockInfoDetail stockDetail) { if (lockInfo.Status == (int)OutLockStockStatusEnum.å·²éæ¾ || lockInfo.Status == (int)OutLockStockStatusEnum.å·²åèµ°) return false; // éå®ä¿¡æ¯ç¶ææ£æ¥ if (lockInfo.Status != (int)OutLockStockStatusEnum.æ£éå®æ) return false; ////// åºåç¶ææ£æ¥ ////if (stockDetail.Status == StockStatusEmun.åºåºå®æ.ObjToInt()) //// return false; // å¦ææ¯æå è®°å½ï¼è¿éè¦æ£æ¥ç¶éå®ä¿¡æ¯ç¶æ if (lockInfo.IsSplitted == 1 && lockInfo.ParentLockId.HasValue) @@ -830,7 +841,9 @@ var parentLock = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>() .FirstAsync(x => x.Id == lockInfo.ParentLockId.Value); if (parentLock == null || parentLock.Status == (int)OutLockStockStatusEnum.ååºä¸) if (parentLock == null || parentLock.Status == (int)OutLockStockStatusEnum.ååºä¸ || parentLock.Status == (int)OutLockStockStatusEnum.å·²éæ¾ || parentLock.Status == (int)OutLockStockStatusEnum.å·²åèµ°) return false; } @@ -1388,8 +1401,8 @@ await _outStockLockInfoService.Db.Updateable<Dt_OutStockLockInfo>() .SetColumns(it => new Dt_OutStockLockInfo { Status = (int)OutLockStockStatusEnum.å·²éæ¾, // éè¦æ°å¢è¿ä¸ªç¶æ // ReleaseTime = DateTime.Now, Status = (int)OutLockStockStatusEnum.å·²éæ¾, Operator = App.User.UserName }) .Where(it => lockIds.Contains(it.Id)) @@ -1805,7 +1818,7 @@ _logger.LogInformation($"订åç¶ææ´æ° - OrderNo: {orderNo}, æ§ç¶æ: {outboundOrder.OrderStatus}, æ°ç¶æ: {newStatus}"); } } catch (Exception ex) @@ -2829,7 +2842,7 @@ { materialCode = group.Key.MaterielCode, lineNo = group.Key.lineNo, lineNo = group.Key.lineNo, warehouseCode = group.Key.WarehouseCode, qty = group.Sum(x => x.BarcodeQty), currentDeliveryQty = group.Sum(x => x.BarcodeQty), @@ -2840,7 +2853,7 @@ supplyCode = lockInfo.SupplyCode, batchNo = lockInfo.BatchNo, unit = lockInfo.BarcodeUnit, qty = lockInfo.BarcodeQty qty = lockInfo.BarcodeQty }).ToList() }).ToList(); feedmodel.details.AddRange(groupdata); ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -830,17 +830,17 @@ int newStatus = orderDetail.OrderDetailStatus; // æ ¹æ®å®é æ举å¼è°æ´ // 1. æ£æ¥æ¯å¦å·²å®æï¼å·²åºåºæ°é >= éæ±æ°éï¼ // æ£æ¥æ¯å¦å·²å®æï¼å·²åºåºæ°é >= éæ±æ°éï¼ if (orderDetail.OverOutQuantity >= orderDetail.NeedOutQuantity) { newStatus = (int)OrderDetailStatusEnum.Over; // å·²å®æ } // 2. æ£æ¥æ¯å¦æé¨ååºåºææéå®æ°é // æ£æ¥æ¯å¦æé¨ååºåºææéå®æ°é else if (orderDetail.OverOutQuantity > 0 || orderDetail.LockQuantity > 0) { newStatus = (int)OrderDetailStatusEnum.Outbound; // é¨åå®æ/è¿è¡ä¸ } // 3. å¦å为æ°è®¢å // å¦å为æ°è®¢å else { newStatus = (int)OrderDetailStatusEnum.New; // æ°å»º @@ -1054,24 +1054,27 @@ }; foreach (var item in detailLocks) { var barModel = new BarcodeInfo if (item.PickedQty > 0) { Barcode = item.CurrentBarcode, SupplyCode = item.SupplyCode, BatchNo = item.BatchNo, Unit = item.BarcodeUnit, Qty = 0 }; // åä½ä¸ä¸è´æ¶è½¬æ¢ if (item.BarcodeUnit != item.Unit) { var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, item.Unit, item.BarcodeUnit); barModel.Unit = convertResult.Unit; barModel.Qty = convertResult.Quantity; } var barModel = new BarcodeInfo { Barcode = item.CurrentBarcode, SupplyCode = item.SupplyCode, BatchNo = item.BatchNo, Unit = item.BarcodeUnit, Qty = 0 }; // åä½ä¸ä¸è´æ¶è½¬æ¢ if (item.BarcodeUnit != item.Unit) { var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, item.Unit, item.BarcodeUnit); barModel.Unit = convertResult.Unit; barModel.Qty = convertResult.Quantity; } detailModel.Qty += barModel.Qty; detailModel.Barcodes.Add(barModel); detailModel.Qty += barModel.Qty; detailModel.Barcodes.Add(barModel); } } @@ -1135,25 +1138,28 @@ }; foreach (var item in detailLocks) { var barModel = new WIDESEA_DTO.Outbound.BarcodesModel if (item.PickedQty > 0) { barcode = item.CurrentBarcode, supplyCode = item.SupplyCode, batchNo = item.BatchNo, unit = item.BarcodeUnit, qty = item.PickedQty }; // åä½ä¸ä¸è´æ¶è½¬æ¢ if (item.BarcodeUnit != item.Unit) { var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, item.Unit, item.BarcodeUnit); barModel.unit = convertResult.Unit; barModel.qty = convertResult.Quantity; } var barModel = new WIDESEA_DTO.Outbound.BarcodesModel { barcode = item.CurrentBarcode, supplyCode = item.SupplyCode, batchNo = item.BatchNo, unit = item.BarcodeUnit, qty = item.PickedQty }; // åä½ä¸ä¸è´æ¶è½¬æ¢ if (item.BarcodeUnit != item.Unit) { var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, item.Unit, item.BarcodeUnit); barModel.unit = convertResult.Unit; barModel.qty = convertResult.Quantity; } detailModel.qty += barModel.qty; detailModel.currentDeliveryQty += barModel.qty; detailModel.barcodes.Add(barModel); detailModel.qty += barModel.qty; detailModel.currentDeliveryQty += barModel.qty; detailModel.barcodes.Add(barModel); } } feedmodel.details.Add(detailModel); }
