From 82b945658f63376e3a68a5eff99053794f47f0cb Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Thu, 28 Mar 2024 09:12:17 +0800 Subject: [PATCH] 111 --- .../Controllers/mes/wms/WmOutOrderController.cs | 13 +++++++++++-- ZR.Service/mes/wms/IService/IWmOutOrderService.cs | 2 ++ ZR.Service/mes/wms/WmOutOrderService.cs | 6 ++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs index 0ad38499..7108b450 100644 --- a/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs @@ -212,11 +212,20 @@ namespace ZR.Admin.WebApi.Controllers /// 出库单号 /// [HttpGet("checkProductionOut")] - public IActionResult checkProductionOut(string production_packcode = "", string shipment_num = "") + public IActionResult CheckProductionOut(string production_packcode = "", string shipment_num = "") { string msg = "可出库"; + if(shipment_num == ""|| production_packcode=="") { + return SUCCESS(null); - return ToResponse(new ApiResult(200, msg, true)); + } + bool status=_WmOutOrderService.CheckProductionOut(production_packcode, shipment_num); + if(!status) + { + msg = "箱子,不在出库单内,不得出库"; + } + + return ToResponse(new ApiResult(200, msg, status)); } } diff --git a/ZR.Service/mes/wms/IService/IWmOutOrderService.cs b/ZR.Service/mes/wms/IService/IWmOutOrderService.cs index 6e26ca1f..a170a080 100644 --- a/ZR.Service/mes/wms/IService/IWmOutOrderService.cs +++ b/ZR.Service/mes/wms/IService/IWmOutOrderService.cs @@ -35,6 +35,8 @@ namespace ZR.Service.mes.wms.IService bool OverOutorderplan(string shipment_num); + bool CheckProductionOut(string production_packcode, string shipment_num); + } } diff --git a/ZR.Service/mes/wms/WmOutOrderService.cs b/ZR.Service/mes/wms/WmOutOrderService.cs index 7057eda4..15c3b04d 100644 --- a/ZR.Service/mes/wms/WmOutOrderService.cs +++ b/ZR.Service/mes/wms/WmOutOrderService.cs @@ -474,5 +474,11 @@ namespace ZR.Service.mes.wms string temp = bath_code.Split("_")[0]; return "20" + temp.Substring(2, 6); } + + + public bool CheckProductionOut(string production_packcode, string shipment_num) + { + + } } } \ No newline at end of file