新增管道颜色标识导入功能及API控制器
更新了多个服务和页面,增加了导入管道颜色标识数据的功能,并实现了包装管理、车次管理、管道组件和焊口信息的API控制器。修正了文件路径错误,优化了分页和排序逻辑,删除了不再使用的API方法。
This commit is contained in:
+9
-14
@@ -1,4 +1,5 @@
|
||||
using BLL;
|
||||
using Model;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
@@ -13,8 +14,6 @@ namespace WebAPI.Controllers
|
||||
/// </summary>
|
||||
public class PackagingManageController : ApiController
|
||||
{
|
||||
#region Methods
|
||||
|
||||
/// <summary>
|
||||
/// 获取指定包装信息
|
||||
/// </summary>
|
||||
@@ -61,23 +60,20 @@ namespace WebAPI.Controllers
|
||||
/// <summary>
|
||||
/// 获取包装信息列表
|
||||
/// </summary>
|
||||
/// <param name="projectid">项目ID</param>
|
||||
/// <param name="filter">过滤条件</param>
|
||||
/// <param name="pagesize">每页数量</param>
|
||||
/// <param name="pageindex">页码(从1开始)</param>
|
||||
/// <returns>包装信息分页列表</returns>
|
||||
public Model.ResponeData GetPackagingInformationList(string projectid, int pagesize, int pageindex)
|
||||
public Model.ResponeData GetPackagingInformationList([FromUri]PackagingManageInput filter, int pagesize, int pageindex)
|
||||
{
|
||||
var responeData = new Model.ResponeData();
|
||||
try
|
||||
{
|
||||
var getDataList = BLL.APIPackagingManageService.GetPackagingManageList(projectid);
|
||||
int pageCount = getDataList.Count();
|
||||
if (pageCount > 0 && pageindex > 0)
|
||||
{
|
||||
getDataList = getDataList.Skip(pagesize * (pageindex - 1)).Take(pagesize).ToList();
|
||||
}
|
||||
responeData.data = new { pageCount, getDataList };
|
||||
}
|
||||
var getDataList = BLL.APIPackagingManageService.GetPackagingManageList(filter, pageindex, pagesize, out int totalCount);
|
||||
|
||||
responeData.data = new { totalCount, getDataList };
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
responeData.code = 0;
|
||||
@@ -186,7 +182,6 @@ namespace WebAPI.Controllers
|
||||
}
|
||||
return responeData;
|
||||
}
|
||||
|
||||
#endregion Methods
|
||||
|
||||
}
|
||||
}
|
||||
+4
-6
@@ -61,18 +61,16 @@ namespace WebAPI.Controllers
|
||||
/// <summary>
|
||||
/// 获取发货列表
|
||||
/// </summary>
|
||||
/// <param name="projectId"></param>
|
||||
/// <param name="filter"></param>
|
||||
/// <param name="pagesize"></param>
|
||||
/// <param name="pageindex"></param>
|
||||
/// <returns></returns>
|
||||
public Model.ResponeData GetTrainNumberList(string projectId, int pagesize, int pageindex)
|
||||
public Model.ResponeData GetTrainNumberList([FromUri] Model.HJGL_TrainNumberManage filter , int pagesize, int pageindex)
|
||||
{
|
||||
var responeData = new Model.ResponeData();
|
||||
try
|
||||
{
|
||||
Model.HJGL_TrainNumberManage table = new Model.HJGL_TrainNumberManage();
|
||||
table.ProjectId = projectId;
|
||||
var result = TrainNumberManageService.GetListByQueryModle(table, pageindex, pagesize);
|
||||
{
|
||||
var result = TrainNumberManageService.GetListByQueryModle(filter, pageindex, pagesize);
|
||||
var getDataList = result.Data;
|
||||
int pageCount = result.Total;
|
||||
responeData.data = new { pageCount, getDataList };
|
||||
Reference in New Issue
Block a user