修改问题

zhaowc

2025-02-17 53a8c6fe671bf510f94aabe398099bd2b8540539

修改问题

 Wms/Model/InterFaceModel/HttpModel.cs

@@ -1128,7 +1128,7 @@
        public string Origin { get; set; }
    }

    public class ReLocateData
    public class ReLocateDataModel
    {
        /// <summary>
        /// 库位

 Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs

@@ -1626,6 +1626,12 @@
            }
        }

        /// <summary>
        /// 下发AGV任务继续执行
        /// </summary>
        /// <param name="taskno"></param>
        /// <param name="url"></param>
        /// <returns></returns>
        public void AgvContinue(string taskno,string url) 
        {
            var data = new { reqCode =taskno  };

 Wms/WMS.BLL/DataServer/StockServer.cs

@@ -1213,11 +1213,11 @@
        /// </summary>
        /// <param name=""></param>
        /// <returns></returns>
        public List<ReLocateData> GetLocateList()
        public List<ReLocateDataModel> GetLocateList()
        {
            try
            {
                List<ReLocateData> list = new List<ReLocateData>();
                List<ReLocateDataModel> list = new List<ReLocateDataModel>();

                //库存信息
                var stockDetailsList = Db.Queryable<StockDetailDto>().ToList();

 Wms/WMS.IBLL/IDataServer/IStockServer.cs

@@ -150,6 +150,6 @@
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        List<ReLocateData> GetLocateList();
        List<ReLocateDataModel> GetLocateList();
    }
}

 Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs

@@ -152,6 +152,11 @@
        /// <param name="model"></param>
        public void cancelTask(string taskno, string url);


        /// <summary>
        ///  agv任务继续执行
        /// </summary>
        /// <param name="model"></param>
        public void AgvContinue(string taskno,string url);

        #endregion

 Wms/Wms/Controllers/DownApiController.cs

@@ -839,6 +839,7 @@
        /// </summary>
        /// <param name="model">入库口信息</param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult AgcontinueTask(PutModel model)
        {
            try
@@ -852,13 +853,13 @@
                _pdaCrServer.AgvContinue(model.TaskNo,_config.AgvHost+_config.ContinueTask);

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

            }
            catch (Exception)
            catch (Exception ex)
            {

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


 Wms/Wms/Controllers/UpApiController.cs

@@ -34,7 +34,7 @@
        private readonly IStockCheckServer _stockCheckSvc;//盘点单Svc 
        private readonly IPdaCrServer _daCrSvc;//PDA
        private readonly IStockServer _stock; //库存
        public UpApiController(IOptions<ApiUrlConfig> setting,IExportNoticeServer exNoticeSvc,IArrivalNoticeServer arrivalNoticeServer,IStockCheckServer stockCheckSvc,IPdaCrServer daCrSvc,IStockServer stock)
        public UpApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IArrivalNoticeServer arrivalNoticeServer, IStockCheckServer stockCheckSvc, IPdaCrServer daCrSvc, IStockServer stock)
        {
            _config = setting.Value;
            _exNoticeSvc = exNoticeSvc;
@@ -82,7 +82,7 @@
        /// <param name="model">入库单号</param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult FinishAsn(FinshVm model) 
        public IActionResult FinishAsn(FinshVm model)
        {
            try
            {
@@ -97,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,model.UserNo,model.Password, 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 = "入库单复核并上传成功" });
            }
@@ -142,7 +142,7 @@
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]                                                                      
        [HttpPost]
        public IActionResult FinishExportNotice(FinshVm model)
        {
            try
@@ -234,8 +234,8 @@
        {
            try
            {
                    
                OutCommanAgvDto agvRequest =  _daCrSvc.AGVTask(type,taskno,positionStart,positionEnd, _config.AgvHost + _config.GenAgvSchedulingTask);

                OutCommanAgvDto agvRequest = _daCrSvc.AGVTask(type, taskno, positionStart, positionEnd, _config.AgvHost + _config.GenAgvSchedulingTask);
                if (agvRequest.Code != "0")
                {
                    return Ok(new { code = 1, msg = "小车任务执行失败" });
@@ -294,7 +294,7 @@
            {
                logStr = $@".\log\ERP\入库单下发" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            }
            

            try
            {
                //log日志记录 
@@ -337,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 = "成功" };
@@ -362,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);
@@ -398,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 = "成功" };

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

            }
            catch (Exception e)
            {
@@ -439,6 +439,7 @@
        /// </summary>
        /// <param name="model">来源信息</param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult ReLocateData(DigitalTwinModel model)
        {
            //记录log
@@ -448,7 +449,7 @@
            LogFile.SaveLogToFile($"库位信息及质量状态反馈：( {jsonData} ),", logStr);

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

            if (stocks.Count == 0)
            {