This commit is contained in:
2024-09-27 18:17:21 +08:00
parent be070f85e2
commit 064a849b97
73 changed files with 3248 additions and 589 deletions
@@ -187,6 +187,32 @@ namespace WebAPI.Controllers
return responeData;
}
/// <summary>
/// 根据焊口手动点口
/// </summary>
/// <param name="weldJointId"></param>
/// <returns></returns>
public Model.ResponeData getManualPointSave(string weldJointId)
{
var responeData = new Model.ResponeData();
try
{
string res = APINDETrustService.ManualPointSave(weldJointId);
if (!string.IsNullOrEmpty(res))
{
responeData.code = 0;
responeData.message = res;
}
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
/// <summary>
/// 对所选批次进行强制关闭批
@@ -50,6 +50,23 @@ namespace WebAPI.Controllers
return responeData;
}
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;
}
public Model.ResponeData GetPackingInfoConfirmArrival( string packagingManageId,string PersonId)
{
var responeData = new Model.ResponeData();
@@ -167,6 +167,26 @@ namespace WebAPI.Controllers
return responeData;
}
/// <summary>
/// 根据焊口ID获取焊口详细信息
/// </summary>
/// <param name="WeldJointId"></param>
/// <returns></returns>
public Model.ResponeData getWeldJointByWeldJointId(string WeldJointId)
{
var responeData = new Model.ResponeData();
try
{
responeData.data = APIPipeJointService.GetHJGL_WeldJoint(WeldJointId);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 线
@@ -140,6 +140,35 @@ namespace WebAPI.Controllers
res.successful = true;
return res;
}
/// <summary>
/// 根据焊口id保存到日报
/// </summary>
/// <param name="WeldJointId"></param>
/// <param name="Personid"></param>
/// <param name="time"></param>
/// <returns></returns>
[HttpGet]
public Model.ResponeData SaveWeldingDailyByWeldJointId(string WeldJointId,string Personid,string time)
{
var responeData = new Model.ResponeData();
try
{
string res= APIPreWeldingDailyService.SaveWeldingDailyByWeldJointId(WeldJointId, Personid,time );
if (!string.IsNullOrEmpty(res))
{
responeData.code = 0;
responeData.message = res;
}
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region