From d86921a083de75e0873be9c5126d4bf4b8ef8635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Wed, 24 Apr 2024 16:44:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93-=E5=87=BA=E5=BA=93=E5=88=A4?= =?UTF-8?q?=E5=AE=9A=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=B3=A8=E9=87=8A=E8=A1=8C?= =?UTF-8?q?=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Service/mes/wms/WmGoodsActionService.cs | 1 - ZR.Service/mes/wms/WmOutOrderService.cs | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) 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 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().Where(it => it.PackageCodeClient == resultionPackage.PatchCode).Any(); - //if (!isExistedWarehouse) - //{ - // return "该箱号未入库！请先入库"; - //} + // 3.1判断是否已入库 + bool isExistedWarehouse = Context.Queryable().Where(it => it.PackageCodeClient == resultionPackage.PatchCode).Any(); + if (!isExistedWarehouse) + { + return "该箱号未入库！请先入库"; + } // 4.获取出库单号对应的出库计划 - List orderPlans = Generate_outorderplan(shipment_num); + // List orderPlans = Generate_outorderplan(shipment_num); // 5.配对是否符合出库条件 //foreach (var orderPlan in orderPlans) //{