提交

pan

2025-12-02 366fe40a67783f7f22d13f59f9863c2cb6eac5b5

 ÏîÄ¿´úÂë/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,6 +1054,8 @@
                            };
                            foreach (var item in detailLocks)
                            {
                                if (item.PickedQty > 0)
                                {
                                var barModel = new BarcodeInfo
                                {
                                    Barcode = item.CurrentBarcode,
@@ -1072,6 +1074,7 @@

                                detailModel.Qty += barModel.Qty;
                                detailModel.Barcodes.Add(barModel);
                                }
                            }


@@ -1135,6 +1138,8 @@
                            };
                            foreach (var item in detailLocks)
                            {
                                if (item.PickedQty > 0)
                                {
                                var barModel = new WIDESEA_DTO.Outbound.BarcodesModel
                                {
                                    barcode = item.CurrentBarcode,
@@ -1155,6 +1160,7 @@
                                detailModel.currentDeliveryQty += barModel.qty;
                                detailModel.barcodes.Add(barModel);
                            }
                            }
                            feedmodel.details.Add(detailModel);
                        }
                        var result = await _invokeMESService.FeedbackOutbound(feedmodel);