Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxia...

pan

2025-12-02 991673416fdeb3a4be2837bfd70ba6284ad314d5

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -831,17 +831,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; // æ–°å»º
@@ -1055,7 +1055,7 @@
                            };
                            foreach (var item in detailLocks)
                            {
                                var barModel = new BarcodeInfo
                                if (item.PickedQty > 0)
                                {
                                    Barcode = item.CurrentBarcode,
                                    SupplyCode = item.SupplyCode,
@@ -1139,8 +1139,29 @@
                            };
                            foreach (var item in detailLocks)
                            {
                                var barModel = new WIDESEA_DTO.Outbound.BarcodesModel
                                if (item.PickedQty > 0)
                                {
<<<<<<< .mine
                                    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);
=======
                                    barcode = item.CurrentBarcode,
                                    supplyCode = item.SupplyCode,
                                    batchNo = item.BatchNo,
@@ -1153,7 +1174,25 @@
                                    var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, detail.Unit, detail.BarcodeUnit);
                                    barModel.unit = convertResult.Unit;
                                    barModel.qty = convertResult.Quantity;







>>>>>>> .theirs
                                }
<<<<<<< .mine








=======
                                else
                                {
                                    barModel.qty = item.PickedQty;
@@ -1162,6 +1201,7 @@
                                    detailModel.qty += barModel.qty;
                                detailModel.currentDeliveryQty += barModel.qty;
                                detailModel.barcodes.Add(barModel);
>>>>>>> .theirs
                            }
                            feedmodel.details.Add(detailModel);
                        }