修改问题

wxw

9 小时以前 54c9cb77e93d08bc330b9a421e6232b7f7bba57a

 Wms/Wms/Controllers/DownApiController.cs

@@ -131,7 +131,7 @@
                {
                    var list = _exNoticeSvc.IssueOutHouseMk(soNo, outMode, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);

                    return Ok(new { code = 0, msg = "str" });
                    return Ok(new { code = 0, msg = str });
                }
                else if (house == "W02")
                {
@@ -159,7 +159,7 @@
        /// <param name="outMode">出库地址（平库拣货位）</param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult PDAIssueOut(string soNo, string soDetailId,string outMode)
        public IActionResult PDAIssueOut(string soNo, string soDetailId,string palletNo,string outMode)
        {
            try
            {
@@ -174,23 +174,38 @@
                {
                    return Ok(new HttpReturnModel { Success = "-1", Message = "未获取到当前操作人信息"});
                }
                //验证出库口
                if (string.IsNullOrWhiteSpace(outMode))
                {
                    return Ok(new HttpReturnModel { Success = "-1", Message = "请选择出库地址" });
                }
                
                var house = _exNoticeSvc.GetHouseBySo(soNo);
                if (house != "W01")
                { 
                    house= _exNoticeSvc.GetHouseByPalletNo(palletNo);
                }
                if (house == "W01")
                {
                    //验证出库口
                    if (string.IsNullOrWhiteSpace(outMode))
                    {
                        return Ok(new HttpReturnModel { Success = "-1", Message = "请选择出库地址" });
                    }
                    //var list = _exNoticeSvc.IssueOutHouseMk(soNo, outMode, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);

                    return Ok(new HttpReturnModel { Success = "0", Message = "str", Data = "list" });
                }
                else if (house == "W02")
                {
                    var list = _exNoticeSvc.IssueOutHouseLk(soNo, outMode, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);
                    //验证出库口
                    if (string.IsNullOrWhiteSpace(outMode))
                    {
                        return Ok(new HttpReturnModel { Success = "-1", Message = "请选择出库地址" });
                    }
                    var list = _http.IssueOutHouseLk(soNo, soDetailId, outMode, palletNo, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);

                    return Ok(new HttpReturnModel { Success = "0", Message = str, Data = list});
                    return Ok(new HttpReturnModel { Success = "0", Message = str, Data = list });
                }
                else if (house == "W04")
                {
                    _http.IssueOutHousePk(soNo, soDetailId, palletNo, int.Parse(userId));
                    return Ok(new HttpReturnModel { Success = "0", Message = "下发成功" });
                }
                else
                {
@@ -327,6 +342,40 @@
        #endregion

        #region WMS接口 被下游系统接口调用

        /// <summary>
        /// WCS申请空托跺组托入库 （叠托盘机）
        /// </summary>
        /// <param name="model">入库单信息</param>
        /// <returns></returns>
        [AllowAnonymous]
        [HttpPost]
        public IActionResult RequestPalletIn(RequestLocate model)
        {
            var logStr = "";

            logStr = $@".\log\WCS\WCS申请空托跺组托入库" + DateTime.Now.ToString("yyyyMMdd") + ".txt";

            try
            {

                var jsonData = JsonConvert.SerializeObject(model);
                LogFile.SaveLogToFile($"WCS申请空托跺组托入库：( {jsonData} ),", logStr);

                var list = _http.RequestPalletIn(model.PalletNo, model.HouseNo, model.PallNum,model.locate);

                LogFile.SaveLogToFile($"WCS申请空托跺组托入库返回：( {JsonConvert.SerializeObject(list)} ),", logStr);

                return Ok(new { Success = 0, Message = "申请巷道成功", TaskList = list });
            }
            catch (Exception e)
            {
                LogFile.SaveLogToFile($"WCS申请空托跺组托入库返回：( {e.Message} ),", logStr);

                return Ok(new ErpModel { Success = -1, Message = e.Message });
            }
        }


        /// <summary>
        /// PDA 人工申请储位 （立体库）
@@ -545,7 +594,7 @@


        /// <summary>
        /// 接受wcs返回的信号 //指令反馈（是否完成）
        /// 手动完成的信号 //指令反馈（是否完成）
        /// </summary>
        /// <returns></returns>
        [HttpPost]