仓库-仓库拼箱拆箱待打印记录功能添加

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

@@ -37,12 +37,18 @@ namespace ZR.Admin.WebApi.Controllers
         [Log(Title = "拼箱", BusinessType = BusinessType.UPDATE)]
         public IActionResult doConsolidationGoods([FromBody] WmGoodsConsolidationDto parm)
         {
-            WmGoodsChangeLog response = _WmGoodsActionService.doConsolidationGoods(parm);
-            if(response == null)
+            try
             {
-               return ToResponse(new ApiResult(500, "拼箱异常！", "拼箱异常！"));
+                WmGoodsChangeLog response = _WmGoodsActionService.doConsolidationGoods(parm);
+                if (response == null)
+                {
+                    return ToResponse(new ApiResult(500, "拼箱异常！", "拼箱异常！"));
+                }
+                return SUCCESS(response);
+            }catch (Exception ex)
+            {
+                return ToResponse(new ApiResult(500, ex.Message, "拼箱异常！"));
             }
-            return SUCCESS(response);
         }
 
         /// <summary>
@@ -53,8 +59,20 @@ namespace ZR.Admin.WebApi.Controllers
         [Log(Title = "拆箱", BusinessType = BusinessType.UPDATE)]
         public IActionResult doUnpackingGoods([FromBody] WmGoodsUnpackingDto parm)
         {
-            WmGoodsChangeLog response = _WmGoodsActionService.doUnpackingGoods(parm);
-            return SUCCESS(response);
+            try
+            {
+                WmGoodsChangeLog response = _WmGoodsActionService.doUnpackingGoods(parm);
+                if (response == null)
+                {
+                    return ToResponse(new ApiResult(500, "拆箱异常！", "拆箱异常！"));
+                }
+                return SUCCESS(response);
+            }
+            catch (Exception ex)
+            {
+                return ToResponse(new ApiResult(500, ex.Message, "拆箱异常！"));
+            }
+            
         }
     }
 }

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

@@ -248,6 +248,7 @@ namespace ZR.Admin.WebApi.Controllers
         /// 
         /// </returns>
         [HttpPost("doMaterialOut")]
+        [Log(Title = "出库", BusinessType = BusinessType.INSERT)]
         public IActionResult DoMaterialOut([FromBody] WmDoMaterialOut_Dto doMaterialOut)
         {
             if (doMaterialOut == null || doMaterialOut.ShipmentNum == null)

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

@@ -0,0 +1,108 @@
+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/WmPackageLcl")]
+    public class WmPackageLclController : BaseController
+    {
+        /// <summary>
+        /// 拼箱/拆箱待打标签记录表接口
+        /// </summary>
+        private readonly IWmPackageLclService _WmPackageLclService;
+
+        public WmPackageLclController(IWmPackageLclService WmPackageLclService)
+        {
+            _WmPackageLclService = WmPackageLclService;
+        }
+
+        /// <summary>
+        /// 查询拼箱/拆箱待打标签记录表列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("list")]
+        [ActionPermissionFilter(Permission = "business:wmpackagelcl:list")]
+        public IActionResult QueryWmPackageLcl([FromQuery] WmPackageLclQueryDto parm)
+        {
+            var response = _WmPackageLclService.GetList(parm);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 查询拼箱/拆箱待打标签记录表详情
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [HttpGet("{Id}")]
+        [ActionPermissionFilter(Permission = "business:wmpackagelcl:query")]
+        public IActionResult GetWmPackageLcl(string Id)
+        {
+            var response = _WmPackageLclService.GetInfo(Id);
+
+            var info = response.Adapt<WmPackageLcl>();
+            return SUCCESS(info);
+        }
+
+        /// <summary>
+        /// 添加拼箱/拆箱待打标签记录表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ActionPermissionFilter(Permission = "business:wmpackagelcl:add")]
+        [Log(Title = "拼箱/拆箱待打标签记录表", BusinessType = BusinessType.INSERT)]
+        public IActionResult AddWmPackageLcl([FromBody] WmPackageLclDto parm)
+        {
+            var modal = parm.Adapt<WmPackageLcl>().ToCreate(HttpContext);
+
+            var response = _WmPackageLclService.AddWmPackageLcl(modal);
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 更新拼箱/拆箱待打标签记录表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPut]
+        [ActionPermissionFilter(Permission = "business:wmpackagelcl:edit")]
+        [Log(Title = "拼箱/拆箱待打标签记录表", BusinessType = BusinessType.UPDATE)]
+        public IActionResult UpdateWmPackageLcl([FromBody] WmPackageLclDto parm)
+        {
+            var modal = parm.Adapt<WmPackageLcl>().ToUpdate(HttpContext);
+            var response = _WmPackageLclService.UpdateWmPackageLcl(modal);
+
+            return ToResponse(response);
+        }
+
+        /// <summary>
+        /// 删除拼箱/拆箱待打标签记录表
+        /// </summary>
+        /// <returns></returns>
+        [HttpDelete("{ids}")]
+        [ActionPermissionFilter(Permission = "business:wmpackagelcl:delete")]
+        [Log(Title = "拼箱/拆箱待打标签记录表", BusinessType = BusinessType.DELETE)]
+        public IActionResult DeleteWmPackageLcl(string ids)
+        {
+            // int[] idsArr = Tools.SpitIntArrary(ids);
+            string[] idsArr = ids.Split(',');
+            if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败,Id 不能为空")); }
+
+            var response = _WmPackageLclService.Delete(idsArr);
+
+            return ToResponse(response);
+        }
+    }
+}