修改客户需求

zhaowc

2025-02-28 157abc191c34e57c1b958ae74fc3de6518ca8a30

 Wms/Wms/Controllers/UpApiController.cs

@@ -13,11 +13,15 @@
using WMS.IBLL.IBllCheckServer;
using Model.ModelVm.BllCheckVm;
using Microsoft.Extensions.Logging;
using WMS.IBLL.IPdaServer;
using WMS.IBLL.IDataServer;
using Model.ModelDto.DataDto;
using System.Collections.Generic;

namespace Wms.Controllers
{
    /// <summary>
    /// 上游系统交互ceshi
    /// 上游系统交互
    /// </summary>
    [Route("api/[controller]/[action]")]
    [ApiController]
@@ -28,12 +32,16 @@
        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
        private readonly IStockServer _stock; //库存
        public UpApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IArrivalNoticeServer arrivalNoticeServer, IStockCheckServer stockCheckSvc, IPdaCrServer daCrSvc, IStockServer stock)
        {
            _config = setting.Value;
            _exNoticeSvc = exNoticeSvc;
            _arrivalNoticeSvc = arrivalNoticeServer;
            _stockCheckSvc = stockCheckSvc;
            _daCrSvc = daCrSvc;
            _stock = stock;
        }
        #endregion

@@ -74,7 +82,7 @@
        /// <param name="model">入库单号</param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult FinishAsn(IdVm model) 
        public IActionResult FinishAsn(FinshVm model)
        {
            try
            {
@@ -89,7 +97,7 @@
                {
                    return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
                }
                _arrivalNoticeSvc.FinishAsn(model.Id, _config.ErpHost + _config.AsnFinishUrl, _config.MesHost + _config.MesAsnFinishUrl, _config.MesHost + _config.MesGetTokenUrl, int.Parse(userId));
                _arrivalNoticeSvc.FinishAsn(model.Id, _config.ErpHost + _config.AsnFinishUrl, _config.MesHost + _config.MesAsnFinishUrl, _config.MesHost + _config.MesGetTokenUrl, model.UserNo, model.Password, int.Parse(userId));

                return Ok(new { code = 0, count = 0, msg = "入库单复核并上传成功" });
            }
@@ -135,7 +143,7 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult FinishExportNotice(IdVm model)
        public IActionResult FinishExportNotice(FinshVm model)
        {
            try
            {
@@ -150,7 +158,7 @@
                {
                    return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
                }
                _exNoticeSvc.FinishSo(model.Id, _config.ErpHost + _config.SoFinishUrl, int.Parse(userId));
                _exNoticeSvc.FinishSo(model.Id, _config.ErpHost + _config.SoFinishUrl, model.UserNo, model.Password, int.Parse(userId));
                return Ok(new { code = 0, count = 0, msg = "出库单复核并上传成功" });
            }
            catch (Exception e)
@@ -209,8 +217,59 @@
            }
        }

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


        /// <summary>
        /// 下发AGV调度任务
        /// </summary>
        /// <param name="type"></param>
        ///   <param name="taskno"></param>
        ///   <param name="positionStart"></param>
        ///   <param name="positionEnd"></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="taskno"></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

@@ -224,6 +283,7 @@
        [HttpPost]
        public IActionResult CreateAsn(AsnInfo model)
        {
            // liudl Test
            var result = new HttpReturnModel { Success = "-1", Message = "" };
            var logStr = "";
            if (model.Origin == "MES")
@@ -234,7 +294,7 @@
            {
                logStr = $@".\log\ERP\入库单下发" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            }
            

            try
            {
                //log日志记录 
@@ -244,7 +304,7 @@
                    LogFile.SaveLogToFile($"入库单下发：( {jsonData} ),", logStr);
                }

                result = _arrivalNoticeSvc.HttpCreateAsn(model);
                result = _arrivalNoticeSvc.HttpCreateAsn(model, _config.WcsHost + _config.AddOrderTaskUrl);
                if (logStr != "")
                {
                    var jsonData = JsonConvert.SerializeObject(result);
@@ -277,20 +337,20 @@
            {
                logStr = $@".\log\MES\出库单下发" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            }
            else if(model.Origin == "ERP")
            else if (model.Origin == "ERP")
            {
                logStr = $@".\log\ERP\出库单下发" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            }
            

            try
            {
                //log日志记录 
                if (logStr!="")
                if (logStr != "")
                {
                    var jsonData = JsonConvert.SerializeObject(model);
                    LogFile.SaveLogToFile($"出库单下发：( {jsonData} ),", logStr);
                }
                

                _exNoticeSvc.HttpAddExportNotice(model);

                var data = new HttpReturnModel { Success = "0", Message = "成功" };
@@ -302,12 +362,12 @@
                }

                return Ok(data);
                
                


            }
            catch (Exception e)
            {
                var data = new HttpReturnModel { Success = "-1", Message = "失败"+e.Message };
                var data = new HttpReturnModel { Success = "-1", Message = "失败" + e.Message };
                if (logStr != "")
                {
                    var jsonData = JsonConvert.SerializeObject(data);
@@ -320,6 +380,7 @@
        /// <summary>
        /// 释放备料区储位状态JC24
        /// </summary>
        /// <param name="model">状态信息</param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult UpLocate(UpLocateModel model)
@@ -337,7 +398,7 @@
                    var jsonData = JsonConvert.SerializeObject(model);
                    LogFile.SaveLogToFile($"释放备料区储位状态：( {jsonData} ),", logStr);
                }
                _arrivalNoticeSvc.UpLocate(model.WareHouseNo,model.LocatNo);
                _arrivalNoticeSvc.UpLocate(model.WareHouseNo, model.LocatNo);

                var data = new HttpReturnModel { Success = "0", Message = "成功" };

@@ -347,7 +408,7 @@
                    LogFile.SaveLogToFile($"释放备料区储位状态返回参数：( {jsonData} ),", logStr);
                }
                return Ok(data);
                 

            }
            catch (Exception e)
            {
@@ -373,6 +434,31 @@
        //包装信息接口


        /// <summary>
        /// 数字孪生系统库存质量状态反馈
        /// </summary>
        /// <param name="model">来源信息</param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult ReLocateData(DigitalTwinModel model)
        {
            //记录log
            var logStr = "";
            logStr = $@".\log\数字孪生\库位信息及质量状态反馈" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            var jsonData = JsonConvert.SerializeObject(model);
            LogFile.SaveLogToFile($"库位信息及质量状态反馈：( {jsonData} ),", logStr);

            //获取库存信息
            List<ReLocateDataModel> stocks = _stock.GetLocateList();

            if (stocks.Count == 0)
            {
                var data = new HttpReturnModel { Success = "0", Message = "当前无库存" };
                return Ok(data);
            }
            return Ok(stocks);
        }

        #endregion

    }