diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index 3dfa04c8..173e890a 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -562,7 +562,7 @@ namespace Tnb.WarehouseMgr
                 if (curEleDs?.Count > 0)
                 {
                     //当前电梯
-                    var curEle = await _db.Queryable<WmsElevatorH>().SingleAsync(it => it.id == curEleDs.First().bill_id && it.status == 1) ?? throw new AppFriendlyException("电梯被禁用", 500);
+                    var curEle = await _db.Queryable<WmsElevatorH>().SingleAsync(it => it.id == curEleDs.First().bill_id && it.status == 1) ?? throw new AppFriendlyException("电梯被禁用或未配置", 500);
                     //同电梯组电梯
                     var sGpEle = await _db.Queryable<WmsElevatorH>().Where(it => it.elevator_group == curEle.elevator_group && it.id != curEle.id && it.status == 1).ToListAsync();
                     //判断电梯组中各电梯任务数
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
index d0456106..bd9f01fc 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
@@ -110,8 +110,8 @@ namespace Tnb.WarehouseMgr
                             if (carryCodesPart?.Count > 0)
                             {
 
-                                carryCodes.AddRange(carryCodesPart);
-                                var codeQty = carryCodes.Sum(x => x.codeqty);
+                                
+                                var codeQty = carryCodesPart.Sum(x => x.codeqty);
                                 if (codeQty < os.pr_qty)
                                 {
                                     throw new AppFriendlyException($"需要出库[{os.pr_qty}],实际库存{codeQty},数量不足", 500);
@@ -132,6 +132,7 @@ namespace Tnb.WarehouseMgr
                                         break;
                                     }
                                 }
+                                carryCodes.AddRange(curCarryCodes);
                                 var partCarryMats = curCarryCodes.Adapt<List<WmsCarryMat>>();
                                 for (int i = 0; i < partCarryMats.Count; i++)
                                 {
@@ -655,6 +656,7 @@ namespace Tnb.WarehouseMgr
                                     osd.qty += dic[osd.id].Sum(d => d);
                                     if (osd.qty >= osd.pr_qty)
                                     {
+                                        osd.qty = osd.pr_qty;
                                         osd.line_status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID;
                                     }
                                     else
@@ -704,9 +706,8 @@ namespace Tnb.WarehouseMgr
                                         await _db.Updateable(carryCode).UpdateColumns(it => it.codeqty).ExecuteCommandAsync();
                                     }
                                 }
-                                await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { out_status = ((int)EnumOutStatus.正常).ToString() }).Where(it => input.carryIds.Contains(it.id)).ExecuteCommandAsync();
+                                var row = await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { out_status = ((int)EnumOutStatus.正常).ToString() }).Where(it => input.carryIds.Contains(it.id)).ExecuteCommandAsync();
                                 await _db.Deleteable<WmsCarryMat>().Where(it => input.carryIds.Contains(it.carry_id)).ExecuteCommandAsync();
-
                             }
                             if (delBarcodes.Count > 0)
                             {