Commit c5855c4d by 泽锋 李

fix

parent 8c7f8c9b
...@@ -47,7 +47,7 @@ left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code where ...@@ -47,7 +47,7 @@ left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code where
if (m.btime != null) if (m.btime != null)
{ {
sql += " and t1.update_date>=@btime "; sql += " and t1.update_date>=@btime ";
parameters.Add("update_date", m.btime); parameters.Add("btime", m.btime);
} }
if (m.etime != null) if (m.etime != null)
{ {
......
...@@ -204,9 +204,16 @@ namespace AutoTurnOver.Controllers ...@@ -204,9 +204,16 @@ namespace AutoTurnOver.Controllers
[HttpGet("GetStorageCapacityGetPage")] [HttpGet("GetStorageCapacityGetPage")]
public ActionResult<RequestResultDto> GetStorageCapacityGetPage([FromQuery] dc_base_storage_capacity_search_dto search, [FromQuery]int page, [FromQuery]int rows) public ActionResult<RequestResultDto> GetStorageCapacityGetPage([FromQuery] dc_base_storage_capacity_search_dto search, [FromQuery]int page, [FromQuery]int rows)
{ {
try
{
var totel = 0; var totel = 0;
return new RequestResultDto { success = true, data = new StorageCapacityServices().StorageCapacityList(search,(page-1)*rows,rows,ref totel) }; return new RequestResultDto { success = true, data = new StorageCapacityServices().StorageCapacityList(search, (page - 1) * rows, rows, ref totel) };
}
catch (Exception ex)
{
return new RequestResultDto { success = false, message = ex.Message };
}
} }
/// <summary> /// <summary>
/// 查询库容 /// 查询库容
...@@ -216,8 +223,15 @@ namespace AutoTurnOver.Controllers ...@@ -216,8 +223,15 @@ namespace AutoTurnOver.Controllers
[HttpPost("StorageCapacityGetList")] [HttpPost("StorageCapacityGetList")]
public ActionResult<RequestResultDto> GetStorageCapacityGetList([FromBody] dc_base_storage_capacity_query_dto search) public ActionResult<RequestResultDto> GetStorageCapacityGetList([FromBody] dc_base_storage_capacity_query_dto search)
{ {
try
{
return new RequestResultDto { success = true, data = new StorageCapacityServices().GetList(search) };
}
catch (Exception ex)
{
return new RequestResultDto { success = false, message = ex.Message };
}
return new RequestResultDto { success = true ,data= new StorageCapacityServices().GetList(search) };
} }
/// <summary> /// <summary>
...@@ -228,9 +242,17 @@ namespace AutoTurnOver.Controllers ...@@ -228,9 +242,17 @@ namespace AutoTurnOver.Controllers
[HttpPost("StorageCapacityAddLog")] [HttpPost("StorageCapacityAddLog")]
public ActionResult<RequestResultDto> StorageCapacityAddLog([FromBody] dc_base_storage_capacity_log search) public ActionResult<RequestResultDto> StorageCapacityAddLog([FromBody] dc_base_storage_capacity_log search)
{ {
try
{
new StorageCapacityServices().AddLog(search); new StorageCapacityServices().AddLog(search);
return new RequestResultDto { success = true }; return new RequestResultDto { success = true };
} }
catch (Exception ex)
{
return new RequestResultDto { success = false,message = ex.Message };
}
}
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment