修改客户需求

zhaowc

2025-02-28 157abc191c34e57c1b958ae74fc3de6518ca8a30

 Wms/Wms/Controllers/DownApiController.cs

@@ -17,6 +17,7 @@
using Model.ModelVm.PdaVm;
using WMS.IBLL.IPdaServer;
using Model.ModelVm;
using WMS.IBLL.IDataServer;

namespace Wms.Controllers
{
@@ -34,8 +35,10 @@
        private readonly ITaskServer _taskSvc;//任务Svc 
        private readonly IPdaSoServer _pdaSoSvc;//空托出库Svc
        private readonly IPdaAsnServer _paAsnSvc;//空托跺绑定
        private readonly IStockServer _stockSvc;//AGV任务完成箅
        private readonly IPdaCrServer _pdaCrServer; // PDA任务调度

        public DownApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IPalletBindServer asnPalletBindSvc, IStockCheckServer crCheckSvc, ITaskServer taskSvc, IPdaSoServer pdaSoSvc,IPdaAsnServer paAsnSvc)
        public DownApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IPalletBindServer asnPalletBindSvc, IStockCheckServer crCheckSvc, ITaskServer taskSvc, IPdaSoServer pdaSoSvc,IPdaAsnServer paAsnSvc,IStockServer stockSvc,IPdaCrServer pdaCrServer)
        {
            _config = setting.Value;
            _exNoticeSvc = exNoticeSvc;
@@ -44,6 +47,8 @@
            _taskSvc = taskSvc;
            _pdaSoSvc = pdaSoSvc;
            _paAsnSvc = paAsnSvc;
            _stockSvc = stockSvc;
            _pdaCrServer = pdaCrServer;
        }

        #region WMS接口 调用下游系统接口 
@@ -361,20 +366,20 @@
                }
                //接收时间
                var time1 = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                var orderType = _taskSvc.GetTaskOrderType(model.TaskNo);// 判断单据类型入出移
                var orderType = _taskSvc.GetTaskOrderType(model.TaskNo,model.TaskType);// 判断单据类型入出移
                switch (orderType)
                {
                    case "0"://入库完成任务
                        if (model.TaskType == "0")//0：入库 1：出库 2：移库
                        {
                            _asnPalletBindSvc.ArrivalSuccess(model.TaskNo, 0);
                            return Ok(new WcsModel { StatusCode = 0, Msg = "入库完成" });
                            return Ok(new WcsModel { StatusCode = 0, Msg = "入库完成" });                                               
                        }
                        break;
                    case "1"://出库完成任务
                        if (model.TaskType == "1")//0：入库 1：出库 2：移库
                        {
                            _exNoticeSvc.ExportSuccess(model.TaskNo, 0);
                            _exNoticeSvc.ExportSuccess(model.TaskNo, 0, _config.AgvHost + _config.GenAgvSchedulingTask);
                            return Ok(new WcsModel { StatusCode = 0, Msg = "出库完成" });
                        }
                        else if (model.TaskType == "2")
@@ -429,7 +434,7 @@
                var bl = _exNoticeSvc.EmptyException(model);

                LogFile.SaveLogToFile($"空取异常：(执行结果成功),", logStr);
                return Ok(new { Success = 0, Message = "" });
                return Ok(new { Success = 0,StatusCode = 0, Message = "" });
            }
            catch (Exception e)
            {
@@ -454,7 +459,7 @@
                var list = _asnPalletBindSvc.FullException(model);

                LogFile.SaveLogToFile($"满入异常：( {JsonConvert.SerializeObject(list)} ),", logStr);
                return Ok(new { Success = 0, Message = "", TaskList = list });
                return Ok(new { Success = 0, StatusCode = 0, Message = "", TaskList = list });
            }
            catch (Exception e)
            {
@@ -549,12 +554,12 @@
        [HttpPost]
        public IActionResult BindPlnInHouseWcs(PalletsBind model)
        {
            var logStr = $@".\log\WCS\WCS申请空托跺绑定" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            var logStr = $@".\log\WCS\WCS又叠托机申请空托入库" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            try
            {
                var strMsg = _paAsnSvc.BindNullPallets(model);

                return Ok(new { Success = 0, Message = "空托跺绑定成功", TaskList = strMsg });
                return Ok(new { Success = 0, Message = "空托跺绑定成功"});
            }
            catch (Exception e)
            {
@@ -588,6 +593,102 @@
            }
        }

        /// <summary>
        /// WMS拣货申请空托出库
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [AllowAnonymous]
        [HttpPost]
        public IActionResult IssuePlnCheckHouseWcs(CheckModePalletVm model)
        {
            var logStr = $@".\log\WCS\WMS拣货申请空托出库" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            try
            {
                string list = _pdaSoSvc.IssuePlnCehckHouseWcs(model, 0,_config.AgvHost+_config.GenAgvSchedulingTask);

                return Ok(new { Success = 0, Message = "拣货叫空托盘成功"});
            }
            catch (Exception e)
            {
                LogFile.SaveLogToFile($"WMS拣货申请空托出库异常返回：( {e.Message} ),", logStr);

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

        /// <summary>
        /// WCS申请是否缠膜
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [AllowAnonymous]
        [HttpPost]
        public IActionResult RequestPackWcs(RequesIsBale model)
        {
            var logStr = $@".\log\WCS\WCS申请缠膜拆膜" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            try
            {
               int t = _asnPalletBindSvc.RequestPackWcs(model.PalletNo);
                LogFile.SaveLogToFile($"WCS申请缠膜入库请求，请求托盘呈：( {model.PalletNo} ),", logStr);

                return Ok(new { Success = t, Message = "缠膜指令发送成功" });
            }
            catch (Exception e)
            {
                LogFile.SaveLogToFile($"WCS申请缠膜入库异常返回：( {e.Message} ),", logStr);

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

        /// <summary>
        /// WCS申请是否拆膜
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [AllowAnonymous]
        [HttpPost]
        public IActionResult RequestUnPackWcs(RequesIsBale model)
        {
            var logStr = $@".\log\WCS\WCS申请缠膜拆膜" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            try
            {
                int t = _asnPalletBindSvc.RequestUnPackWcs(model.PalletNo);

                return Ok(new { Success = t, Message = "拆膜指令发送成功" });
            }
            catch (Exception e)
            {
                LogFile.SaveLogToFile($"WCS申请拆膜出库异常返回：( {e.Message} ),", logStr);

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

        /// <summary>
        /// WCS反馈缠膜完成
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [AllowAnonymous]
        [HttpPost]
        public IActionResult RequestPackedWcs(RequesIsBale model)
        {
            var logStr = $@".\log\WCS\WCS申请缠膜拆膜" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            try
            {
                int t = _asnPalletBindSvc.RequestPackedWcs(model.PalletNo);

                return Ok(new { Success = t, Message = "缠膜完成指令发送成功" });
            }
            catch (Exception e)
            {
                LogFile.SaveLogToFile($"WCS申请缠膜完成异常返回：( {e.Message} ),", logStr);

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

        ///// <summary>
        ///// 成品箱码拆垛拣货
@@ -624,6 +725,60 @@

        //车间叫料

        //WCS申请拆垛信息
        /// <summary>
        /// 成品箱码拆垛拣货
        /// </summary>
        /// <param name="model">入库单信息</param>
        /// <returns></returns>
        [AllowAnonymous]
        [HttpPost]
        public IActionResult ResultBoxInfoCheckWcs(BoxInfoCheck model)
        {
            var logStr = $@".\log\WCS\WCS申请拆垛托盘信息" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            try
            {
                RequestBoxInfoCheck list = _exNoticeSvc.BoxInfoCheckWcs(model);
                return Ok(new { Success = 1,Message = "拆垛信息获取成功",data = list});
            }
            catch  (Exception e)
            {
                LogFile.SaveLogToFile($"WCS申请托盘拆垛异常返回：( {e.Message} ),", logStr);

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

        }

        
        /// <summary>
        /// 成品箱码拆垛拣货
        /// </summary>
        /// <param name="model">入库单信息</param>
        /// <returns></returns>
        [AllowAnonymous]
        [HttpPost]
        public IActionResult ResultBoxInfoExportWcs(BoxInfoCheck model)
        {
            var logStr = $@".\log\WCS\WCS申请成品箱码拆垛拣货信息" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            try
            {
                //返回出库分拣装车口
                var list = _exNoticeSvc.BoxInfoExportWcs(model.BoxNo);
                return Ok(new { Success = "1", Message = "成品箱码拆垛拣货成功", loadubgAddre = list });
            }
            catch (Exception e)
            {
                LogFile.SaveLogToFile($"WCS申请成品箱码拆垛拣货异常返回：( {e.Message} ),", logStr);

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

        }

        

        #endregion

        #region AGV

@@ -632,10 +787,10 @@
        ///  AGV 执行回调的方法，包含任务开始，走出储位，任务完成及任务取消。
        ///  取消通知为任务单，其他通知为单个任务组或子任务。注意：是否通知需要在任务模板配置
        /// </summary>
        /// <param name="model">入库单信息</param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        [HttpPost]
        public IActionResult AgvCallback(AgvContinueTask model)
        public IActionResult AgvCallback(AgvTaskDto model)
        {
            try
            {
@@ -646,38 +801,92 @@

                //接收时间
                var time1 = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                var orderType = _taskSvc.GetTaskOrderType(model.TaskCode);// 判断单据类型入出移

                //测试接口用
                var orderType = _taskSvc.GetTaskOrderType(model.TaskCode, "0");// 判断单据类型入出移

                var taskType = _taskSvc.GetTaskType(model.TaskCode);//根据任务号获取任务类型
                switch (orderType)
                {
                    case "0"://入库任务执行
                        if (model.Method == "mid") //AGV到达入库口，请求放货
                        {
                            //下发WCS放货请求
                            var ret = _taskSvc.GetWcsPuttype(model.TaskCode,_config.WcsHost + _config.HttpInRequest);
                            if (ret.Contains("-1"))
                            {
                                logStr = $@".\log\WCS\任务反馈" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
                                LogFile.SaveLogToFile($"放货请求WCS失败，反馈执行通知：( {model.CurrentCallCode} ),", logStr);
                                return Ok(new OutCommanAgvDto { Code = "1", Message = "失败", ReqCode = model.ReqCode });
                            }
                        }
                        else if (model.Method == "end")//AGV放货到入库口完成
                        {
                            _stockSvc.ArriveFinish(model.TaskCode,_config.WcsHost + _config.HttpInFinish);
                        }

                        break;

                    case "1"://出库任务执行
                        _stockSvc.SoFinish(model.TaskCode,_config.MesHost + _config.MesBeiLiaoUrl);
                        break;

                    case "2"://盘库任务执行

                    case "3"://移库任务执行
                        return Ok(new OutCommanAgvDto { Code = "0", Message = "成功", ReqCode = model.ReqCode });
                        _stockSvc.MoveFinish(model.TaskCode, _config.MesHost + _config.MesBeiLiaoUrl);
                        break;
                    // return Ok(new OutCommanAgvDto { Code = "0", Message = "成功", ReqCode = model.ReqCode });

                    default:
                        return Ok(new OutCommanAgvDto { Code = "1", Message = "失败", ReqCode = model.ReqCode });
                }
                return Ok(new OutCommanAgvDto { Code = "0", Message = "成功", ReqCode = model.ReqCode });

            }
            catch (Exception ex)
            {
                return Ok(new WcsModel
                return Ok(new OutCommanAgvDto
                {
                    StatusCode = -1,
                    Msg = ex.Message
                    Code = "1",
                    Message = ex.Message
                });
            }

        }

        /// <summary>
        ///  任务继续执行接口
        ///  调用AGV任务模板continueTask，WCS调用接口返回该工位可放信号
        /// </summary>
        /// <param name="model">入库口信息</param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult AgcontinueTask(PutModel model)
        {
            try
            {
                //记录log
                var logStr = $@".\log\WCS\任务反馈" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
                var jsonData = JsonConvert.SerializeObject(model);
                LogFile.SaveLogToFile($"WCS任务反馈执行通知：( {jsonData} ),", logStr);

                //下发AGV继续执行
                _pdaCrServer.AgvContinue(model.TaskNo,_config.AgvHost+_config.ContinueTask);

                
                return Ok(new HttpReturnModel { Success = "0", Message = "成功"});

            }
            catch (Exception ex)
            {
                return Ok(new HttpReturnModel { Success = "1", Message = ex.ToString() });
                throw ex;
            }
        }


        #endregion

        #endregion


        #region PDA