修改问题

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

@@ -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)
            {