重构包装管理服务,优化数据结构与接口
移除 APIPackagingManageService,功能迁移至 HJGLPackagingmanageService 并进行重构,新增方法支持包装与组件关联管理、分页查询、状态描述等功能。 更新 PackagingManageController,替换旧服务调用,新增接口方法。 调整数据库结构,新增子表 HJGL_PackagingManageDetail,优化包装与组件的关联存储。 更新前端页面逻辑,适配新数据结构,新增 StackingPosition 字段显示。 优化 Model 层字段定义,调整长度限制,提升性能与一致性。 更新报表模板与项目文件,移除冗余代码,提升代码可维护性。
This commit is contained in:
@@ -1,7 +1,9 @@
|
||||
using BLL;
|
||||
using Model;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace FineUIPro.Web.HJGL.PreDesign
|
||||
{
|
||||
@@ -38,9 +40,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
||||
if (!string.IsNullOrEmpty(PackagingManageId))
|
||||
{
|
||||
var model = HJGLPackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId);
|
||||
HJGL_PackagingManageDetail filter = new HJGL_PackagingManageDetail
|
||||
{
|
||||
PackagingManageId = PackagingManageId
|
||||
};
|
||||
var packagingDetails = HJGLPackagingmanagedetailService.GetByQueryModle(filter);
|
||||
|
||||
drpTypeInt.Enabled = false;
|
||||
txtPackagingCode.Text = model.PackagingCode;
|
||||
dropPipelineComponentCode.Values = model.PipelineComponentId?.Split(',');
|
||||
dropPipelineComponentCode.Values = packagingDetails.Select(x=>x.PipelineComponentId).ToArray();
|
||||
txtStackingPosition.Text = model.StackingPosition;
|
||||
drpTrainNumber.SelectedValue = model.TrainNumberId;
|
||||
drpTypeInt.SelectedValue = model.TypeInt.ToString();
|
||||
@@ -86,8 +94,8 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
||||
if (string.IsNullOrEmpty(PackagingManageId))
|
||||
{
|
||||
Model.HJGL_PackagingManage table = new Model.HJGL_PackagingManage();
|
||||
|
||||
table.PackagingManageId = SQLHelper.GetNewID();
|
||||
PackagingManageId = SQLHelper.GetNewID();
|
||||
table.PackagingManageId = PackagingManageId;
|
||||
table.PackagingCode = txtPackagingCode.Text;
|
||||
table.ProjectId = this.CurrUser.LoginProjectId;
|
||||
table.StackingPosition = txtStackingPosition.Text;
|
||||
@@ -102,10 +110,32 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
||||
if (drpTypeInt.SelectedValue == ((int)HJGLPackagingmanageService.TypeInt.预制组件).ToString())
|
||||
{
|
||||
table.PipelineComponentId = string.Join(",", dropPipelineComponentCode.Values);
|
||||
|
||||
var newDetailList = new List<Model.HJGL_PackagingManageDetail>();
|
||||
foreach (var item in dropPipelineComponentCode.Values)
|
||||
{
|
||||
var ComponentModel = BLL.HJGL_PipelineComponentService.GetPipelineComponentById(item);
|
||||
if (ComponentModel != null)
|
||||
{
|
||||
var model = new Model.HJGL_PackagingManageDetail()
|
||||
{
|
||||
Id = SQLHelper.GetNewID(),
|
||||
PackagingManageId = this.PackagingManageId,
|
||||
PipelineId = ComponentModel.PipelineId,
|
||||
PipelineComponentId = item,
|
||||
CreateTime = DateTime.Now,
|
||||
CreateUser = this.CurrUser.PersonId,
|
||||
};
|
||||
newDetailList.Add(model);
|
||||
}
|
||||
}
|
||||
HJGLPackagingmanagedetailService.DeleteByPackagingManageId(this.PackagingManageId);
|
||||
HJGLPackagingmanagedetailService.AddBulk(newDetailList);
|
||||
|
||||
}
|
||||
|
||||
BLL.HJGLPackagingmanageService.AddHJGL_PackagingManage(table);
|
||||
|
||||
PackagingManageId = table.PackagingManageId;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user