仓库模块_出库:修正

ZR.Admin.WebApi/Controllers/mes/wms/WmMaterialController.cs

@@ -53,8 +53,8 @@ namespace ZR.Admin.WebApi.Controllers
         {
             var response = _WmMaterialService.GetInfo(Id);
             
-            var info = response.Adapt<WmMaterial>();
-            return SUCCESS(info);
+  
+            return SUCCESS(response);
         }
 
         /// <summary>
@@ -101,7 +101,7 @@ namespace ZR.Admin.WebApi.Controllers
             if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
 
 
-                var response = _WmMaterialService.Delete(idsArr);
+            var response = _WmMaterialService.Delete(idsArr);
 
             return ToResponse(response);
         }

ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs

@@ -0,0 +1,141 @@
+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;
+
+//创建时间：2024-03-18
+namespace ZR.Admin.WebApi.Controllers
+{
+    /// <summary>
+    /// 出货单（物料+客户）
+    /// </summary>
+    [Verify]
+    [Route("mes/wm/WmOutOrder")]
+    public class WmOutOrderController : BaseController
+    {
+        /// <summary>
+        /// 出货单（物料+客户）接口
+        /// </summary>
+        private readonly IWmOutOrderService _WmOutOrderService;
+
+        public WmOutOrderController(IWmOutOrderService WmOutOrderService)
+        {
+            _WmOutOrderService = WmOutOrderService;
+        }
+
+        /// <summary>
+        /// 查询出货单（物料+客户）列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("list")]
+        [ActionPermissionFilter(Permission = "business:wmoutorder:list")]
+        public IActionResult QueryWmOutOrder([FromQuery] WmOutOrderQueryDto parm)
+        {
+            var response = _WmOutOrderService.GetList(parm);
+            
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 查询出货单（物料+客户）详情
+        /// </summary>
+        /// <param name="ShipmentNum"></param>
+        /// <returns></returns>
+        [HttpGet("{ShipmentNum}")]
+        [ActionPermissionFilter(Permission = "business:wmoutorder:query")]
+        public IActionResult GetWmOutOrder(string ShipmentNum)
+        {
+            var response = _WmOutOrderService.GetInfo(ShipmentNum);
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 添加出货单（物料+客户）
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ActionPermissionFilter(Permission = "business:wmoutorder:add")]
+        [Log(Title = "出货单（物料+客户）", BusinessType = BusinessType.INSERT)]
+        public IActionResult AddWmOutOrder([FromBody] WmOutOrder_materialDto parm)
+        {
+            if(parm == null)
+            {
+                return SUCCESS(null);
+            }
+            var modal = parm.ToCreate(HttpContext);
+
+            var response = _WmOutOrderService.AddWmOutOrder(modal);
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 更新出货单（物料+客户）
+        /// </summary>
+        /// <returns></returns>
+        [HttpPut]
+        [ActionPermissionFilter(Permission = "business:wmoutorder:edit")]
+        [Log(Title = "出货单（物料+客户）", BusinessType = BusinessType.UPDATE)]
+        public IActionResult UpdateWmOutOrder([FromBody] WmOutOrderDto parm)
+        {
+            var modal = parm.Adapt<WmOutOrder>().ToUpdate(HttpContext);
+            var response = _WmOutOrderService.UpdateWmOutOrder(modal);
+
+            return ToResponse(response);
+        }
+
+        /// <summary>
+        /// 删除出货单（物料+客户）
+        /// </summary>
+        /// <returns></returns>
+        [HttpDelete("{ids}")]
+        [ActionPermissionFilter(Permission = "business:wmoutorder:delete")]
+        [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(","));
+
+            return ToResponse(response);
+        }
+
+        /// <summary>
+        /// 获取客户信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("getcustom_list")]
+        public IActionResult GetWmOutOrder()
+        {
+            List<WmCustom>  customs= _WmOutOrderService.GetCustominfo();
+          
+            return SUCCESS(customs);
+        }
+
+        /// <summary>
+        /// 查询物料记录表列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("getmaterial_list")]
+  
+        public IActionResult QueryWmMaterial([FromQuery] WmMaterialQueryDto parm)
+        {
+            var response = _WmOutOrderService.GetmaterialList(parm);
+            return SUCCESS(response);
+        }
+
+
+
+
+
+    }
+}

ZR.Admin.WebApi/ZR.Admin.WebApi.csproj

@@ -48,6 +48,7 @@
 	<ItemGroup>
 		<Folder Include="Properties\PublishProfiles\" />
 		<Folder Include="wwwroot\export\" />
+		<Folder Include="wwwroot\Generatecode\" />
 		<Folder Include="wwwroot\workorder\" />
 		<Folder Include="wwwroot\workplan\" />
 	</ItemGroup>

ZR.Admin.WebApi/appsettings.development.json

@@ -11,7 +11,7 @@
     {
 
       //外网连接服务器
-      "Conn": "Data Source=127.0.0.1;User ID=root;Password=123456;Initial Catalog=ZrAdmin;",
+      "Conn": "Data Source=localhost;User ID=root;Password=123456;Initial Catalog=ZrAdmin;",
 
       //外网连接服务器
       //"Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog=ZrAdmin;",