修改问题

zwc

2025-01-15 2920728d7908da2ee196f3af8b3d1c635696e9a1

 Wms/Wms/Controllers/UpApiController.cs

@@ -13,6 +13,7 @@
using WMS.IBLL.IBllCheckServer;
using Model.ModelVm.BllCheckVm;
using Microsoft.Extensions.Logging;
using WMS.IBLL.IPdaServer;

namespace Wms.Controllers
{
@@ -28,12 +29,14 @@
        private readonly IExportNoticeServer _exNoticeSvc;//出库单Svc 
        private readonly IArrivalNoticeServer _arrivalNoticeSvc;
        private readonly IStockCheckServer _stockCheckSvc;//盘点单Svc 
        public UpApiController(IOptions<ApiUrlConfig> setting,IExportNoticeServer exNoticeSvc,IArrivalNoticeServer arrivalNoticeServer,IStockCheckServer stockCheckSvc)
        private readonly IPdaCrServer _daCrSvc;//PDA
        public UpApiController(IOptions<ApiUrlConfig> setting,IExportNoticeServer exNoticeSvc,IArrivalNoticeServer arrivalNoticeServer,IStockCheckServer stockCheckSvc,IPdaCrServer daCrSvc)
        {
            _config = setting.Value;
            _exNoticeSvc = exNoticeSvc;
            _arrivalNoticeSvc = arrivalNoticeServer;
            _stockCheckSvc = stockCheckSvc;
            _daCrSvc = daCrSvc;
        }
        #endregion

@@ -134,7 +137,7 @@
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [HttpPost]                                                                      
        public IActionResult FinishExportNotice(FinshVm model)
        {
            try
@@ -209,8 +212,56 @@
            }
        }

        //箱码信息 手持组托用 (扫箱码向追溯要信息)  
        //箱码信息 手持组托用 (扫箱码向追溯要信息)
        //


        /// <summary>
        /// 下发AGV调度任务
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult AGVTask(string type, string taskno, string positionStart, string positionEnd)
        {
            try
            {
                    
                OutCommanAgvDto agvRequest =  _daCrSvc.AGVTask(type,taskno,positionStart,positionEnd, _config.AgvHost + _config.GenAgvSchedulingTask);
                if (agvRequest.Code != "0")
                {
                    return Ok(new { code = 1, msg = "小车任务执行失败" });
                }

                return Ok(new { code = 1, msg = "AGV任务下发成功" });

            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
        }

        /// <summary>
        /// 下发AGV取消任务
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult cancelTask(string taskno)
        {
            try
            {

                _daCrSvc.cancelTask(taskno, _config.AgvHost + _config.CancelTask);
                return Ok(new { code = 1, msg = "AGV任务取消成功" });

            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
        }

        #endregion

@@ -244,7 +295,7 @@
                    LogFile.SaveLogToFile($"入库单下发：( {jsonData} ),", logStr);
                }

                result = _arrivalNoticeSvc.HttpCreateAsn(model);
                result = _arrivalNoticeSvc.HttpCreateAsn(model, _config.WcsHost + _config.AddOrderTaskUrl);
                if (logStr != "")
                {
                    var jsonData = JsonConvert.SerializeObject(result);