lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增管道颜色标识导入功能及API控制器

Browse Source 
更新了多个服务和页面，增加了导入管道颜色标识数据的功能，并实现了包装管理、车次管理、管道组件和焊口信息的API控制器。修正了文件路径错误，优化了分页和排序逻辑，删除了不再使用的API方法。
This commit is contained in:
李鹏飞
2025-10-24 10:04:03 +08:00
parent 55b798135c
commit c23d113eae
55 changed files with 1502 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/WebAPI/Controllers/HJGL/PreDesign/PackagingManageController.cs
+187
View File
@@ -0,0 +1,187 @@
using BLL;
using Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web.Http;
namespace WebAPI.Controllers
{
/// <summary>
/// 包装管理接口
/// </summary>
public class PackagingManageController : ApiController
{
/// <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
{
responeData.data = BLL.APIPackagingManageService.GetPackagingInformationById(projectId, personId, packagingManageId);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
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="filter">过滤条件</param>
/// <param name="pagesize">每页数量</param>
/// <param name="pageindex">页码（从1开始）</param>
/// <returns>包装信息分页列表</returns>
public Model.ResponeData GetPackagingInformationList([FromUri]PackagingManageInput filter, int pagesize, int pageindex)
{
var responeData = new Model.ResponeData();
try
{
var getDataList = BLL.APIPackagingManageService.GetPackagingManageList(filter, pageindex, pagesize, out int totalCount);
responeData.data = new { totalCount, 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
{
BLL.APIPackagingManageService.getSavePackagingInformationById(packagingManageId, PipelineComponentIds);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
/// <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
{
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);
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);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
}
}
SGGL/WebAPI/Controllers/HJGL/PreDesign/PipelineComponentController.cs
+90
View File
@@ -0,0 +1,90 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web.Http;
namespace WebAPI.Controllers
{
public class PipelineComponentController : ApiController
{
/// <summary>
/// 获取组件列表
/// </summary>
/// <param name="projectid"></param>
/// <param name="pagesize"></param>
/// <param name="pageindex"></param>
/// <param name="state"></param>
/// <returns></returns>
public Model.ResponeData GetPipelineComponentList(string projectid, int pagesize, int pageindex, int? state)
{
var responeData = new Model.ResponeData();
try
{
var getDataList = BLL.APIPipelineComponentService.GetPackagingManageList(projectid);
if (state != null)
{
getDataList = getDataList.Where(x => x.State == state).ToList();
}
int pageCount = getDataList.Count();
if (pageCount > 0 && pageindex > 0&& pagesize>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>
/// 根据id获取明细
/// </summary>
/// <param name="projectId"></param>
/// <param name="personId"></param>
/// <param name="PipelineComponentId"></param>
/// <returns></returns>
public Model.ResponeData GetPipelineComponentById(string projectId, string personId, string PipelineComponentId)
{
var responeData = new Model.ResponeData();
try
{
responeData.data = BLL.APIPipelineComponentService.GetPipelineComponentById(projectId, personId, PipelineComponentId);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
/// <summary>
/// 根据主键id和人员id验收
/// </summary>
/// <param name="PipelineComponentId"></param>
/// <param name="PersonId"></param>
/// <returns></returns>
public Model.ResponeData GetComponentConfirmArrival(string PipelineComponentId, string PersonId,string Message)
{
var responeData = new Model.ResponeData();
try
{
BLL.APIPipelineComponentService.GetComponentConfirmArrival(PipelineComponentId, PersonId, Message);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
}
}
SGGL/WebAPI/Controllers/HJGL/PreDesign/TrainNumberManageController.cs
+153
View File
@@ -0,0 +1,153 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web.Http;
namespace WebAPI.Controllers
{
/// <summary>
/// 车次管理接口
/// </summary>
public class TrainNumberManageController : ApiController
{
#region Methods
/// <summary>
/// 删除包装与车次的关联（清空 HJGL_PackagingManage.TrainNumberId）
/// </summary>
/// <param name="packagingManageId"></param>
/// <returns></returns>
[HttpGet]
public Model.ResponeData DeletePackagingFromTrain(string packagingManageId)
{
var responeData = new Model.ResponeData();
try
{
APITrainNumberManagerService.RemovePackagingFromTrain(packagingManageId);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
/// <summary>
/// 获取指定车次的包装明细
/// </summary>
/// <param name="trainNumberId"></param>
/// <returns></returns>
[HttpGet]
public Model.ResponeData GetPackagingByTrain(string trainNumberId)
{
var responeData = new Model.ResponeData();
try
{
var list = APITrainNumberManagerService.GetPackagingByTrainId(trainNumberId);
responeData.data = list;
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
/// <summary>
/// 获取发货列表
/// </summary>
/// <param name="filter"></param>
/// <param name="pagesize"></param>
/// <param name="pageindex"></param>
/// <returns></returns>
public Model.ResponeData GetTrainNumberList([FromUri] Model.HJGL_TrainNumberManage filter , int pagesize, int pageindex)
{
var responeData = new Model.ResponeData();
try
{
var result = TrainNumberManageService.GetListByQueryModle(filter, pageindex, pagesize);
var getDataList = result.Data;
int pageCount = result.Total;
responeData.data = new { pageCount, getDataList };
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
/// <summary>
/// 添加车次包装关联
/// </summary>
/// <param name="packagingManageId"></param>
/// <param name="trainNumberId"></param>
/// <returns></returns>
[HttpGet]
public Model.ResponeData SavePackagingToTrain(string packagingManageId, string trainNumberId)
{
var responeData = new Model.ResponeData();
try
{
APITrainNumberManagerService.AddPackagingToTrain(packagingManageId, trainNumberId);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
/// <summary>
/// 发货验收
/// </summary>
/// <param name="Id"></param>
/// <param name="PersonId"></param>
/// <returns></returns>
[HttpGet]
public Model.ResponeData SaveTrainInfoConfirmArrival(string Id, string PersonId)
{
var responeData = new Model.ResponeData();
try
{
BLL.APITrainNumberManagerService.SaveTrainInfoConfirmArrival(Id, PersonId);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
/// <summary>
/// 新增或更新车次（如果 Id 为空则新增，否则更新）
/// </summary>
[HttpPost]
public Model.ResponeData SaveTrainNumber(Model.HJGL_TrainNumberManage model)
{
var responeData = new Model.ResponeData();
try
{
var id = APITrainNumberManagerService.AddOrUpdateTrainNumber(model);
responeData.data = new { id };
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion Methods
}
}