合并代码

Demo

2024-03-07 e7864a4dcecba72ccbb06dfb6a3d4a77c65f2a3c

 Wms/Wms/Controllers/DownApiController.cs

@@ -42,12 +42,14 @@
        /// <summary>
        /// 指令下发（出库）
        /// </summary>
        /// <param name="soNo"></param>
        /// <param name="outMode"></param>
        /// <param name="unstackingMode">拆垛方式</param>
        /// <param name="soNo">出库单号</param>
        /// <param name="outMode">出库口</param>
        /// <param name="loadingAddre">装车口</param>
        /// <returns></returns>
        [Authorize]
        [HttpGet]
        public IActionResult IssueOutHouse(string soNo,string outMode)
        public IActionResult IssueOutHouse(string soNo,string unstackingMode, string outMode,string loadingAddre)
        {
            try
            {
@@ -68,7 +70,7 @@
                //    return Ok(new { code = 1, msg = "请选择出库口" });
                //}

                var list = _exNoticeSvc.IssueOutHouse(soNo, outMode,int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl,out string str);
                var list = _exNoticeSvc.IssueOutHouse(soNo,unstackingMode, outMode,loadingAddre, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl,out string str);
                
                return Ok(new { code = 0, msg = str , data = list }); 
                
@@ -332,6 +334,11 @@
                            _exNoticeSvc.ExportSuccess(model.TaskNo,0);
                            return Ok(new WcsModel { StatusCode = 0, Msg = "出库完成" });
                        }
                        else if (model.TaskType == "2")
                        {
                            _exNoticeSvc.RelocationSuccess(model.TaskNo, 0);
                            return Ok(new WcsModel { StatusCode = 0, Msg = "移库完成" });
                        }
                        break;
                    case "2"://盘库完成任务
                        if (model.TaskType == "1")//0：入库 1：出库 3：移库