From c1375ad7afee6eee070615b180ee47fbc4ead638 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: Thu, 18 Apr 2024 11:34:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93-=E6=8B=BC=E7=AE=B1=EF=BC=8C?=
 =?UTF-8?q?=E6=8B=86=E7=AE=B1=E5=9F=BA=E7=A1=80=E4=BB=A3=E7=A0=81=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/wms/WmGoodsActionController.cs        | 56 +++++++++++++++++++
 .../mes/wms/WmGoodsChangeLogController.cs     |  2 +-
 ZR.Model/MES/wms/Dto/WmGoodsActionDto.cs      | 22 ++++++++
 .../mes/wms/IService/IWmGoodsActionService.cs | 20 +++++++
 .../wms/IService/IWmGoodsChangeLogService.cs  |  1 +
 ZR.Service/mes/wms/WmGoodsActionService.cs    | 32 +++++++++++
 6 files changed, 132 insertions(+), 1 deletion(-)
 create mode 100644 ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsActionController.cs
 create mode 100644 ZR.Model/MES/wms/Dto/WmGoodsActionDto.cs
 create mode 100644 ZR.Service/mes/wms/IService/IWmGoodsActionService.cs
 create mode 100644 ZR.Service/mes/wms/WmGoodsActionService.cs

diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsActionController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsActionController.cs
new file mode 100644
index 00000000..c02237a9
--- /dev/null
+++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsActionController.cs
@@ -0,0 +1,56 @@
+using Microsoft.AspNetCore.Mvc;
+using ZR.Model.Dto;
+using ZR.Service.Business.IBusinessService;
+using ZR.Admin.WebApi.Extensions;
+using ZR.Admin.WebApi.Filters;
+using ZR.Model.MES.wms.Dto;
+using ZR.Service.mes.wms.IService;
+using ZR.Model.MES.wms;
+
+//创建时间：2024-04-18
+namespace ZR.Admin.WebApi.Controllers
+{
+    /// <summary>
+    /// 仓库操作
+    /// </summary>
+    [Verify]
+    [Route("/mes/wm/WmGoodsAction")]
+    public class WmGoodsActionController : BaseController
+    {
+        /// <summary>
+        /// 仓库操作
+        /// </summary>
+        private readonly IWmGoodsChangeLogService _WmGoodsChangeLogService;
+        private readonly IWmGoodsActionService _WmGoodsActionService;
+
+        public WmGoodsActionController(IWmGoodsChangeLogService WmGoodsChangeLogService, IWmGoodsActionService wmGoodsActionService)
+        {
+            _WmGoodsChangeLogService = WmGoodsChangeLogService;
+            _WmGoodsActionService = wmGoodsActionService;
+        }
+
+        /// <summary>
+        /// 拼箱
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("doConsolidationGoods")]
+        [Log(Title = "拼箱", BusinessType = BusinessType.UPDATE)]
+        public IActionResult doConsolidationGoods([FromBody] WmGoodsConsolidationDto parm)
+        {
+            WmGoodsChangeLog response = _WmGoodsActionService.doConsolidationGoods(parm);
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 拆箱
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("doUnpackingGoods")]
+        [Log(Title = "拆箱", BusinessType = BusinessType.UPDATE)]
+        public IActionResult doUnpackingGoods([FromBody] WmGoodsUnpackingDto parm)
+        {
+            WmGoodsChangeLog response = _WmGoodsActionService.doUnpackingGoods(parm);
+            return SUCCESS(response);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsChangeLogController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsChangeLogController.cs
index 6cd38041..7fc239f2 100644
--- a/ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsChangeLogController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsChangeLogController.cs
@@ -14,7 +14,7 @@ namespace ZR.Admin.WebApi.Controllers
     /// 仓库操作日志
     /// </summary>
     [Verify]
-    [Route("business/WmGoodsChangeLog")]
+    [Route("/mes/wm/WmGoodsChangeLog")]
     public class WmGoodsChangeLogController : BaseController
     {
         /// <summary>
diff --git a/ZR.Model/MES/wms/Dto/WmGoodsActionDto.cs b/ZR.Model/MES/wms/Dto/WmGoodsActionDto.cs
new file mode 100644
index 00000000..78250d49
--- /dev/null
+++ b/ZR.Model/MES/wms/Dto/WmGoodsActionDto.cs
@@ -0,0 +1,22 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace ZR.Model.MES.wms.Dto
+{
+    /// <summary>
+    /// 拼箱操作
+    /// </summary>
+    public class WmGoodsConsolidationDto
+    {
+        public List<ResultionPackageCodeDto> List { get; set; }
+
+    }
+
+    /// <summary>
+    /// 拆箱操作
+    /// </summary>
+    public class WmGoodsUnpackingDto
+    {
+        public List<ResultionPackageCodeDto> List { get; set; }
+
+    }
+}
\ No newline at end of file
diff --git a/ZR.Service/mes/wms/IService/IWmGoodsActionService.cs b/ZR.Service/mes/wms/IService/IWmGoodsActionService.cs
new file mode 100644
index 00000000..1fc9eadf
--- /dev/null
+++ b/ZR.Service/mes/wms/IService/IWmGoodsActionService.cs
@@ -0,0 +1,20 @@
+using System;
+using ZR.Model;
+using ZR.Model.Dto;
+using ZR.Model.MES.wms;
+using System.Collections.Generic;
+using ZR.Model.MES.wms.Dto;
+
+namespace ZR.Service.mes.wms.IService
+{
+    /// <summary>
+    /// 仓库操作日志service接口
+    /// </summary>
+    public interface IWmGoodsActionService : IBaseService<WmGoodsChangeLog>
+    {
+
+        WmGoodsChangeLog doConsolidationGoods(WmGoodsConsolidationDto parm);
+        WmGoodsChangeLog doUnpackingGoods(WmGoodsUnpackingDto parm);
+
+    }
+}
diff --git a/ZR.Service/mes/wms/IService/IWmGoodsChangeLogService.cs b/ZR.Service/mes/wms/IService/IWmGoodsChangeLogService.cs
index 1c17d0ef..c80b45b3 100644
--- a/ZR.Service/mes/wms/IService/IWmGoodsChangeLogService.cs
+++ b/ZR.Service/mes/wms/IService/IWmGoodsChangeLogService.cs
@@ -14,6 +14,7 @@ namespace ZR.Service.mes.wms.IService
     {
         PagedInfo<WmGoodsChangeLogDto> GetList(WmGoodsChangeLogQueryDto parm);
 
+
         WmGoodsChangeLog GetInfo(int Id);
 
         WmGoodsChangeLog AddWmGoodsChangeLog(WmGoodsChangeLog parm);
diff --git a/ZR.Service/mes/wms/WmGoodsActionService.cs b/ZR.Service/mes/wms/WmGoodsActionService.cs
new file mode 100644
index 00000000..66bc2c65
--- /dev/null
+++ b/ZR.Service/mes/wms/WmGoodsActionService.cs
@@ -0,0 +1,32 @@
+using System;
+using SqlSugar;
+using Infrastructure.Attribute;
+using Infrastructure.Extensions;
+using ZR.Model;
+using ZR.Model.Dto;
+using ZR.Model.MES.wms;
+using ZR.Repository;
+using ZR.Service.Business.IBusinessService;
+using System.Linq;
+using ZR.Service.mes.wms.IService;
+using ZR.Model.MES.wms.Dto;
+
+namespace ZR.Service.Business
+{
+    /// <summary>
+    /// 仓库操作日志Service业务层处理
+    /// </summary>
+    [AppService(ServiceType = typeof(IWmGoodsActionService), ServiceLifetime = LifeTime.Transient)]
+    public class WmGoodsActionService : BaseService<WmGoodsChangeLog>, IWmGoodsActionService
+    {
+        public WmGoodsChangeLog doConsolidationGoods(WmGoodsConsolidationDto parm)
+        {
+            throw new NotImplementedException();
+        }
+
+        public WmGoodsChangeLog doUnpackingGoods(WmGoodsUnpackingDto parm)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file