PDA拼箱，多箱拼箱

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

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
+using ZR.Admin.WebApi.Extensions;
 using ZR.Model.MES.wms;
 using ZR.Model.MES.wms.Dto;
 using ZR.Service.mes.wms.IService;
@@ -58,6 +59,8 @@ namespace ZR.Admin.WebApi.Controllers
         {
             try
             {
+                string createName = HttpContext.GetName();
+                parm.CreateBy = createName;
                 WmGoodsChangeLog response = _WmGoodsActionService.doUnpackingGoods(parm);
                 if (response == null)
                 {
@@ -71,5 +74,30 @@ namespace ZR.Admin.WebApi.Controllers
             }
 
         }
+
+        /// <summary>
+        /// 拼箱2 多箱拼一起
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("doConsolidationGoods2")]
+        [Log(Title = "拼箱", BusinessType = BusinessType.UPDATE)]
+        public IActionResult DoConsolidationGoods2([FromBody] WmGoodsConsolidationDto2 parm)
+        {
+            try
+            {
+                string createName = HttpContext.GetName();
+                parm.CreateBy = createName;
+                WmGoodsChangeLog response = _WmGoodsActionService.DoConsolidationGoods2(parm);
+                if (response == null)
+                {
+                    return ToResponse(new ApiResult(500, "拼箱异常！", "拼箱异常！"));
+                }
+                return SUCCESS(response);
+            }
+            catch (Exception ex)
+            {
+                return ToResponse(new ApiResult(500, ex.Message, "拼箱异常！" + ex.Message));
+            }
+        }
     }
 }