diff --git a/DataBase/版本日志/SGGLDB_V2025-11-29-lpf.sql b/DataBase/版本日志/SGGLDB_V2025-11-29-lpf.sql
new file mode 100644
index 00000000..e2dd8eb3
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2025-11-29-lpf.sql
@@ -0,0 +1,7 @@
+alter table dbo.PTP_TestPackage
+ add PressureId varchar(50)
+go
+
+exec sp_addextendedproperty 'MS_Description', N'试压类型', 'SCHEMA', 'dbo', 'TABLE', 'PTP_TestPackage', 'COLUMN',
+ 'PressureId'
+go
diff --git a/SGGL/.claude/settings.local.json b/SGGL/.claude/settings.local.json
index 395c4447..5ac0ec71 100644
--- a/SGGL/.claude/settings.local.json
+++ b/SGGL/.claude/settings.local.json
@@ -9,7 +9,8 @@
"Bash(IndependentExcelFiller.exe)",
"Bash(python:*)",
"Bash(cat:*)",
- "Bash(pip install:*)"
+ "Bash(pip install:*)",
+ "Bash(msbuild:*)"
],
"deny": [],
"ask": []
diff --git a/SGGL/BLL/CLGL/TwOutputdetailService..cs b/SGGL/BLL/CLGL/TwOutputdetailService..cs
index 7327842e..2c082dd1 100644
--- a/SGGL/BLL/CLGL/TwOutputdetailService..cs
+++ b/SGGL/BLL/CLGL/TwOutputdetailService..cs
@@ -82,7 +82,23 @@ namespace BLL
{
return Funs.DB.Tw_OutputDetail.FirstOrDefault(x => x.Id == Id);
}
+ ///
+ /// 根据明细Id获取对应的出库主表信息
+ ///
+ ///
+ ///
+ public static Model.Tw_InOutMasterOutput GetInOutMasterById(string Id)
+ {
+ var detail = Funs.DB.Tw_OutputDetail.FirstOrDefault(x => x.Id == Id);
+ if (detail == null) return null;
+ Model.Tw_InOutMasterOutput fliter = new Model.Tw_InOutMasterOutput
+ {
+ Id = detail.OutputMasterId
+ };
+ var result= TwOutputmasterService.GetListData(fliter).FirstOrDefault();
+ return result;
+ }
public static void Add(Model.Tw_OutputDetail newtable)
{
diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_PressureService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_PressureService.cs
index f4e61297..c611a108 100644
--- a/SGGL/BLL/HJGL/BaseInfo/Base_PressureService.cs
+++ b/SGGL/BLL/HJGL/BaseInfo/Base_PressureService.cs
@@ -89,7 +89,7 @@ namespace BLL
public static void InitPressureDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
{
dropName.DataValueField = "PressureId";
- dropName.DataTextField = "PressureCode";
+ dropName.DataTextField = "PressureName";
dropName.DataSource = GetPressureList();
dropName.DataBind();
if (isShowPlease)
diff --git a/SGGL/BLL/HJGL/PreDesign/HJGLPackagingmanagedetailService.cs b/SGGL/BLL/HJGL/PreDesign/HJGLPackagingmanagedetailService.cs
index e0902722..21abb997 100644
--- a/SGGL/BLL/HJGL/PreDesign/HJGLPackagingmanagedetailService.cs
+++ b/SGGL/BLL/HJGL/PreDesign/HJGLPackagingmanagedetailService.cs
@@ -209,6 +209,7 @@ namespace BLL
MaterialMade = libItem.MaterialMade,
MaterialDef = libItem.MaterialDef,
Number = tb.Number,
+ TwOutputDetailId = tb.TwOutputDetailId,
CusBillCode = twOutItem.CusBillCode,
};
result = q.ToList();
diff --git a/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs b/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs
index a6908719..12d3f01a 100644
--- a/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs
+++ b/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs
@@ -308,7 +308,7 @@ namespace BLL
PipelineComponentCode = x.MaterialCode,
num = x.Number.ToString(),
CU = x.MaterialUnit,
- UnitWorkName = x.UnitWorkId == null ? "" : UnitWorkService.GetNameById(x.UnitWorkId),
+ UnitWorkName = UnitWorkService.GetNameById( TwOutputdetailService.GetInOutMasterById(x.TwOutputDetailId)?.UnitWorkId ),
FlowingSection = model.StackingPosition,
};
result = detailList.ToList();
diff --git a/SGGL/BLL/HJGL/TestPackage/TestPackageEditService.cs b/SGGL/BLL/HJGL/TestPackage/TestPackageEditService.cs
index a631a58e..36bbe276 100644
--- a/SGGL/BLL/HJGL/TestPackage/TestPackageEditService.cs
+++ b/SGGL/BLL/HJGL/TestPackage/TestPackageEditService.cs
@@ -84,6 +84,7 @@ namespace BLL
newTestPackage.Check10 = testPackage.Check10;
newTestPackage.Check11 = testPackage.Check11;
newTestPackage.Check12 = testPackage.Check12;
+ newTestPackage.PressureId = testPackage.PressureId;
db.PTP_TestPackage.InsertOnSubmit(newTestPackage);
db.SubmitChanges();
}
@@ -126,6 +127,7 @@ namespace BLL
newTestPackage.HoldingTime = testPackage.HoldingTime;
newTestPackage.State = testPackage.State;
newTestPackage.TestDate = testPackage.TestDate;
+ newTestPackage.PressureId = testPackage.PressureId;
db.SubmitChanges();
}
diff --git a/SGGL/BLL/HJGL/TestPackage/TestPackagePrintService.cs b/SGGL/BLL/HJGL/TestPackage/TestPackagePrintService.cs
index 1b95c8d1..f08e7895 100644
--- a/SGGL/BLL/HJGL/TestPackage/TestPackagePrintService.cs
+++ b/SGGL/BLL/HJGL/TestPackage/TestPackagePrintService.cs
@@ -593,11 +593,23 @@ namespace BLL
var q = iosList[0];
var isoNos = string.Join(",", iosList.Select(x => x.PipelineCode).ToArray());
var isoIds = string.Join("','", iosList.Select(x => x.PipelineId).ToArray());
+ //获取打底和盖面的焊工单位名称
+ var CoverWelderUnitName = (from x in Funs.DB.HJGL_WeldJoint
+ join y in Funs.DB.SitePerson_Person on x.CoverWelderId equals y.PersonId
+ join z in Funs.DB.Base_Unit on y.UnitId equals z.UnitId
+ where isoIds.Contains(x.PipelineId)
+ select z.UnitName ).Distinct().ToList();
+ var BackingWelderUnitName = (from x in Funs.DB.HJGL_WeldJoint
+ join y in Funs.DB.SitePerson_Person on x.BackingWelderId equals y.PersonId
+ join z in Funs.DB.Base_Unit on y.UnitId equals z.UnitId
+ where isoIds.Contains(x.PipelineId)
+ select z.UnitName).Distinct().ToList();
+ CoverWelderUnitName.AddRange(BackingWelderUnitName);
Dictionary keyValuePairs = new Dictionary();
var projectName = BLL.ProjectService.GetProjectNameByProjectId(projectid);
var UnitWorkName = BLL.UnitWorkService.getUnitWorkByUnitWorkId(updateTestPackage.UnitWorkId).UnitWorkName;
var UnitWorkCode = BLL.UnitWorkService.getUnitWorkByUnitWorkId(updateTestPackage.UnitWorkId).UnitWorkCode;
- var unitNames = BLL.UnitService.GetUnitNameByUnitId(updateTestPackage.UnitId);
+ var unitNames = string.Join(",", CoverWelderUnitName.Distinct().ToArray());
keyValuePairs.Add("ProjectName", projectName);
keyValuePairs.Add("UnitWorkName", UnitWorkName);
keyValuePairs.Add("UnitWorkCode", UnitWorkCode);
diff --git a/SGGL/BLL/ProjectData/UnitWorkService.cs b/SGGL/BLL/ProjectData/UnitWorkService.cs
index 87436b3f..fba061ab 100644
--- a/SGGL/BLL/ProjectData/UnitWorkService.cs
+++ b/SGGL/BLL/ProjectData/UnitWorkService.cs
@@ -350,6 +350,7 @@ namespace BLL
///
public static string GetNameById(string id)
{
+ if( string.IsNullOrEmpty(id) ) return string.Empty;
string name = string.Empty;
var UnitWork = Funs.DB.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == id);
if (UnitWork != null)
diff --git a/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx b/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx
index 2abd8e8b..97891a02 100644
--- a/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx
+++ b/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx
@@ -1,5 +1,5 @@
-
+
using System;
using System.Collections;
using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
}
-
+
diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx
index 332cabde..c6345416 100644
--- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx
@@ -41,7 +41,7 @@
diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
index 8c80cae1..2cf3dd5c 100644
--- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
@@ -8,6 +8,7 @@ using System.IO;
using System.Linq;
using System.Text;
using AspNet = System.Web.UI.WebControls;
+using System.Web.Caching;
namespace FineUIPro.Web.HJGL.InfoQuery
{
@@ -82,13 +83,53 @@ namespace FineUIPro.Web.HJGL.InfoQuery
}
public static List View_HJGL_WeldJoint = new List();
+ // 缓存相关常量
+ private const string CACHE_KEY_PREFIX = "UnitWorkTree_";
+ private static readonly System.Web.Caching.Cache Cache = System.Web.HttpRuntime.Cache;
+
+ ///
+ /// 创建TreeNode的副本（用于缓存）
+ ///
+ /// 源节点
+ /// 新节点
+ private TreeNode CloneTreeNode(TreeNode sourceNode)
+ {
+ if (sourceNode == null) return null;
+
+ TreeNode newNode = new TreeNode();
+ newNode.NodeID = sourceNode.NodeID;
+ newNode.Text = sourceNode.Text;
+ newNode.ToolTip = sourceNode.ToolTip;
+ newNode.CommandName = sourceNode.CommandName;
+ newNode.Selectable = sourceNode.Selectable;
+ newNode.EnableClickEvent = sourceNode.EnableClickEvent;
+ newNode.EnableExpandEvent = sourceNode.EnableExpandEvent;
+ newNode.Expanded = sourceNode.Expanded;
+ newNode.Icon = sourceNode.Icon;
+
+ // 递归复制子节点
+ if (sourceNode.Nodes != null && sourceNode.Nodes.Count > 0)
+ {
+ foreach (TreeNode childNode in sourceNode.Nodes)
+ {
+ TreeNode clonedChild = CloneTreeNode(childNode);
+ if (clonedChild != null)
+ {
+ newNode.Nodes.Add(clonedChild);
+ }
+ }
+ }
+
+ return newNode;
+ }
+
protected void Page_Load(object sender, EventArgs e)
{
ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId);
if (!IsPostBack)
{
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
- this.InitTreeMenu();//加载树
+ this.InitTreeMenu_WithCache();//加载树
this.JointComplete = 0;
this.JointNoComplete = 0;
this.JointPre = 0;
@@ -97,10 +138,100 @@ namespace FineUIPro.Web.HJGL.InfoQuery
}
}
#region 加载树装置-单位-工作区
+
+ // 优化后的节点处理方法
+ private void ProcessUnitWorkNodes(List unitWorks, TreeNode parentNode,
+ Dictionary pipelineCountDict,
+ Dictionary unitDict)
+ {
+ foreach (var unitWork in unitWorks)
+ {
+ // 优化: 使用字典查找，避免数据库查询
+ int pipelineCount = pipelineCountDict.ContainsKey(unitWork.UnitWorkId) ? pipelineCountDict[unitWork.UnitWorkId] : 0;
+ string unitName = unitDict.ContainsKey(unitWork.UnitId) ? unitDict[unitWork.UnitId] : "未知单位";
+
+ TreeNode treeNode = new TreeNode();
+ treeNode.NodeID = unitWork.UnitWorkId;
+ treeNode.Text = unitWork.UnitWorkName + "【" + pipelineCount.ToString() + "】管线";
+ treeNode.ToolTip = "施工单位：" + unitName;
+ treeNode.CommandName = 1 + "|" + Funs.GetEndPageNumber(pipelineCount, pageSize);
+ treeNode.EnableClickEvent = true;
+ treeNode.EnableExpandEvent = true;
+ parentNode.Nodes.Add(treeNode);
+
+ if (pipelineCount > 0)
+ {
+ TreeNode newNode = new TreeNode();
+ newNode.Text = "加载管线...";
+ newNode.NodeID = "加载管线...";
+ treeNode.Nodes.Add(newNode);
+ }
+ }
+ }
+
///
- /// 加载树
+ /// 带缓存的树加载方法
///
- private void InitTreeMenu()
+ private void InitTreeMenu_WithCache()
+ {
+ bool cacheHit = false;
+ string projectId = this.CurrUser.LoginProjectId;
+ string cacheKey = CACHE_KEY_PREFIX + projectId;
+ string searchTerm = this.tvPipeCode.Text.Trim();
+
+ // 如果有搜索条件，不使用缓存，直接执行优化查询
+ if (!string.IsNullOrEmpty(searchTerm))
+ {
+ InitTreeMenu_Optimized();
+ return;
+ }
+
+ // 检查缓存
+ if (Cache[cacheKey] != null)
+ {
+ var cachedData = Cache[cacheKey] as List;
+ if (cachedData != null)
+ {
+ cacheHit = true;
+ this.tvControlItem.Nodes.Clear();
+ foreach (var node in cachedData)
+ {
+ this.tvControlItem.Nodes.Add(CloneTreeNode(node));
+ }
+ return;
+ }
+ }
+
+ // 执行优化的初始化逻辑
+ InitTreeMenu_Optimized();
+
+ // 缓存结果
+ var nodesToCache = new List();
+ foreach (TreeNode node in this.tvControlItem.Nodes)
+ {
+ nodesToCache.Add(CloneTreeNode(node));
+ }
+ Cache.Insert(cacheKey, nodesToCache, null, DateTime.Now.AddMinutes(30), TimeSpan.Zero);
+
+ }
+
+ ///
+ /// 清理项目相关的缓存
+ ///
+ private void ClearProjectCache()
+ {
+ string projectId = this.CurrUser.LoginProjectId;
+ string cacheKey = CACHE_KEY_PREFIX + projectId;
+ if (Cache[cacheKey] != null)
+ {
+ Cache.Remove(cacheKey);
+ }
+ }
+
+ ///
+ /// 优化版本的树加载方法
+ ///
+ private void InitTreeMenu_Optimized()
{
this.tvControlItem.Nodes.Clear();
@@ -118,92 +249,58 @@ namespace FineUIPro.Web.HJGL.InfoQuery
rootNode2.Expanded = true;
this.tvControlItem.Nodes.Add(rootNode2);
- var pUnits = (from x in Funs.DB.Project_ProjectUnit where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
- // 获取当前用户所在单位
- var currUnit = pUnits.FirstOrDefault(x => x.UnitId == this.CurrUser.UnitId);
+ string projectId = this.CurrUser.LoginProjectId;
+ string searchTerm = this.tvPipeCode.Text.Trim();
+ // 优化1: 使用单次查询获取所需数据，减少数据库往返次数
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
- where x.ProjectId == this.CurrUser.LoginProjectId
- && x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
+ where x.ProjectId == projectId
+ && x.SuperUnitWork == null
+ && x.UnitId != null
+ && x.ProjectType != null
select x).ToList();
- List unitWork1 = null;
- List unitWork2 = null;
+ // 优化2: 批量获取所有相关管线数据，避免N+1查询问题
+ var unitWorkIds = unitWorkList.Select(x => x.UnitWorkId).ToList();
+
+ var pipelineQuery = from p in Funs.DB.HJGL_Pipeline
+ where p.ProjectId == projectId
+ && unitWorkIds.Contains(p.UnitWorkId)
+ select p;
- //// 当前为施工单位，只能操作本单位的数据
- //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
- //{
- // unitWork1 = (from x in unitWorkList
- // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
- // select x).ToList();
- // unitWork2 = (from x in unitWorkList
- // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
- // select x).ToList();
- //}
- //else
- //{
- unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
- unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
- //}
- if (unitWork1.Count() > 0)
+ // 如果有搜索条件，添加过滤
+ if (!string.IsNullOrEmpty(searchTerm))
{
- foreach (var q in unitWork1)
- {
- int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
- var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
- TreeNode tn1 = new TreeNode();
- tn1.NodeID = q.UnitWorkId;
- tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
- tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
- tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
- tn1.EnableClickEvent = true;
- tn1.EnableExpandEvent = true;
- rootNode1.Nodes.Add(tn1);
- if (a > 0)
- {
- // BindNodes(tn1);
- TreeNode newNode = new TreeNode();
- newNode.Text = "加载管线...";
- newNode.NodeID = "加载管线...";
- tn1.Nodes.Add(newNode);
- }
- //if (a > 0)
- //{
- // BindNodes(tn1);
- //}
- }
+ pipelineQuery = pipelineQuery.Where(p => p.PipelineCode.Contains(searchTerm));
}
- if (unitWork2.Count() > 0)
- {
- foreach (var q in unitWork2)
- {
- int a = (from x in Funs.DB.HJGL_Pipeline
- where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId
- && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim())
- select x).Count();
- var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
- TreeNode tn2 = new TreeNode();
- tn2.NodeID = q.UnitWorkId;
- tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
- if (q.UnitWorkId == this.hdUnitWorkId.Text)
- {
- tn2.Expanded = true;
- }
- tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
- tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
- tn2.EnableClickEvent = true;
- tn2.EnableExpandEvent = true;
- rootNode2.Nodes.Add(tn2);
- if (a > 0)
- {
- // BindNodes(tn2);
- TreeNode newNode = new TreeNode();
- newNode.Text = "加载管线...";
- newNode.NodeID = "加载管线...";
- tn2.Nodes.Add(newNode);
- }
- }
+ var pipelineCountDict = (from p in pipelineQuery
+ group p by p.UnitWorkId into g
+ select new {
+ UnitWorkId = g.Key,
+ Count = g.Count()
+ }).ToDictionary(x => x.UnitWorkId, x => x.Count);
+
+ // 优化3: 批量获取单位信息
+ var unitIds = unitWorkList.Where(x => x.UnitId != null).Select(x => x.UnitId).Distinct().ToList();
+ var unitDict = (from u in Funs.DB.Base_Unit
+ where unitIds.Contains(u.UnitId)
+ select u).ToDictionary(x => x.UnitId, x => x.UnitName);
+
+ // 优化4: 使用Dictionary进行快速查找，避免重复查询
+ List unitWork1 = unitWorkList.Where(x => x.ProjectType == "1").ToList();
+ List unitWork2 = unitWorkList.Where(x => x.ProjectType == "2").ToList();
+
+ // 处理建筑工程
+ if (unitWork1.Count > 0)
+ {
+ ProcessUnitWorkNodes(unitWork1, rootNode1, pipelineCountDict, unitDict);
+ }
+
+ // 处理安装工程
+ if (unitWork2.Count > 0)
+ {
+ ProcessUnitWorkNodes(unitWork2, rootNode2, pipelineCountDict, unitDict);
}
}
#endregion
@@ -382,7 +479,9 @@ namespace FineUIPro.Web.HJGL.InfoQuery
///
protected void btnTreeFind_Click(object sender, EventArgs e)
{
- this.InitTreeMenu();
+ // 清理缓存以确保获取最新数据（特别是当搜索条件改变时）
+ ClearProjectCache();
+ this.InitTreeMenu_WithCache();
//this.BindGrid3(this.tvControlItem.SelectedNodeID);
}
protected void btnrefresh_Click(object sender, EventArgs e)
@@ -457,7 +556,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
///
protected void Tree_TextChanged(object sender, EventArgs e)
{
- this.InitTreeMenu();
+ this.InitTreeMenu_WithCache();
this.BindGrid();
}
protected void btnGetChart_Click(object sender, EventArgs e)
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx
index 3e334bbb..a57f46b1 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx
@@ -83,10 +83,10 @@
HeaderText="联系人电话" HeaderTextAlign="Center" TextAlign="Center">
--%>
+ HeaderText="签收人" HeaderTextAlign="Center" TextAlign="Center">
+ HeaderText="签收时间" HeaderTextAlign="Center" TextAlign="Center">
diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx
index b7efb2dd..2c1a8bb3 100644
--- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx
@@ -64,6 +64,7 @@
+
diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs
index 494f725e..9548c69c 100644
--- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs
@@ -319,6 +319,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
this.txtTestPackageNo.Text = testPackageManage.TestPackageNo;
this.txtTestPackageName.Text = testPackageManage.TestPackageName;
this.txtRemark.Text = testPackageManage.Remark;
+ this.txtPressure.Text=BLL.Base_PressureService.GetPressureByPressureId(testPackageManage.PressureId)?.PressureName;
this.txtadjustTestPressure.Text = testPackageManage.AdjustTestPressure;
}
}
diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.designer.cs
index 9d9b808f..17fda953 100644
--- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.designer.cs
@@ -167,6 +167,15 @@ namespace FineUIPro.Web.HJGL.TestPackage
///
protected global::FineUIPro.Label txtTestPackageName;
+ ///
+ /// txtPressure 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label txtPressure;
+
///
/// txtRemark 控件。
///
diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx
index ce1151b5..cf00ffd3 100644
--- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx
@@ -28,6 +28,7 @@
+
diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx.cs
index 2fc8c47e..8038b6b1 100644
--- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx.cs
@@ -1,4 +1,5 @@
using BLL;
+using FineUIPro.Web.HJGL.BaseInfo;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -69,7 +70,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
//Funs.FineUIPleaseSelect(this.drpUnit);
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//单位
BLL.UnitWorkService.InitUnitWorkDropDownList(drpUnitWork, this.CurrUser.LoginProjectId, true);
-
+ BLL.Base_PressureService.InitPressureDropDownList(this.drpPressure, true); //试压类型
var list = (from x in Funs.DB.PTP_PipelineList
where x.PTP_ID == this.PTP_ID
select x).ToList();
@@ -115,6 +116,10 @@ namespace FineUIPro.Web.HJGL.TestPackage
drpUnitWork.SelectedValue = testPackageManage.UnitWorkId;
//var UnitWork = this.drpUnitWork.Items.FirstOrDefault(x => x.Value == testPackageManage.UnitWorkId);
}
+ if (!string.IsNullOrEmpty(testPackageManage.PressureId))
+ {
+ this.drpPressure.SelectedValue = testPackageManage.PressureId;
+ }
this.txtTestPackageName.Text = testPackageManage.TestPackageName;
this.txtRemark.Text = testPackageManage.Remark;
this.txtadjustTestPressure.Text = testPackageManage.AdjustTestPressure;
@@ -281,7 +286,10 @@ namespace FineUIPro.Web.HJGL.TestPackage
{
testPackage.UnitId = this.drpUnit.SelectedValue;
}
-
+ if (this.drpPressure.SelectedValue != BLL.Const._Null)
+ {
+ testPackage.PressureId = this.drpPressure.SelectedValue;
+ }
testPackage.TestPackageNo = this.txtTestPackageNo.Text.Trim();
testPackage.TestPackageName = this.txtTestPackageName.Text.Trim();
testPackage.Tabler = this.CurrUser.PersonId;
diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx.designer.cs
index 8e19cd8f..d1e11951 100644
--- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx.designer.cs
@@ -104,6 +104,15 @@ namespace FineUIPro.Web.HJGL.TestPackage
///
protected global::FineUIPro.DropDownList drpUnitWork;
+ ///
+ /// drpPressure 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpPressure;
+
///
/// txtRemark 控件。
///
diff --git a/SGGL/Model/HJGL/PipelinePrefabricatedComponentsItem.cs b/SGGL/Model/HJGL/PipelinePrefabricatedComponentsItem.cs
index 7584d9f4..9786f0e8 100644
--- a/SGGL/Model/HJGL/PipelinePrefabricatedComponentsItem.cs
+++ b/SGGL/Model/HJGL/PipelinePrefabricatedComponentsItem.cs
@@ -12,6 +12,7 @@ namespace Model
public class PipelinePrefabricatedComponentsItem
{
public string Id { get; set; }
+ public string TwOutputDetailId { get; set; }
public string MaterialCode { get; set; }
public string MaterialName { get; set; }
public string MaterialUnit { get; set; }
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 111b52a7..f283c84e 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -12291,7 +12291,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")]
public string ApproveIdea
{
get
@@ -22470,6 +22470,8 @@ namespace Model
private string _UnitId;
+ private string _ProjectId;
+
private string _MaterialId;
private string _ColorName;
@@ -22480,8 +22482,6 @@ namespace Model
private string _Remark;
- private string _ProjectId;
-
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -22490,6 +22490,8 @@ namespace Model
partial void OnMaterialColorIdChanged();
partial void OnUnitIdChanging(string value);
partial void OnUnitIdChanged();
+ partial void OnProjectIdChanging(string value);
+ partial void OnProjectIdChanged();
partial void OnMaterialIdChanging(string value);
partial void OnMaterialIdChanged();
partial void OnColorNameChanging(string value);
@@ -22500,8 +22502,6 @@ namespace Model
partial void OnRGBChanged();
partial void OnRemarkChanging(string value);
partial void OnRemarkChanged();
- partial void OnProjectIdChanging(string value);
- partial void OnProjectIdChanged();
#endregion
public Base_MaterialColor()
@@ -22549,6 +22549,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+ public string ProjectId
+ {
+ get
+ {
+ return this._ProjectId;
+ }
+ set
+ {
+ if ((this._ProjectId != value))
+ {
+ this.OnProjectIdChanging(value);
+ this.SendPropertyChanging();
+ this._ProjectId = value;
+ this.SendPropertyChanged("ProjectId");
+ this.OnProjectIdChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialId", DbType="NVarChar(50)")]
public string MaterialId
{
@@ -22649,26 +22669,6 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
- public string ProjectId
- {
- get
- {
- return this._ProjectId;
- }
- set
- {
- if ((this._ProjectId != value))
- {
- this.OnProjectIdChanging(value);
- this.SendPropertyChanging();
- this._ProjectId = value;
- this.SendPropertyChanged("ProjectId");
- this.OnProjectIdChanged();
- }
- }
- }
-
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -97844,10 +97844,10 @@ namespace Model
private string _TrainNumber;
- private System.Nullable _TypeInt;
-
private string _TrainNumberId;
+ private System.Nullable _TypeInt;
+
private string _CompileMan;
private System.Nullable _CompileDate;
@@ -97882,10 +97882,10 @@ namespace Model
partial void OnReceiveDateChanged();
partial void OnTrainNumberChanging(string value);
partial void OnTrainNumberChanged();
- partial void OnTypeIntChanging(System.Nullable value);
- partial void OnTypeIntChanged();
partial void OnTrainNumberIdChanging(string value);
partial void OnTrainNumberIdChanged();
+ partial void OnTypeIntChanging(System.Nullable value);
+ partial void OnTypeIntChanged();
partial void OnCompileManChanging(string value);
partial void OnCompileManChanged();
partial void OnCompileDateChanging(System.Nullable value);
@@ -98139,26 +98139,6 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeInt", DbType="Int")]
- public System.Nullable TypeInt
- {
- get
- {
- return this._TypeInt;
- }
- set
- {
- if ((this._TypeInt != value))
- {
- this.OnTypeIntChanging(value);
- this.SendPropertyChanging();
- this._TypeInt = value;
- this.SendPropertyChanged("TypeInt");
- this.OnTypeIntChanged();
- }
- }
- }
-
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainNumberId", DbType="VarChar(50)")]
public string TrainNumberId
{
@@ -98179,6 +98159,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeInt", DbType="Int")]
+ public System.Nullable TypeInt
+ {
+ get
+ {
+ return this._TypeInt;
+ }
+ set
+ {
+ if ((this._TypeInt != value))
+ {
+ this.OnTypeIntChanging(value);
+ this.SendPropertyChanging();
+ this._TypeInt = value;
+ this.SendPropertyChanged("TypeInt");
+ this.OnTypeIntChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")]
public string CompileMan
{
@@ -109426,7 +109426,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(500)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(50)")]
public string Rectification
{
get
@@ -109552,7 +109552,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measures", DbType="NVarChar(500)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measures", DbType="NVarChar(50)")]
public string Measures
{
get
@@ -162267,7 +162267,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")]
public string AttentPerson
{
get
@@ -193250,7 +193250,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(255)")]
public string ProjectDescription
{
get
@@ -193370,7 +193370,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(255)")]
public string CalculationRule
{
get
@@ -193430,7 +193430,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(100)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(50)")]
public string ConstructionSubcontractor
{
get
@@ -193814,7 +193814,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")]
public System.Nullable WorkPackageEstimate
{
get
@@ -194119,16 +194119,6 @@ namespace Model
private string _ProjectId;
- private string _ContractId;
-
- private string _OrderCode;
-
- private System.Nullable _OrderInDate;
-
- private System.Nullable _OrderOutDate;
-
- private string _MaterialRequisitionUnit;
-
private System.Nullable _State;
private string _InvoiceCode;
@@ -194157,6 +194147,16 @@ namespace Model
private string _CreateUser;
+ private string _ContractId;
+
+ private System.Nullable _OrderInDate;
+
+ private string _OrderCode;
+
+ private System.Nullable _OrderOutDate;
+
+ private string _MaterialRequisitionUnit;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -194165,16 +194165,6 @@ namespace Model
partial void OnInvoiceIdChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
- partial void OnContractIdChanging(string value);
- partial void OnContractIdChanged();
- partial void OnOrderCodeChanging(string value);
- partial void OnOrderCodeChanged();
- partial void OnOrderInDateChanging(System.Nullable value);
- partial void OnOrderInDateChanged();
- partial void OnOrderOutDateChanging(System.Nullable value);
- partial void OnOrderOutDateChanged();
- partial void OnMaterialRequisitionUnitChanging(string value);
- partial void OnMaterialRequisitionUnitChanged();
partial void OnStateChanging(System.Nullable value);
partial void OnStateChanged();
partial void OnInvoiceCodeChanging(string value);
@@ -194203,6 +194193,16 @@ namespace Model
partial void OnCreateDateChanged();
partial void OnCreateUserChanging(string value);
partial void OnCreateUserChanged();
+ partial void OnContractIdChanging(string value);
+ partial void OnContractIdChanged();
+ partial void OnOrderInDateChanging(System.Nullable value);
+ partial void OnOrderInDateChanged();
+ partial void OnOrderCodeChanging(string value);
+ partial void OnOrderCodeChanged();
+ partial void OnOrderOutDateChanging(System.Nullable value);
+ partial void OnOrderOutDateChanged();
+ partial void OnMaterialRequisitionUnitChanging(string value);
+ partial void OnMaterialRequisitionUnitChanged();
#endregion
public PHTGL_Invoice()
@@ -194250,106 +194250,6 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
- public string ContractId
- {
- get
- {
- return this._ContractId;
- }
- set
- {
- if ((this._ContractId != value))
- {
- this.OnContractIdChanging(value);
- this.SendPropertyChanging();
- this._ContractId = value;
- this.SendPropertyChanged("ContractId");
- this.OnContractIdChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")]
- public string OrderCode
- {
- get
- {
- return this._OrderCode;
- }
- set
- {
- if ((this._OrderCode != value))
- {
- this.OnOrderCodeChanging(value);
- this.SendPropertyChanging();
- this._OrderCode = value;
- this.SendPropertyChanged("OrderCode");
- this.OnOrderCodeChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
- public System.Nullable OrderInDate
- {
- get
- {
- return this._OrderInDate;
- }
- set
- {
- if ((this._OrderInDate != value))
- {
- this.OnOrderInDateChanging(value);
- this.SendPropertyChanging();
- this._OrderInDate = value;
- this.SendPropertyChanged("OrderInDate");
- this.OnOrderInDateChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")]
- public System.Nullable OrderOutDate
- {
- get
- {
- return this._OrderOutDate;
- }
- set
- {
- if ((this._OrderOutDate != value))
- {
- this.OnOrderOutDateChanging(value);
- this.SendPropertyChanging();
- this._OrderOutDate = value;
- this.SendPropertyChanged("OrderOutDate");
- this.OnOrderOutDateChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")]
- public string MaterialRequisitionUnit
- {
- get
- {
- return this._MaterialRequisitionUnit;
- }
- set
- {
- if ((this._MaterialRequisitionUnit != value))
- {
- this.OnMaterialRequisitionUnitChanging(value);
- this.SendPropertyChanging();
- this._MaterialRequisitionUnit = value;
- this.SendPropertyChanged("MaterialRequisitionUnit");
- this.OnMaterialRequisitionUnitChanged();
- }
- }
- }
-
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")]
public System.Nullable State
{
@@ -194630,6 +194530,106 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
+ public string ContractId
+ {
+ get
+ {
+ return this._ContractId;
+ }
+ set
+ {
+ if ((this._ContractId != value))
+ {
+ this.OnContractIdChanging(value);
+ this.SendPropertyChanging();
+ this._ContractId = value;
+ this.SendPropertyChanged("ContractId");
+ this.OnContractIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
+ public System.Nullable OrderInDate
+ {
+ get
+ {
+ return this._OrderInDate;
+ }
+ set
+ {
+ if ((this._OrderInDate != value))
+ {
+ this.OnOrderInDateChanging(value);
+ this.SendPropertyChanging();
+ this._OrderInDate = value;
+ this.SendPropertyChanged("OrderInDate");
+ this.OnOrderInDateChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")]
+ public string OrderCode
+ {
+ get
+ {
+ return this._OrderCode;
+ }
+ set
+ {
+ if ((this._OrderCode != value))
+ {
+ this.OnOrderCodeChanging(value);
+ this.SendPropertyChanging();
+ this._OrderCode = value;
+ this.SendPropertyChanged("OrderCode");
+ this.OnOrderCodeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")]
+ public System.Nullable OrderOutDate
+ {
+ get
+ {
+ return this._OrderOutDate;
+ }
+ set
+ {
+ if ((this._OrderOutDate != value))
+ {
+ this.OnOrderOutDateChanging(value);
+ this.SendPropertyChanging();
+ this._OrderOutDate = value;
+ this.SendPropertyChanged("OrderOutDate");
+ this.OnOrderOutDateChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")]
+ public string MaterialRequisitionUnit
+ {
+ get
+ {
+ return this._MaterialRequisitionUnit;
+ }
+ set
+ {
+ if ((this._MaterialRequisitionUnit != value))
+ {
+ this.OnMaterialRequisitionUnitChanging(value);
+ this.SendPropertyChanging();
+ this._MaterialRequisitionUnit = value;
+ this.SendPropertyChanged("MaterialRequisitionUnit");
+ this.OnMaterialRequisitionUnitChanged();
+ }
+ }
+ }
+
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -218741,6 +218741,8 @@ namespace Model
private System.Nullable _PrintState;
+ private string _PressureId;
+
private EntitySet _PTP_ItemEndCheckList;
private EntitySet _PTP_PipelineList;
@@ -218819,6 +218821,8 @@ namespace Model
partial void OnTestDateChanged();
partial void OnPrintStateChanging(System.Nullable value);
partial void OnPrintStateChanged();
+ partial void OnPressureIdChanging(string value);
+ partial void OnPressureIdChanged();
#endregion
public PTP_TestPackage()
@@ -219498,6 +219502,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PressureId", DbType="VarChar(50)")]
+ public string PressureId
+ {
+ get
+ {
+ return this._PressureId;
+ }
+ set
+ {
+ if ((this._PressureId != value))
+ {
+ this.OnPressureIdChanging(value);
+ this.SendPropertyChanging();
+ this._PressureId = value;
+ this.SendPropertyChanged("PressureId");
+ this.OnPressureIdChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PTP_ItemEndCheckList_PTP_TestPackage", Storage="_PTP_ItemEndCheckList", ThisKey="PTP_ID", OtherKey="PTP_ID", DeleteRule="NO ACTION")]
public EntitySet PTP_ItemEndCheckList
{
@@ -317327,7 +317351,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(200)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")]
public string Name
{
get
@@ -317904,7 +317928,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent
{
get
@@ -318095,7 +318119,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent
{
get
@@ -323434,7 +323458,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent
{
get
@@ -324906,7 +324930,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent
{
get
@@ -334457,7 +334481,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(1500)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(500)")]
public string ContractNo
{
get
@@ -334477,7 +334501,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(1500)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(500)")]
public string UnitWorks
{
get