代码无效引用清理,试压包资料界面看板修改
This commit is contained in:
@@ -9,33 +9,20 @@ using System.Web.Http;
|
||||
namespace WebAPI.Controllers
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// 包装管理接口
|
||||
/// </summary>
|
||||
public class PackagingManageController : ApiController
|
||||
{
|
||||
public Model.ResponeData GetPackagingInformationList(string projectid, 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 };
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
responeData.code = 0;
|
||||
responeData.message = ex.Message;
|
||||
}
|
||||
#region Methods
|
||||
|
||||
return responeData;
|
||||
}
|
||||
|
||||
public Model.ResponeData GetPackagingInformationById(string projectId,string personId, string packagingManageId)
|
||||
/// <summary>
|
||||
/// 获取指定包装信息
|
||||
/// </summary>
|
||||
/// <param name="projectId">项目ID</param>
|
||||
/// <param name="personId">人员ID</param>
|
||||
/// <param name="packagingManageId">包装ID</param>
|
||||
/// <returns>包装信息</returns>
|
||||
public Model.ResponeData GetPackagingInformationById(string projectId, string personId, string packagingManageId)
|
||||
{
|
||||
var responeData = new Model.ResponeData();
|
||||
try
|
||||
@@ -51,9 +38,84 @@ namespace WebAPI.Controllers
|
||||
return responeData;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取新包装编号
|
||||
/// </summary>
|
||||
/// <param name="projectId"></param>
|
||||
/// <returns></returns>
|
||||
public Model.ResponeData GetPackagingNumberByProjectId(string projectId)
|
||||
{
|
||||
var responeData = new Model.ResponeData();
|
||||
try
|
||||
{
|
||||
responeData.data = BLL.APIPackagingManageService.GetNewPackagingCode(projectId);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
responeData.code = 0;
|
||||
responeData.message = ex.Message;
|
||||
}
|
||||
return responeData;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取包装信息列表
|
||||
/// </summary>
|
||||
/// <param name="projectid">项目ID</param>
|
||||
/// <param name="pagesize">每页数量</param>
|
||||
/// <param name="pageindex">页码(从1开始)</param>
|
||||
/// <returns>包装信息分页列表</returns>
|
||||
public Model.ResponeData GetPackagingInformationList(string projectid, 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 };
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
responeData.code = 0;
|
||||
responeData.message = ex.Message;
|
||||
}
|
||||
|
||||
return responeData;
|
||||
}
|
||||
/// <summary>
|
||||
/// 包装到场验收
|
||||
/// </summary>
|
||||
/// <param name="packagingManageId">包装ID</param>
|
||||
/// <param name="PersonId">人员ID</param>
|
||||
/// <returns>操作结果</returns>
|
||||
public Model.ResponeData GetPackingInfoConfirmArrival(string packagingManageId, string PersonId)
|
||||
{
|
||||
var responeData = new Model.ResponeData();
|
||||
try
|
||||
{
|
||||
BLL.APIPackagingManageService.GetPackingInfoConfirmArrival(packagingManageId, PersonId);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
responeData.code = 0;
|
||||
responeData.message = ex.Message;
|
||||
}
|
||||
|
||||
return responeData;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 保存包装信息(组件明细)
|
||||
/// </summary>
|
||||
/// <param name="packagingManageId">包装ID</param>
|
||||
/// <param name="PipelineComponentIds">组件ID集合</param>
|
||||
/// <returns>操作结果</returns>
|
||||
public Model.ResponeData getSavePackagingInformationById(string packagingManageId, string PipelineComponentIds)
|
||||
{
|
||||
|
||||
var responeData = new Model.ResponeData();
|
||||
try
|
||||
{
|
||||
@@ -67,42 +129,52 @@ namespace WebAPI.Controllers
|
||||
|
||||
return responeData;
|
||||
}
|
||||
public Model.ResponeData GetPackingInfoConfirmArrival( string packagingManageId,string PersonId)
|
||||
/// <summary>
|
||||
/// 新增或更新包装信息(Id为空则新增,否则更新),返回创建或更新后的Id。
|
||||
/// </summary>
|
||||
/// <param name="model">包装信息实体</param>
|
||||
/// <returns>创建或更新后的Id</returns>
|
||||
[HttpPost]
|
||||
public Model.ResponeData SavePackaging(Model.HJGL_PackagingManage model)
|
||||
{
|
||||
var responeData = new Model.ResponeData();
|
||||
try
|
||||
{
|
||||
BLL.APIPackagingManageService.GetPackingInfoConfirmArrival( packagingManageId, PersonId);
|
||||
var id = APIPackagingManageService.AddOrUpdatePackaging(model);
|
||||
responeData.data = new { id };
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
responeData.code = 0;
|
||||
responeData.message = ex.Message;
|
||||
}
|
||||
|
||||
return responeData;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 车次关联包装(设置包装的TrainNumberId)
|
||||
/// </summary>
|
||||
/// <param name="packagingManageId">包装ID</param>
|
||||
/// <param name="trainNumberId">车次ID</param>
|
||||
/// <returns>操作结果</returns>
|
||||
[HttpGet]
|
||||
public Model.ResponeData SavePackingInformation(string packagingManageId, string trainNumberId)
|
||||
{
|
||||
var responeData = new Model.ResponeData();
|
||||
try
|
||||
{
|
||||
var packModel=HJGLPackagingmanageService.GetHJGL_PackagingManageById(packagingManageId);
|
||||
var packModel = HJGLPackagingmanageService.GetHJGL_PackagingManageById(packagingManageId);
|
||||
if (packModel == null)
|
||||
{
|
||||
responeData.code = 0;
|
||||
responeData.message = "未找到对应的包装信息";
|
||||
return responeData;
|
||||
|
||||
}
|
||||
if (packModel.State != 0)
|
||||
{
|
||||
responeData.code = 0;
|
||||
responeData.message = "当前包装状态不可修改车次号";
|
||||
return responeData;
|
||||
|
||||
}
|
||||
packModel.TrainNumberId = trainNumberId;
|
||||
HJGLPackagingmanageService.UpdateHJGL_PackagingManage(packModel);
|
||||
@@ -114,5 +186,7 @@ namespace WebAPI.Controllers
|
||||
}
|
||||
return responeData;
|
||||
}
|
||||
|
||||
#endregion Methods
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user