From a5196f42e4e9e1bdfb2e3ed3f55129ed362712c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?=
 <9634538+git_rabbit@user.noreply.gitee.com>
Date: Wed, 27 Mar 2024 17:19:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=8E=A5=E5=8F=A3=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/wms/WmOutOrderController.cs           | 52 +++++++++++--------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs
index bc903795..55c2cfef 100644
--- a/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs
@@ -1,12 +1,9 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Model.Dto;
 using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
-using ZR.Service.mes.wms.IService;
-using ZR.Model.MES.wms.Dto;
 using ZR.Model.MES.wms;
-using ZR.Service.mes.wms;
-using static System.Runtime.InteropServices.JavaScript.JSType;
+using ZR.Model.MES.wms.Dto;
+using ZR.Service.mes.wms.IService;
 
 //创建时间：2024-03-18
 namespace ZR.Admin.WebApi.Controllers
@@ -14,7 +11,7 @@ namespace ZR.Admin.WebApi.Controllers
     /// <summary>
     /// 出货单（物料+客户）
     /// </summary>
-    [Verify]
+    // [Verify]
     [Route("mes/wm/WmOutOrder")]
     public class WmOutOrderController : BaseController
     {
@@ -38,7 +35,7 @@ namespace ZR.Admin.WebApi.Controllers
         public IActionResult QueryWmOutOrder([FromQuery] WmOutOrderQueryDto parm)
         {
             var response = _WmOutOrderService.GetList(parm);
-            
+
             return SUCCESS(response);
         }
 
@@ -65,7 +62,7 @@ namespace ZR.Admin.WebApi.Controllers
         [Log(Title = "出货单（物料+客户）", BusinessType = BusinessType.INSERT)]
         public IActionResult AddWmOutOrder([FromBody] WmOutOrder_materialDto parm)
         {
-            if(parm == null)
+            if (parm == null)
             {
                 return SUCCESS(null);
             }
@@ -100,9 +97,9 @@ namespace ZR.Admin.WebApi.Controllers
         [Log(Title = "出货单（物料+客户）", BusinessType = BusinessType.DELETE)]
         public IActionResult DeleteWmOutOrder(string ids)
         {
-            
+
             if (string.IsNullOrEmpty(ids)) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
-           
+
 
             var response = _WmOutOrderService.Delete(ids.Split(","));
 
@@ -116,8 +113,8 @@ namespace ZR.Admin.WebApi.Controllers
         [HttpGet("getcustom_list")]
         public IActionResult GetWmOutOrder()
         {
-            List<WmCustom>  customs= _WmOutOrderService.GetCustominfo();
-          
+            List<WmCustom> customs = _WmOutOrderService.GetCustominfo();
+
             return SUCCESS(customs);
         }
 
@@ -127,7 +124,7 @@ namespace ZR.Admin.WebApi.Controllers
         /// <param name="parm"></param>
         /// <returns></returns>
         [HttpGet("getmaterial_list")]
-  
+
         public IActionResult QueryWmMaterial([FromQuery] WmMaterialQueryDto parm)
         {
             var response = _WmOutOrderService.GetmaterialList(parm);
@@ -141,7 +138,7 @@ namespace ZR.Admin.WebApi.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet("getoutorder_matrials")]
-        public  IActionResult Queryoutoder_matrials(string shipment_num)
+        public IActionResult Queryoutoder_matrials(string shipment_num)
         {
             if (shipment_num == null)
             {
@@ -159,14 +156,14 @@ namespace ZR.Admin.WebApi.Controllers
         /// <param name="shipment_num"></param>
         /// <returns></returns>
         [HttpGet("generate_outorderplan")]
-        public  IActionResult  Generate_outorderplan(string shipment_num)
+        public IActionResult Generate_outorderplan(string shipment_num)
         {
             if (shipment_num == null)
             {
-                return SUCCESS(null);  
+                return SUCCESS(null);
             }
             // TODO 1.返回值修改为 对象 返回是否可生成计划，计划结果：{canPlan:true,resultList:[]}
-           List<WmOutOrderPlan> WmOutOrderPlanList = _WmOutOrderService.Generate_outorderplan(shipment_num);
+            List<WmOutOrderPlan> WmOutOrderPlanList = _WmOutOrderService.Generate_outorderplan(shipment_num);
 
             return SUCCESS(WmOutOrderPlanList);
         }
@@ -178,14 +175,14 @@ namespace ZR.Admin.WebApi.Controllers
         /// 
         /// </returns>
         [HttpPost("doMaterialOut")]
-        public  IActionResult DoMaterialOut([FromBody] WmDoMaterialOut_Dto   doMaterialOut)
+        public IActionResult DoMaterialOut([FromBody] WmDoMaterialOut_Dto doMaterialOut)
         {
-            if(doMaterialOut == null||doMaterialOut.ShipmentNum==null)
+            if (doMaterialOut == null || doMaterialOut.ShipmentNum == null)
             {
                 return SUCCESS(null);
             }
 
-           (int,int) data= _WmOutOrderService.DoMaterialOut(doMaterialOut, HttpContext.GetName());
+            (int, int) data = _WmOutOrderService.DoMaterialOut(doMaterialOut, HttpContext.GetName());
 
             return SUCCESS(data);
         }
@@ -197,7 +194,7 @@ namespace ZR.Admin.WebApi.Controllers
         /// <param name="shipment_num"></param>
         /// <returns></returns>
         [HttpGet("over_outorderplan")]
-        public  IActionResult OverOutorderplan(string shipment_num)
+        public IActionResult OverOutorderplan(string shipment_num)
         {
             if (shipment_num == null)
             {
@@ -208,5 +205,18 @@ namespace ZR.Admin.WebApi.Controllers
             return SUCCESS(status);
         }
 
+        /// <summary>
+        /// 7 检查是否可出库
+        /// </summary>
+        /// <param name="production_packcode">扫码结果</param>
+        /// <param name="shipment_num">出库单号</param>
+        /// <returns></returns>
+        [HttpGet("checkProductionOut")]
+        public IActionResult checkProductionOut(string production_packcode = "", string shipment_num = "")
+        {
+            string msg = "可出库";
+            return ToResponse(new ApiResult(200, msg, true));
+        }
+
     }
 }
\ No newline at end of file