diff --git a/ZR.Service/mes/wms/WmGoodsActionService.cs b/ZR.Service/mes/wms/WmGoodsActionService.cs
index 4461739f..0cfb5e98 100644
--- a/ZR.Service/mes/wms/WmGoodsActionService.cs
+++ b/ZR.Service/mes/wms/WmGoodsActionService.cs
@@ -26,7 +26,6 @@ namespace ZR.Service.Business
         public WmGoodsChangeLog doConsolidationGoods(WmGoodsConsolidationDto parm)
         {
             List<ResultionPackageCodeDto> list = parm.PackageList;
-
             string description = "";
             // 拼箱计数器
             int num = 0;
diff --git a/ZR.Service/mes/wms/WmOutOrderService.cs b/ZR.Service/mes/wms/WmOutOrderService.cs
index aa7bd6f7..b32c23da 100644
--- a/ZR.Service/mes/wms/WmOutOrderService.cs
+++ b/ZR.Service/mes/wms/WmOutOrderService.cs
@@ -589,15 +589,15 @@ namespace ZR.Service.mes.wms
                     return "此箱子不在选择的物料号";
                 }
 
-                // 3.判断是否已入库
-                //bool isExistedWarehouse = Context.Queryable<WmGoodsNowProduction>().Where(it => it.PackageCodeClient == resultionPackage.PatchCode).Any();
-                //if (!isExistedWarehouse)
-                //{
-                //    return "该箱号未入库！请先入库";
-                //}
+                // 3.1判断是否已入库
+                bool isExistedWarehouse = Context.Queryable<WmGoodsNowProduction>().Where(it => it.PackageCodeClient == resultionPackage.PatchCode).Any();
+                if (!isExistedWarehouse)
+                {
+                    return "该箱号未入库！请先入库";
+                }
 
                 // 4.获取出库单号对应的出库计划
-                List<WmOutOrderPlan> orderPlans = Generate_outorderplan(shipment_num);
+                // List<WmOutOrderPlan> orderPlans = Generate_outorderplan(shipment_num);
                 // 5.配对是否符合出库条件
                 //foreach (var orderPlan in orderPlans)
                 //{