From b7bc12c355177779739b3d7c1dc66cf16f3f4f27 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Sat, 8 Feb 2025 14:41:56 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SGGL/BLL/HSSE/EduTrain/TestRecordService.cs | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/SGGL/BLL/HSSE/EduTrain/TestRecordService.cs b/SGGL/BLL/HSSE/EduTrain/TestRecordService.cs
index 32f7241d..5e1d7713 100644
--- a/SGGL/BLL/HSSE/EduTrain/TestRecordService.cs
+++ b/SGGL/BLL/HSSE/EduTrain/TestRecordService.cs
@@ -36,14 +36,16 @@ namespace BLL
///
public static IEnumerable getListData(string personId, Grid Grid1)
{
- IQueryable getDataList = getDataLists.Where(x => x.TestManId == personId);
+ var db1 = Funs.DB;
+ IQueryable getDataList = (from x in db1.Training_TestRecord
+ where x.TestStartTime.HasValue
+ select x).Where(x => x.TestManId == personId);
count = getDataList.Count();
if (count == 0)
{
return null;
}
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
- var db1 = Funs.DB;
return from x in getDataList
join y in db1.Training_TestPlan on x.TestPlanId equals y.TestPlanId
join z in db1.Training_Plan on y.PlanId equals z.PlanId into g
From d902056b7e71f45da59494b8715d5055e3680840 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Sat, 8 Feb 2025 14:52:47 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=AF=A6=E6=83=85=E9=A1=B5=E6=8A=A5=E9=94=99?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SGGL/BLL/HSSE/QualityAudit/PersonQualityService.cs | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/SGGL/BLL/HSSE/QualityAudit/PersonQualityService.cs b/SGGL/BLL/HSSE/QualityAudit/PersonQualityService.cs
index a40c266f..ea2bda7d 100644
--- a/SGGL/BLL/HSSE/QualityAudit/PersonQualityService.cs
+++ b/SGGL/BLL/HSSE/QualityAudit/PersonQualityService.cs
@@ -38,14 +38,16 @@ namespace BLL
///
public static IEnumerable getListData(string personId, Grid Grid1)
{
- IQueryable getDataList = getDataLists.Where(x => x.PersonId == personId);
+ var db1 = Funs.DB;
+ IQueryable getDataList = (from x in db1.QualityAudit_PersonQuality
+ select x).Where(x => x.PersonId == personId);
count = getDataList.Count();
if (count == 0)
{
return null;
}
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
- var db1 = Funs.DB;
+
return from x in getDataList
select new
{
From d8cd15555d2be5dbb9c39629c3c49ae5bb5e5b6a Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 10 Feb 2025 11:33:17 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BLL/HSSE/OccupationHealth/PhysicalExaminationService.cs | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/SGGL/BLL/HSSE/OccupationHealth/PhysicalExaminationService.cs b/SGGL/BLL/HSSE/OccupationHealth/PhysicalExaminationService.cs
index 4400b648..1e3b62bb 100644
--- a/SGGL/BLL/HSSE/OccupationHealth/PhysicalExaminationService.cs
+++ b/SGGL/BLL/HSSE/OccupationHealth/PhysicalExaminationService.cs
@@ -37,7 +37,9 @@ namespace BLL
///
public static IEnumerable getListData(string projectId, string personName, Grid Grid1)
{
- IQueryable getDataList = getDataLists;
+ var db1 = Funs.DB;
+ IQueryable getDataList = from x in db1.SitePerson_Person
+ select x;
if (!string.IsNullOrEmpty(projectId))
{
getDataList = getDataList.Where(e => e.ProjectId == projectId);
@@ -53,7 +55,7 @@ namespace BLL
return null;
}
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
- var db1 = Funs.DB;
+
return from x in getDataList
select new
{
From 1697e69054a8ae5c884102724e1c21edbac07029 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 18 Feb 2025 15:12:04 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SGGLDB_V2025-02-18-001-gaofei.sql | 3 +
.../Hazard/ConstructionRiskListService.cs | 39 ++++++++++++-
.../Excel/DataIn/施工作业风险导入模板.xls | Bin 22016 -> 21504 bytes
.../HSSE/Hazard/ConstructionRisk.aspx | 4 +-
.../HSSE/Hazard/ConstructionRiskEdit.aspx | 38 +++++++-----
.../HSSE/Hazard/ConstructionRiskEdit.aspx.cs | 49 ++++++++++++++--
.../ConstructionRiskEdit.aspx.designer.cs | 54 ++++++++++++------
.../HSSE/Hazard/ConstructionRiskMap.aspx.cs | 6 +-
.../HSSE/Hazard/ConstructionRiskView.aspx | 53 ++++++++++-------
.../HSSE/Hazard/ConstructionRiskView.aspx.cs | 15 +++--
.../ConstructionRiskView.aspx.designer.cs | 54 ++++++++++++------
SGGL/Model/Model.cs | 48 ++++++++++++++++
12 files changed, 277 insertions(+), 86 deletions(-)
create mode 100644 DataBase/版本日志/SGGLDB_V2025-02-18-001-gaofei.sql
diff --git a/DataBase/版本日志/SGGLDB_V2025-02-18-001-gaofei.sql b/DataBase/版本日志/SGGLDB_V2025-02-18-001-gaofei.sql
new file mode 100644
index 00000000..07061f7f
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2025-02-18-001-gaofei.sql
@@ -0,0 +1,3 @@
+alter table HSSE_ConstructionRisk add IsLarge bit null
+alter table HSSE_ConstructionRisk add IsSuperLarge bit null
+GO
\ No newline at end of file
diff --git a/SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs b/SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs
index 307cfa36..1deb450a 100644
--- a/SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs
+++ b/SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs
@@ -8,7 +8,7 @@ namespace BLL
{
public static class ConstructionRiskListService
{
-
+
///
/// 要求主键获取危险清单信息
@@ -48,6 +48,8 @@ namespace BLL
UnitId = constructionRisk.UnitId,
RiskLevel = constructionRisk.RiskLevel,
Coordinate = constructionRisk.Coordinate,
+ IsLarge = constructionRisk.IsLarge,
+ IsSuperLarge = constructionRisk.IsSuperLarge,
SubUnitDutyPerson = constructionRisk.SubUnitDutyPerson,
MainUnitDutyPerson = constructionRisk.MainUnitDutyPerson,
MainUnitCheckPerson = constructionRisk.MainUnitCheckPerson,
@@ -142,6 +144,8 @@ namespace BLL
newHazardList.UnitId = hazardList.UnitId;
newHazardList.RiskLevel = hazardList.RiskLevel;
newHazardList.Coordinate = hazardList.Coordinate;
+ newHazardList.IsLarge = hazardList.IsLarge;
+ newHazardList.IsSuperLarge = hazardList.IsSuperLarge;
newHazardList.SubUnitDutyPerson = hazardList.SubUnitDutyPerson;
newHazardList.MainUnitDutyPerson = hazardList.MainUnitDutyPerson;
newHazardList.MainUnitCheckPerson = hazardList.MainUnitCheckPerson;
@@ -175,7 +179,27 @@ namespace BLL
}
///
- /// 获取作业风险描述下拉项
+ /// 获取涉及的高风险作业下拉项
+ ///
+ ///
+ public static ListItem[] RefLicenseList()
+ {
+ ListItem[] lis = new ListItem[10];
+ lis[0] = new ListItem("不涉及", "不涉及");
+ lis[1] = new ListItem("动火作业", "动火作业");
+ lis[2] = new ListItem("高处作业", "高处作业");
+ lis[3] = new ListItem("受限空间作业", "受限空间作业");
+ lis[4] = new ListItem("射线作业", "射线作业");
+ lis[5] = new ListItem("断路（占道）作业", "断路（占道）作业");
+ lis[6] = new ListItem("夜间施工作业", "夜间施工作业");
+ lis[7] = new ListItem("吊装作业", "吊装作业");
+ lis[8] = new ListItem("动土作业", "动土作业");
+ lis[9] = new ListItem("试压作业", "试压作业");
+ return lis;
+ }
+
+ ///
+ /// 获取作业风险下拉项
///
///
public static ListItem[] LicenseDesList()
@@ -230,6 +254,17 @@ namespace BLL
return lis;
}
+ ///
+ /// 获取风险等级下拉项
+ ///
+ ///
+ public static ListItem[] RiskLevelList3()
+ {
+ ListItem[] lis = new ListItem[1];
+ lis[0] = new ListItem("重大风险", "重大风险");
+ return lis;
+ }
+
///
/// 根据状态选择下一步办理类型
///
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/施工作业风险导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/施工作业风险导入模板.xls
index b1ab96ecb682f40048e6c231383821a6c635b073..74ac93cd01a2c892842a2a34844f4878cb1ccb0c 100644
GIT binary patch
delta 3748
zcma)7niD
z&<90+jH2UM+v>Og6vS{qBB#
zxBI=lz3Sb#x(PQkijYKvP_G~e4EaxjFvU9O7R8%*{d}gLS*$`^YRh)5hAL*QVne?3
z1yks!2t+U`@FUfMcJ5#of=hvkYNniMu3{y`O|^kNh;d7Tns6vQ4l)M5R(i(29Vw7X
z4dKDta2Pm)hcN;#@bF7;K1L7|!pch{Qs9qgmzAa=J&ME_3H(t7$qcPU@O}upK-PMV
z)T&V(_Owd9#QFeA{aa+T4CEb6(vKWa4>=k(Z2*PdOQh)gDX`al7rh!*p8qw3Nrqk`
zY#rPhAhl{V;yiS^$2secQ?!Fd8!zeK_8pDs%LkLWa?aIOF)&}Rf@8XHn5m0_oQME8
zVbEeV2;nR#OZ8IOY7k>yKN>RFNa!WXyLv4Sf-XI)3nusZR0u`rBI4|v-GERV+=z(A
zAuvzJVh!+NEY`wk5{JUlhyr7nSKkm8wlQd95Mm76b&^>)oQq(w4ul8})`e+t1h9qz
zm=O^!W@%()y;@^iW4*m1A(mya(M?gqJOgV~dzJf0AYP2sJ-!+~qqb)CwUT?(4eo1%
z$?Qbt#F0PdIP2N`V7MQj2rq}lK#D05a^qvL4RT}R;lp?ik8?-uB+7P28WV?e+)){c
ztgzfP0cXG=Qv)6YB?%2U6K*A3it4!0BPdWX@@Fb4#n>NdNNl#O-_->d6BFWm+l@#?
zR#>izN-9-~>Lp3_nt^HvNjCXb*^^D7164f&>`jW)xsd`!@}ajSC#3p{{lsM5j}#IH
zB}4jyHhGvYl;klOx-4n9bM0^?=1KBmKZOy6qCkYrC>5CyhenZ~ePz`e4yB=bbpiQ#
zmQyS-6C(s7ni3%;d8VZKl&5P#en=s5!sHxY0+}hGp;VBWB+&=*tEhb0eLYZ^F2?>=%5HXD1!nr4+24EN-}Rm262q^|K+DxG6qfAzs!uwvH!;h^jujQ
zhv$ev2OD=76(skQ%klj5E;=ZZ2I9~FKlLqhB2NX${p51=-rYb48R;OJpGHtQ>4^Bc
z?+NjDIoiAT(LqD#Aex^>Q$cb+xg1Roy1g9tb0zdY^HFpV%}*98C_^%CfXmTy;FuRA
zPPoK*MdV}<&+-4giE#uZN`006Gv|2`ct9eBT>Uo`?F9|&-S0Wiz9J@vnRqHlZaTB2
z$GL_MilKvOrc07>Wc#YzbY@HM)dh4=EFDBM-AEZo+E?X!n3=cix$-F;#L+=C)1^{D
za?_bDt2!@JIMd0CCXNoGnJ%3QlAF$KdED^1^EXQ+R(^G`+d0E(VUz*L3NBj#Iauh&
z@#J99K*~(eXXhk_pe)27EWJT(WHS=o;JGjpO%C+-mC%-zOtfPqt!N-$ZJbBTjTN;v
zNh^B5S8MWUtKHghl2%+sUv08Sd)=+gmbBtZ_-aRaw04`ALyn{sC(~D(=Fx7mjc}G{
zFHkC4>~O$74W~n3ZZ9m!^;f@MI;7-m96Yu0DpYR|uXTlr0M
z^vvwvZ$EF0zgf5M@c4|9-G%w;51eiF7auh}pVV&1OF4BY@oCET5j9_&ne~17b7S+p
zxfRx*txcWWlb}z+k2eR`%saP`Gmg5`YTH`#=<20ei;w@J3&AH>G*rP
z3od>(Prj)HL5Zdm!KR{MXIuVFb>Ecibj-l1(Cf$~r|#9odMGNk;!7mTCnxqFipS#6
z`jV`n(l;GKK?=Rsb>wJ<(8*kcxO|vh(x%Y1I-^UEV2wXH)slUR96m{;f;&?-)ld5i
kFCyQIMa~IjSFk3UG)ERMdZTLTJ4-80n?WEdGb%qHp}^O5!L+)HV1+sj>cN!ycq&j0&;
z=iLAOIA_~YxUCJIBt&6)0DzOGX#)QmkW$nTmgKs_+;yH>v;sB}8v^%!XOIr$p&DYB
zC}OVT1@T&dC{Tpvh3*ctRc@^Qpc>r@O$xrJ!(;A1G5WGJ7g;3)J4A96O3{c!6M8JR
zJE(IT1c3w!m$pI$a!BJDDnPfTg|Gm{gpu5DO@Ro0x?)LbI#7cs2mwu96fvWB6`;B>
zlH1#l?*@at(AAqK^XVmU1f~}<+8!C1&WXGZN49{8$R1)p5CPH?^H*;o;iW<{8IyUc
z+$(ZF=H>H7hQRE;j}G}}3vjP{E*rhGWoD{$_j0oZt~s*n<7D$W!K|mFTwX&UtIDF$
zVC@*K0N^yUPWU2bYVTr|2GQXp)SwQP=R1~U+LU@0lpuM87ClhQp$rYENsSx}*(f)F
z)~dBe0&t0qB1e>xgd`eKX;Fhxj>;p$F*OiIpz4TXP56YWS*dK1v`7FE$*NT7Y6OYx
z@vVAX<%|eHv61;qHjyMx#u=`RM|gX)UA;Ja9<7G$jbi4hQF8L>i0z1-$VY)1BS{#7
z29#Q~oXjM|KPQPDO=O`IW}rDS3Ft+<7FyU=eu5TevaKDsmBqF?6SU}Nd=gUVVo-EK
z5?Y3TS0#j^T3s%jjn3(s;VWoiVl&J`gNe7M+#VdIML-IIh)O%t4gxaVHk$Sxzl&}p
zCC2&oYd|1&4R_QOeW{ok{hq!_<~J2?^YDjm(kDB1C5s`2lV^0IIH16jhenVFbU+JI@F!=Lcuzy+
z@)Za7*L7XgN6o2qzb6t>#p=Cfw0e~34fu8l{rmq75K!hj^RtkfSJmBeqU?Wb@
z1rDgRzZ|+r`-3qz9CImw8Jl>(iGpC02OL;wr=NE6gH@ghQ+!Kp<^d-Qg3TUqP^EqF
zX&*mW?E$;El-D!P-~p!!f-^ke;7a?A(I@=i2tTlkYaTb3g$Hb$6pZ>(3{)J5WP+Oi
zmtkXZOd*BaH$<1M{mMiB$&d_}nmi1jVdDkCT*G$Ro^`kJgQGYTrg&aaKEoyng1Lt6
zvN?yE`N0|v*u|x|wSmvDGX%k0!*9p^QMG!*~ZR%&kvr;fGz)RY6^!NzaXK-U?GXe)#LwX*lLKycymdQ
zmtkBDrwN07O^x}GNDu^bU2QatIku0_*cTil4CXVno|aJpGv>P5Xma+g<_E_LgZWH7
z(>>uy3b%WygN&x*y`S-ewZdRNQ>VGXlN4?@IM`^a9k|60juQs+RbjI)*j2d6iNfs$
zhZs#G=#Zn^Xoun>=Z72?vx&%z02%mP0R6WTg}CCo42*vuF^vx9Y&ei6$AGmKe=Xxf
zUu~SXwu;qe`fC|0`D%6E+Hx&Z6)R*PKn^9q#GuJjeCi3b81?0A=Pc#yjNQ`A$_h2*3vr
zu(C9IVbA`meOD_UH=-76YN!fVMk(&-%s^MI({-Oq_HmvM^Q6j3#Dp4efSKEI;FH}K
zRWDHFoH%Ozk7IO*4mlZR7pYEdSxG2Z1a4=~@a2mBI8
g(V{-6j>kh5R8`beZ?3j)(U#inRTY&edC9eZ0onKOuK)l5
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx
index 7a409f7c..ffccce62 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx
@@ -88,7 +88,7 @@
HeaderTextAlign="Center">
+ Width="1000px" Height="800px">
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
-
+
-
-
+
+
+
+
+
+
<%--
@@ -57,11 +68,12 @@
--%>
-
+
+
-
+
<%--
@@ -93,7 +105,7 @@
-
protected global::FineUIPro.Form SimpleForm1;
+ ///
+ /// drpWorkArea 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpWorkArea;
+
///
/// drpUnit 控件。
///
@@ -48,6 +57,15 @@ namespace FineUIPro.Web.HSSE.Hazard {
///
protected global::FineUIPro.DropDownList drpUnit;
+ ///
+ /// drpSubUnitDutyPerson 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpSubUnitDutyPerson;
+
///
/// dpDateA 控件。
///
@@ -75,24 +93,6 @@ namespace FineUIPro.Web.HSSE.Hazard {
///
protected global::FineUIPro.TextBox txtConstructionContent;
- ///
- /// drpSubUnitDutyPerson 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.DropDownList drpSubUnitDutyPerson;
-
- ///
- /// drpWorkArea 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.DropDownList drpWorkArea;
-
///
/// drpRefLicense 控件。
///
@@ -102,6 +102,24 @@ namespace FineUIPro.Web.HSSE.Hazard {
///
protected global::FineUIPro.DropDownList drpRefLicense;
+ ///
+ /// cbIsLarge 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.CheckBox cbIsLarge;
+
+ ///
+ /// cbIsSuperLarge 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.CheckBox cbIsSuperLarge;
+
///
/// drpRiskLevel 控件。
///
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskMap.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskMap.aspx.cs
index db6c9ce9..c74be662 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskMap.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskMap.aspx.cs
@@ -19,7 +19,7 @@ namespace FineUIPro.Web.ProjectData
{
string strSql = @"SELECT b.[MainItemId],b.[Coordinate],b.[MainItemName],count(*) num ,max(case when RiskLevel='低风险' then 1 when RiskLevel='一般风险' then 2 when RiskLevel='较大风险' then 3 else 4 end) RiskLevel
FROM [dbo].[HSSE_ConstructionRisk] a left join [dbo].[ProjectData_MainItem] b on a.[WorkAreaId]=b.[MainItemId]
- where a.ProjectId=@ProjectId and a.States='4'
+ where a.ProjectId=@ProjectId and a.States!='5'
group by b.[MainItemId],b.[Coordinate],b.[MainItemName]";
List listStr = new List();
listStr.Add(new SqlParameter("@ProjectId", CurrUser.LoginProjectId));
@@ -55,7 +55,7 @@ namespace FineUIPro.Web.ProjectData
,[ProjectId]
,[Coordinate]
FROM [dbo].[HSSE_ConstructionRisk] a left join Base_Unit b on a.[UnitId] = b.[UnitId]
- where a.WorkAreaId=@WorkAreaId and a.States='4'
+ where a.WorkAreaId=@WorkAreaId and a.States!='5'
";
//if (!string.IsNullOrEmpty(RiskLevel))
@@ -85,7 +85,7 @@ namespace FineUIPro.Web.ProjectData
string riskLevel = "";
string strSql = @"SELECT b.[MainItemId],b.[Coordinate],b.[MainItemName],count(*) num ,max(case when RiskLevel='低风险' then 1 when RiskLevel='一般风险' then 2 when RiskLevel='较大风险' then 3 else 4 end) RiskLevel
FROM [dbo].[HSSE_ConstructionRisk] a left join [dbo].[ProjectData_MainItem] b on a.[WorkAreaId]=b.[MainItemId]
- where a.ProjectId=@ProjectId and a.States='4'
+ where a.ProjectId=@ProjectId and a.States!='5'
";
List listStr = new List();
listStr.Add(new SqlParameter("@ProjectId", CurrUser.LoginProjectId));
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx
index 47787a26..fd189db4 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx
@@ -22,46 +22,59 @@
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
<%--
--%>
-
+
+
-
+
<%--
@@ -93,7 +106,7 @@
-
protected global::FineUIPro.Form SimpleForm1;
+ ///
+ /// drpWorkArea 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpWorkArea;
+
///
/// drpUnit 控件。
///
@@ -48,6 +57,15 @@ namespace FineUIPro.Web.HSSE.Hazard {
///
protected global::FineUIPro.DropDownList drpUnit;
+ ///
+ /// drpSubUnitDutyPerson 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpSubUnitDutyPerson;
+
///
/// dpDateA 控件。
///
@@ -75,24 +93,6 @@ namespace FineUIPro.Web.HSSE.Hazard {
///
protected global::FineUIPro.TextBox txtConstructionContent;
- ///
- /// drpSubUnitDutyPerson 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.DropDownList drpSubUnitDutyPerson;
-
- ///
- /// drpWorkArea 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.DropDownList drpWorkArea;
-
///
/// drpRefLicense 控件。
///
@@ -102,6 +102,24 @@ namespace FineUIPro.Web.HSSE.Hazard {
///
protected global::FineUIPro.DropDownList drpRefLicense;
+ ///
+ /// cbIsLarge 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.CheckBox cbIsLarge;
+
+ ///
+ /// cbIsSuperLarge 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.CheckBox cbIsSuperLarge;
+
///
/// drpRiskLevel 控件。
///
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 8db4915e..123b641b 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -104762,6 +104762,10 @@ namespace Model
private string _MainUnitCheckPerson;
+ private System.Nullable _IsLarge;
+
+ private System.Nullable _IsSuperLarge;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -104800,6 +104804,10 @@ namespace Model
partial void OnMainUnitDutyPersonChanged();
partial void OnMainUnitCheckPersonChanging(string value);
partial void OnMainUnitCheckPersonChanged();
+ partial void OnIsLargeChanging(System.Nullable value);
+ partial void OnIsLargeChanged();
+ partial void OnIsSuperLargeChanging(System.Nullable value);
+ partial void OnIsSuperLargeChanged();
#endregion
public HSSE_ConstructionRisk()
@@ -105147,6 +105155,46 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsLarge", DbType="Bit")]
+ public System.Nullable IsLarge
+ {
+ get
+ {
+ return this._IsLarge;
+ }
+ set
+ {
+ if ((this._IsLarge != value))
+ {
+ this.OnIsLargeChanging(value);
+ this.SendPropertyChanging();
+ this._IsLarge = value;
+ this.SendPropertyChanged("IsLarge");
+ this.OnIsLargeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSuperLarge", DbType="Bit")]
+ public System.Nullable IsSuperLarge
+ {
+ get
+ {
+ return this._IsSuperLarge;
+ }
+ set
+ {
+ if ((this._IsSuperLarge != value))
+ {
+ this.OnIsSuperLargeChanging(value);
+ this.SendPropertyChanging();
+ this._IsSuperLarge = value;
+ this.SendPropertyChanged("IsSuperLarge");
+ this.OnIsSuperLargeChanged();
+ }
+ }
+ }
+
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
From 7f4a21f841f299299b3d7963918ccb43edc6c9b4 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 18 Feb 2025 16:55:20 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../HSSE/Hazard/ConstructionRiskEdit.aspx.cs | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.cs
index d187c886..4e67be7c 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.cs
@@ -669,6 +669,14 @@ namespace FineUIPro.Web.HSSE.Hazard
this.drpRiskLevel.DataBind();
Funs.FineUIPleaseSelect(this.drpRiskLevel);
this.drpRiskLevel.SelectedValue = BLL.Const._Null;
+ foreach (var item in this.drpRefLicense.SelectedValueArray)
+ {
+ if (item == "不涉及")
+ {
+ this.drpRefLicense.SelectedValue = "不涉及";
+ break;
+ }
+ }
}
#region 选择施工内容
From 96d856751591109faf44ab1fa905e6e305114976 Mon Sep 17 00:00:00 2001
From: fei550 <1420031550@qq.com>
Date: Tue, 18 Feb 2025 17:38:49 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E7=84=8A=E6=8E=A5=E6=9D=90=E6=96=99?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.vs/SGGL_SeDin_New/v17/.wsuo | Bin 69632 -> 71680 bytes
.vs/SGGL_SeDin_New/v17/DocumentLayout.json | 12 ++--
SGGL/BLL/CLGL/TwArrivalStatisticsService.cs | 31 ++++++++--
SGGL/BLL/CLGL/TwInOutplanmasterService.cs | 55 +++++++++++++-----
SGGL/BLL/CLGL/TwInputmasterService.cs | 28 +++++----
SGGL/BLL/CLGL/TwOutputmasterService.cs | 26 +++++++--
.../HJGL_ComponentJointService.cs | 2 +-
.../WeldingManage/PipelineComponentService.cs | 34 +++++------
.../CLGL/OutPlanMasterOut.aspx.cs | 2 +-
.../CLGL/OutPlanMasterSelect.aspx.cs | 1 +
SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs | 13 ++++-
.../File/Excel/DataIn/材料入库导入模板.xlsx | Bin 8935 -> 9382 bytes
.../File/Fastreport/焊口打印.frx | 4 +-
.../File/Fastreport/管道焊接任务单.frx | 4 +-
.../File/Fastreport/组件打印.frx | 4 +-
.../PreDesign/PrePipelineQRCodeIn.aspx.cs | 1 +
.../HJGL/WeldingManage/WeldTask.aspx.cs | 16 +++--
SGGL/Model/CLGL/Tw_InOutMasterOutput.cs | 3 +-
18 files changed, 161 insertions(+), 75 deletions(-)
diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo
index e225f173e71860fe8b3517cc971cfd72436a08af..2db9ef7e90a90c550ab122d54ce7b21fc6f404b5 100644
GIT binary patch
delta 1872
zcmb`HUrbwd6vywm6e#5ux>Eiut1_@ooHX>$EtJj9DF;;W
z@7Mb~zx(~2U;3IUeZ#ag4CP;r>=VnDu73W}l|_A46aikqRLPKJ6$C*fa%8w%?SjL&
zRq{mWZ*pxEt}P5XsWlV#C|*gehiD`uqKe?Zv)QSCZ#i18?lAOh;v+phMUSl_umwCP)We-b6W
z5O^-z_MB3Z2|t4%0cb2oNZh4gfDw}|Va
zSKo9=pvg%HW6G0*5ljWtQZ7CV-f28~|9>kj;%a*mO1bt1@j^$x#MenafqV)QmnZLo
zji#@7Oj=!%bE?~sQ@vWs1@FK+`+oeteMqnpG-*m9O(hMhM@*t_>b(mqU83geGxG&l
z+&3nDL-}p^XdABee7{G6)jq{>Kl{}Qr4s)*^$slHKv?Dn2xsH3o}Fr5SU}hx#BAKL
z1CMC>*WVBw_;b9q1Oz~MB!uaN**x~!#^GN+ePw_G9?T|s_3zId5-V8Qlfo%Fz~0Lp
z0N5nfp!RhuW>25Nr%u$OGBt)Dp0MNeR0C$Gd}@yn6_UiLFfF_;43hp_x2~AS>yP_m
zvODJMNVsLWJ>i~g5BlAmfp{X=IT;W5{dC@dz69I;IYkg`LYI3qe8@wed2dWUok&EZ
zZn?u7bj#6br#l$vjJrGKSi%>GdxO5o=t7s?H8UvUx3giqJliJmOW_m9rd!|m^Ao)J
zR(mE=4hJ*gGPnwBc>VSVnfEK;Aeuf_GD{Yi#+#_%t#9mj;|qJnX#pA6=Ek)*EqLv#
z0~w11b&$rU`IESDu_`lJ3C`{LGr!B34J)|tyB`)c)tni(f(_;OluSf|a~KZIU?dbb
G5cvo2fV08?
delta 1498
zcmc(fOHUI~6vyXYhGN<&R$2tYSSnVUfYr8^SAyEuXb_OLg0E-{WLgw0QgE7>xS0A}
zVW4y4&V|k=P_8>;(xkf41#bKX?p@d}FcCcm+GGS{)R=hFU+%g8b025^(>u9mV(y8!
z6el~MCt9h+^J*Y-ZidfOO2`zKN8Mp#W16P4-KpL00`2ABipfg6Ad
zWC1Oo@QFDHbegsZv%h0>-5#xKY}ITFY=CuRs~U>22lP4sjW_FPwiUF$GK!Uq12MvizF=(vl2*Rj`;Kg>
zzVxI~NyT^@|M%#Yxhe#viL
zdSeygEP*{z+jijx5ntST%Lq5&!Yb>Z3H-FM$n-;QPktswni^BI%MCMKpnJPhy}?wd
sr_Y~KCWHQPK$-OSr$UN9)E_>m^o0X~9^RGyK-j0bMZT!c5kr0a9a=wZQ~&?~
diff --git a/.vs/SGGL_SeDin_New/v17/DocumentLayout.json b/.vs/SGGL_SeDin_New/v17/DocumentLayout.json
index b32b17b0..526a4537 100644
--- a/.vs/SGGL_SeDin_New/v17/DocumentLayout.json
+++ b/.vs/SGGL_SeDin_New/v17/DocumentLayout.json
@@ -11,6 +11,10 @@
"DockedWidth": 386,
"SelectedChildIndex": -1,
"Children": [
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+ },
{
"$type": "Bookmark",
"Name": "ST:0:0:{e506b91c-c606-466a-90a9-123d1d1e12b3}"
@@ -59,10 +63,6 @@
"$type": "Bookmark",
"Name": "ST:131:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
- },
{
"$type": "Bookmark",
"Name": "ST:0:0:{1a46fd64-28d5-434c-8eb3-17a02d419b53}"
@@ -70,6 +70,10 @@
{
"$type": "Bookmark",
"Name": "ST:0:0:{5726b0e3-1012-5233-81f9-d1fad48e7a56}"
+ },
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
}
]
}
diff --git a/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs b/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs
index d411049a..b0e38aa9 100644
--- a/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs
+++ b/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs
@@ -171,15 +171,29 @@ namespace BLL
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
- var results = new List();
+ var results = new List();
+ string [] taskPipeLineList= null;
+ var inoutPlanMasterl = db.Tw_InOutPlanMaster.FirstOrDefault(x => x.Id == outPlanMasterId);
+ if (inoutPlanMasterl!=null)
+ {
+ if (inoutPlanMasterl.WeldTaskId.Split('|').Length==4)
+ {
+ taskPipeLineList = Funs.DB.View_HJGL_WeldingTask.Where(e =>
+ e.UnitWorkId == inoutPlanMasterl.WeldTaskId.Split('|')[0].ToString()
+ && e.UnitId == inoutPlanMasterl.WeldTaskId.Split('|')[1].ToString()
+ && e.TaskDate.Value.Date == DateTime
+ .ParseExact(inoutPlanMasterl.WeldTaskId.Split('|')[2].ToString(), "yyyyMMdd", null).Date
+ && e.SerialNumber == inoutPlanMasterl.WeldTaskId.Split('|')[3].ToString()
+ ).Distinct().OrderBy(x => x.PipeLineSortIndex).Select(x => x.PipelineId).ToArray();
+ }
+ }
// 获取所需材料列表
var requiredMaterials = (from x in db.Tw_InOutPlanDetail_Relation
join master in db.Tw_InOutPlanMaster on x.InOutPlanMasterId equals master.Id
join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
join z in db.HJGL_Pipeline on x.PipelineId equals z.PipelineId
- join t in db.HJGL_WeldTask on master.WeldTaskId equals t.WeldTaskId
- where x.InOutPlanMasterId == outPlanMasterId
+ where x.InOutPlanMasterId == outPlanMasterId
select new Tw_PipeMatMatchOutput
{
Id = Guid.NewGuid().ToString(),
@@ -191,12 +205,17 @@ namespace BLL
MaterialSpec = y.MaterialSpec,
MaterialUnit = y.MaterialUnit,
MaterialDef = y.MaterialDef,
- NeedNum = x.Number,
- PipeLineSortIndex=t.PipeLineSortIndex
+ NeedNum = x.Number
}
).ToList();
+ if (taskPipeLineList != null && taskPipeLineList.Any())
+ {
+ requiredMaterials = requiredMaterials.OrderBy(x => Array.IndexOf(taskPipeLineList, x.PipelineId.ToString())).ToList();
+
+ }
+
var masterModle = db.Tw_InOutPlanMaster.FirstOrDefault(x => x.Id == outPlanMasterId);
- results = GetMatMatchOutput(requiredMaterials.OrderBy(x=>x.PipelineId).ThenBy(x=>x.MaterialCode).ToList(), masterModle.WarehouseCode, masterModle.ProjectId);
+ results = GetMatMatchOutput(requiredMaterials, masterModle.WarehouseCode, masterModle.ProjectId);
return results;
}
diff --git a/SGGL/BLL/CLGL/TwInOutplanmasterService.cs b/SGGL/BLL/CLGL/TwInOutplanmasterService.cs
index 499fe16b..b66eb84e 100644
--- a/SGGL/BLL/CLGL/TwInOutplanmasterService.cs
+++ b/SGGL/BLL/CLGL/TwInOutplanmasterService.cs
@@ -32,7 +32,7 @@ namespace BLL
{
var q = from x in Funs.DB.Tw_InOutPlanMaster
join y in Funs.DB.HJGL_WeldTask on x.WeldTaskId equals y.WeldTaskId into yy
- from y in yy.DefaultIfEmpty()
+ from y in yy.DefaultIfEmpty()
join person in Funs.DB.Person_Persons on x.CreateMan equals person.PersonId into persons
from person in persons.DefaultIfEmpty()
join auditperson in Funs.DB.Person_Persons on x.AuditMan equals auditperson.PersonId into auditpersons
@@ -284,8 +284,14 @@ namespace BLL
return responeData;
}
}
- var typeString = temeplateDtoIns.Select(x => x.TypeString).Distinct().ToList(); //获取导入文件的材料编码
- if (typeString.Contains("采购入库") && typeString.Contains("退料入库"))
+ var typeString = temeplateDtoIns.Select(x => x.TypeString).Distinct().ToList(); //获取导入文件的类型
+ if (typeString.Where(x=>string.IsNullOrEmpty(x)).Count()>0)
+ {
+ responeData.code = 0;
+ responeData.message ="导入数据中类型列不能为空！";
+ return responeData;
+ }
+ if (typeString.Contains("采购入库") && typeString.Contains("其他入库"))
{
responeData.code = 0;
responeData.message = errorWarehouseCode + "每次只能导入一种类型！";
@@ -350,9 +356,9 @@ namespace BLL
twInOutPlanMaster.TypeInt = (int)TwConst.TypeInt.采购入库;
}
- else if ("退料入库".Equals(FirstCusBillCodeDtoIns.TypeString))
+ else if ("其他入库".Equals(FirstCusBillCodeDtoIns.TypeString))
{
- twInOutPlanMaster.TypeInt = (int)TwConst.TypeInt.退料入库;
+ twInOutPlanMaster.TypeInt = (int)TwConst.TypeInt.其他入库;
}
else
{
@@ -555,7 +561,13 @@ namespace BLL
TwInOutplandetailService.AddList(details, planMasterModel.Id);
return message;
}
-
+ ///
+ /// 获取出库申请单编号
+ ///
+ ///
+ ///
+ ///
+ ///
public static string GetCusBillCodeByTaskCode(string taskCode,TwConst.TypeInt typeInt,TwConst.Category category )
{
string cusBillCode = "";
@@ -601,17 +613,17 @@ namespace BLL
public static string GetDataInCusBillCode(string projectid, string unitcode,string typeString,string unitWorkCode="",string Category = "")
{
- if (typeString == TwConst.TypeInt.退料入库.ToString())
+ if (typeString == TwConst.TypeInt.其他入库.ToString())
{
//生成规则是20240919-unitcode-AP-GR01
- string cusBillCode = string.Format("{0:yyyyMMdd}", DateTime.Now) + "-" + unitcode + "-AP-GR";
+ string cusBillCode = string.Format("{0:yyyyMMdd}", DateTime.Now) ;
var queryAll = new Tw_InOutMasterOutput()
{
ProjectId = projectid,
CusBillCode = cusBillCode,
};
var queryAllresult = GetModle(queryAll).Count();
- cusBillCode = cusBillCode + (queryAllresult + 1).ToString().PadLeft(2, '0');
+ cusBillCode = cusBillCode + "-AP-" + (queryAllresult + 1).ToString().PadLeft(2, '0');
return cusBillCode;
}
else if (typeString == TwConst.TypeInt.散件出库.ToString())
@@ -628,15 +640,30 @@ namespace BLL
var queryAllresult = GetModle(queryAll).Count();
if (Category == TwConst.Category.管段.ToString())
{
- cusBillCode = cusBillCode + (queryAllresult + 1).ToString().PadLeft(2, '0') + "-GI-P01";
+ cusBillCode = cusBillCode + (queryAllresult + 1).ToString().PadLeft(2, '0') + "-AP-P01";
}
else
{
- cusBillCode = cusBillCode + (queryAllresult + 1).ToString().PadLeft(2, '0') + "-GI-PF01";
+ cusBillCode = cusBillCode + (queryAllresult + 1).ToString().PadLeft(2, '0') + "-AP-PF01";
}
return cusBillCode;
}
+ else if (typeString == TwConst.TypeInt.其他出库.ToString())
+ {
+ //生成规则是20240919-01
+ string cusBillCode = string.Format("{0:yyyyMMdd}", DateTime.Now);
+ var queryAll = new Tw_InOutMasterOutput()
+ {
+ ProjectId = projectid,
+ CusBillCode = cusBillCode,
+ TypeInt = (int)TwConst.TypeInt.其他出库,
+ };
+ var queryAllresult = GetModle(queryAll).Count();
+ cusBillCode = cusBillCode +"-AP-"+ (queryAllresult + 1).ToString().PadLeft(2, '0');
+ return cusBillCode;
+ }
+
else
{
//生成规则是20240919-unitcode-AP-GR01
@@ -678,11 +705,11 @@ namespace BLL
{
return;
}
- var pipelineList = db.View_HJGL_WeldingTask.Where(e => e.UnitWorkId == unitworkid && e.UnitId == unitid && e.TaskDate.Value.Date == date.Date && e.SerialNumber == serialNumber).Select(x=>x.PipelineId).Distinct().ToList();
-
+ var pipelineList = db.View_HJGL_WeldingTask.Where(e => e.UnitWorkId == unitworkid && e.UnitId == unitid && e.TaskDate.Value.Date == date.Date && e.SerialNumber == serialNumber).OrderBy(x=>x.PipeLineSortIndex).Select(x=>x.PipelineId).Distinct().ToList();
+ //领料出库需要排除散件材料
var MaterDatial= from x in db.HJGL_PipeLineMat
join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
- where pipelineList.Contains(x.PipelineId)
+ where pipelineList.Contains(x.PipelineId) && x.PrefabricatedComponents !=null
select new
{
x.PipelineId,
diff --git a/SGGL/BLL/CLGL/TwInputmasterService.cs b/SGGL/BLL/CLGL/TwInputmasterService.cs
index c1910943..85279101 100644
--- a/SGGL/BLL/CLGL/TwInputmasterService.cs
+++ b/SGGL/BLL/CLGL/TwInputmasterService.cs
@@ -273,16 +273,8 @@ namespace BLL
WarehouseMan = plan.WarehouseMan,
WarehouseDate = plan.WarehouseDate
};
- if ((TwConst.TypeInt)plan.TypeInt!= TwConst.TypeInt.采购入库)
- {
- master.CusBillCode = GetCusBillCodeByTaskCode(plan.WeldTaskCode, (TwConst.TypeInt)plan.TypeInt,
- (BLL.TwConst.Category)plan.Category);
-
- }
- else
- {
- master.CusBillCode= plan.CusBillCode.Replace("-AP", "");
- }
+ master.CusBillCode = GetCusBillCode(plan.WeldTaskCode, (TwConst.TypeInt)plan.TypeInt,
+ (BLL.TwConst.Category)plan.Category, plan.CusBillCode);
Add(master);
//生成明细
foreach (var detail in detailLists)
@@ -338,7 +330,15 @@ namespace BLL
TwInOutplanmasterService.Update(plan);
}
- public static string GetCusBillCodeByTaskCode(string taskCode, TwConst.TypeInt typeInt, TwConst.Category category)
+ ///
+ /// 获取入库单编号
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public static string GetCusBillCode(string taskCode, TwConst.TypeInt typeInt, TwConst.Category category, string planCusBillCode = "")
{
string cusBillCode = "";
switch (typeInt)
@@ -353,6 +353,12 @@ namespace BLL
cusBillCode = taskCode + "-GI-PF01-RE01";
}
+ break;
+ case TwConst.TypeInt.其他入库:
+ cusBillCode = planCusBillCode.Replace("-AP-", "-GI-");
+ break;
+ case TwConst.TypeInt.采购入库:
+ cusBillCode = planCusBillCode.Replace("-AP", ""); ;
break;
}
return cusBillCode;
diff --git a/SGGL/BLL/CLGL/TwOutputmasterService.cs b/SGGL/BLL/CLGL/TwOutputmasterService.cs
index 990223c2..4417b5cc 100644
--- a/SGGL/BLL/CLGL/TwOutputmasterService.cs
+++ b/SGGL/BLL/CLGL/TwOutputmasterService.cs
@@ -78,7 +78,8 @@ namespace BLL
AuditDate2 = x.AuditDate2,
WarehouseMan = x.WarehouseMan,
WarehouseDate = x.WarehouseDate,
- WarehouseManName = warehouseperson.PersonName
+ WarehouseManName = warehouseperson.PersonName,
+ Remark=y.Remark
};
return q;
@@ -281,7 +282,7 @@ namespace BLL
Id = Guid.NewGuid().ToString(),
InOutPlanMasterId = plan.Id,
ProjectId = plan.ProjectId,
- CusBillCode = GetCusBillCodeByTaskCode(plan.WeldTaskCode, (TwConst.TypeInt)plan.TypeInt, (BLL.TwConst.Category)plan.Category),
+ CusBillCode = GetCusBillCode(plan.WeldTaskCode, (TwConst.TypeInt)plan.TypeInt, (BLL.TwConst.Category)plan.Category,plan.CusBillCode),
WarehouseCode = plan.WarehouseCode,
Category = plan.Category,
Source = plan.Source,
@@ -295,7 +296,8 @@ namespace BLL
AuditMan2 = plan.AuditMan2,
AuditDate2 = plan.AuditDate2,
WarehouseMan = plan.WarehouseMan,
- WarehouseDate = plan.WarehouseDate
+ WarehouseDate = plan.WarehouseDate,
+
};
Add(master);
//生成出库单明细
@@ -350,7 +352,15 @@ namespace BLL
return result;
}
- public static string GetCusBillCodeByTaskCode(string taskCode, TwConst.TypeInt typeInt, TwConst.Category category)
+ ///
+ /// 获取出库单编号
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public static string GetCusBillCode(string taskCode, TwConst.TypeInt typeInt, TwConst.Category category, string planCusBillCode = "")
{
string cusBillCode = "";
switch (typeInt)
@@ -377,7 +387,13 @@ namespace BLL
}
break;
-
+ case TwConst.TypeInt.散件出库:
+ cusBillCode = planCusBillCode.Replace("-AP-", "-GI-");
+ break;
+ case TwConst.TypeInt.其他出库:
+ cusBillCode = planCusBillCode.Replace("-AP-", "-GI-");
+ break;
+
}
return cusBillCode;
}
diff --git a/SGGL/BLL/HJGL/WeldingManage/HJGL_ComponentJointService.cs b/SGGL/BLL/HJGL/WeldingManage/HJGL_ComponentJointService.cs
index fc6da622..8f014136 100644
--- a/SGGL/BLL/HJGL/WeldingManage/HJGL_ComponentJointService.cs
+++ b/SGGL/BLL/HJGL/WeldingManage/HJGL_ComponentJointService.cs
@@ -137,7 +137,7 @@ namespace BLL
var q = Funs.DB.HJGL_Pipeline_ComponentJoint.Where(x => x.PipelineComponentId == PipelineComponentId).ToList();
if (q.Count!=0)
{
- var NotProductionNum = (from x in q where x.State == 0 select x).Count(); //未生产数量
+ var NotProductionNum = (from x in q where x.State == 0||x.State ==null select x).Count(); //未生产数量
var ProductionNum = (from x in q where x.State == 1 select x).Count(); //已生产数量
if (NotProductionNum == 0) //全部完成
{
diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs
index b095ca20..7cba2ab3 100644
--- a/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs
+++ b/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs
@@ -93,33 +93,25 @@ namespace BLL
///
///
public static IEnumerable GetPrintModelByPipelineComponentIds(
- string[] PipelineComponentId, string[] PipelineId, bool IsCheckPrint)
+ string[] PipelineComponentId, string[] PipelineId, bool IsCheckPrint)
{
var db = Funs.DB;
var query =
from com in db.HJGL_Pipeline_Component
-
join mat in db.HJGL_PipeLineMat on com.PipeLineMatId equals mat.PipeLineMatId into matJoin
-
from mat in matJoin.DefaultIfEmpty()
join pipe in db.HJGL_Pipeline on com.PipelineId equals pipe.PipelineId into pipeJoin
-
from pipe in pipeJoin.DefaultIfEmpty()
join punit in db.Base_Unit on com.PreUnit equals punit.UnitId into punitJoin
-
from punit in punitJoin.DefaultIfEmpty()
join aunit in db.Base_Unit on com.AssembleUnit equals aunit.UnitId into aunitJoin
-
from aunit in aunitJoin.DefaultIfEmpty()
join unitwork in db.WBS_UnitWork on pipe.UnitWorkId equals unitwork.UnitWorkId into unitworkJoin
-
from unitwork in unitworkJoin.DefaultIfEmpty()
join mater in db.Base_Material on pipe.MaterialId equals mater.MaterialId into materJoin
-
from mater in materJoin.DefaultIfEmpty()
- where com.QRCode != ""
- orderby com.PipelineComponentCode,com.PipelineId
-
+ where com.QRCode != ""
+ orderby com.PipelineComponentCode, com.PipelineId
select new PipelineComponentPrintDto
{
PipelineComponentId = com.PipelineComponentId,
@@ -138,26 +130,32 @@ namespace BLL
QRCode2 = "PrePipeline$" + com.PipelineComponentId,
MaterialCode = mater.MaterialCode,
IsPrint = com.IsPrint
-
};
+
var result = query.ToList();
- if (PipelineComponentId!=null &&PipelineComponentId.Length > 0)
+
+ if (PipelineComponentId != null && PipelineComponentId.Length > 0)
{
result = result.Where(x => PipelineComponentId.Contains(x.PipelineComponentId.ToString())).ToList();
}
+
if (PipelineId != null && PipelineId.Length > 0)
{
result = result.Where(x => PipelineId.Contains(x.PipelineId.ToString())).ToList();
+ // 按照传入的 PipelineId 顺序排序
+ result = result.OrderBy(x => Array.IndexOf(PipelineId, x.PipelineId.ToString())).ToList();
}
- //if (IsCheckPrint != null & IsCheckPrint ==true)
- //{
- // result = result.Where(x => x.IsPrint==false||x.IsPrint==null).ToList();
- //}
+ // if (IsCheckPrint != null & IsCheckPrint == true)
+ // {
+ // result = result.Where(x => x.IsPrint == false || x.IsPrint == null).ToList();
+ // }
+
return result;
}
-
+
+
///
/// 判断管线组件Code是否存在
diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx.cs b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx.cs
index 04c7f128..ad17e783 100644
--- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx.cs
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.CLGL
table.Id = Id;
var model = TwInOutplanmasterService.GetListData(table).FirstOrDefault();
- txtCusBillCode.Text = TwOutputmasterService.GetCusBillCodeByTaskCode(model.WeldTaskCode, (TwConst.TypeInt)model.TypeInt, (BLL.TwConst.Category)model.Category);
+ txtCusBillCode.Text = TwOutputmasterService.GetCusBillCode(model.WeldTaskCode, (TwConst.TypeInt)model.TypeInt, (BLL.TwConst.Category)model.Category);
txtWarehouseCode.Text = model.WarehouseCode;
txtCreateDate.Text = string.Format("{0:yyyy-MM-dd}", model.CreateDate);
txtCreateMan.Text = Person_PersonsService.GetPersonsNameById(model.CreateMan);
diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs
index 04012728..9aa62bfa 100644
--- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs
@@ -255,6 +255,7 @@ namespace FineUIPro.Web.CLGL
var inoutplandetail = (from x in Funs.DB.Tw_InOutPlanDetail_Relation
//where x.InOutPlanMasterId == Id && x.PipelineId == this.tvControlItem.SelectedNodeID
where x.PipelineId == this.tvControlItem.SelectedNodeID
+ && (x.PrefabricatedComponents == null || x.PrefabricatedComponents == "")
select x).ToList();
// 优化 Linq 过滤条件
diff --git a/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs b/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs
index 3614f27a..f0ac4402 100644
--- a/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs
@@ -303,7 +303,12 @@ namespace FineUIPro.Web.CLGL
{
ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
}
- }
+ }
+ ///
+ /// 生成退料通知单
+ ///
+ ///
+ ///
protected void btnGenInPlanMaster_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.Tw_OutputMasterMenuId, Const.BtnModify))
@@ -329,7 +334,11 @@ namespace FineUIPro.Web.CLGL
ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
}
}
-
+ ///
+ /// 生成补料通知单
+ ///
+ ///
+ ///
protected void btnGenOutPlanMaster_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.Tw_OutputMasterMenuId, Const.BtnModify))
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/材料入库导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/材料入库导入模板.xlsx
index 99478d1d38ab27658e1ab768cea2cea3f5f678cb..f1a41ec31461a61351b0704fc51eb3791904fc23 100644
GIT binary patch
literal 9382
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
literal 8935
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
diff --git a/SGGL/FineUIPro.Web/File/Fastreport/焊口打印.frx b/SGGL/FineUIPro.Web/File/Fastreport/焊口打印.frx
index 4b79aab2..f9472c0b 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;
@@ -99,7 +99,7 @@ namespace FastReport
}
-
+
diff --git a/SGGL/FineUIPro.Web/File/Fastreport/管道焊接任务单.frx b/SGGL/FineUIPro.Web/File/Fastreport/管道焊接任务单.frx
index 2bc28a83..9a7ac123 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;
@@ -59,7 +59,7 @@ namespace FastReport
}
-
+
diff --git a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
index ccf889e3..60734d65 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;
@@ -99,7 +99,7 @@ namespace FastReport
}
-
+
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs
index c68e3134..7f8c9fce 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs
@@ -360,6 +360,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
hJGL_Pipeline_ComponentJoint.PipelineComponentId = item.PipelineComponentId;
hJGL_Pipeline_ComponentJoint.WeldJointCode = joint.WeldJointCode;
hJGL_Pipeline_ComponentJoint.WeldJointId=joint.WeldJointId;
+ hJGL_Pipeline_ComponentJoint.State = 0;
HJGL_PipelineComponentjointService.AddHJGL_Pipeline_ComponentJoint(hJGL_Pipeline_ComponentJoint);
}
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
index 8a58164d..dc8f8a87 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
@@ -235,7 +235,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
where x.UnitWorkId == node.NodeID
&& x.TaskDate < Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01").AddMonths(1)
&& x.TaskDate >= Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01")
- select new { x.TaskDate.Value.Date, x.UnitId,x.SerialNumber, x.PipeLineSortIndex }).Distinct().ToList().OrderBy(x => x.PipeLineSortIndex);
+ select new { x.TaskDate.Value.Date, x.UnitId,x.SerialNumber }).Distinct().ToList().OrderBy(x => x.SerialNumber);
if (p.Count() > 0)
{
foreach (var item in p)
@@ -255,7 +255,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
join y in Funs.DB.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId
where x.UnitWorkId == node.NodeID && y.WeldJointCode.Contains(this.txtWeldJointCode.Text.Trim())
orderby x.TaskDate descending
- select new { x.TaskDate.Value.Date, x.UnitId, x.SerialNumber ,x.PipeLineSortIndex}).Distinct().ToList().OrderBy(x => x.PipeLineSortIndex);
+ select new { x.TaskDate.Value.Date, x.UnitId, x.SerialNumber }).Distinct().ToList().OrderBy(x => x.SerialNumber);
if (p.Count() > 0)
{
foreach (var item in p)
@@ -282,7 +282,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim()))
{
- weldingTask = weldingTask.Where(e => e.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())).ToList();
+ weldingTask = weldingTask.Where(e => e.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())).OrderBy(x=>x.PipeLineSortIndex).ToList();
}
DataTable tb = this.LINQToDataTable(weldingTask);
@@ -1223,7 +1223,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[2]);
if (taskTime != null)
{
- var pipelines = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID.Split('|')[0], tvControlItem.SelectedNodeID.Split('|')[1], Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue, tvControlItem.SelectedNodeID.Split('|')[3]).Select(x => x.PipelineId).Distinct().ToList();
+ var pipelines = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID.Split('|')[0], tvControlItem.SelectedNodeID.Split('|')[1], Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue, tvControlItem.SelectedNodeID.Split('|')[3]).OrderBy(z=>z.PipeLineSortIndex).Select(x => x.PipelineId).Distinct().ToList();
if (pipelines.Any())
{
@@ -1277,7 +1277,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
this.BindGrid(GetWeldingTaskList);
}
}
-
+ ///
+ /// 生成出库申请单
+ ///
+ ///
+ ///
protected void btnGenOutPlanMaster_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID))
@@ -1354,7 +1358,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (taskTime != null)
{
var weldTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID.Split('|')[0], tvControlItem.SelectedNodeID.Split('|')[1], Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue, tvControlItem.SelectedNodeID.Split('|')[3]);
- var pipelines = weldTaskList.Select(x => x.PipelineId).Distinct().ToList();
+ var pipelines = weldTaskList.OrderBy(x=>x.PipeLineSortIndex).Select(x => x.PipelineId).Distinct().ToList();
if (pipelines.Any())
{
diff --git a/SGGL/Model/CLGL/Tw_InOutMasterOutput.cs b/SGGL/Model/CLGL/Tw_InOutMasterOutput.cs
index db2fa463..b1cb0d7d 100644
--- a/SGGL/Model/CLGL/Tw_InOutMasterOutput.cs
+++ b/SGGL/Model/CLGL/Tw_InOutMasterOutput.cs
@@ -18,7 +18,8 @@ namespace Model
public string AuditManName2 { get; set; }
public string ReqUnitName { get; set; }
public string UnitWorkId { get; set; }
- public string WeldTaskCode { get; set; }
+ public string WeldTaskCode { get; set; }
+ public string Remark { get; set; }
public int? PipeLineSortIndex { get; set; }
}
From abde789894d9e41f9dea0f1406504a4a467fb802 Mon Sep 17 00:00:00 2001
From: fei550 <1420031550@qq.com>
Date: Wed, 19 Feb 2025 17:48:46 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E7=84=8A=E6=8E=A5=E6=9D=90=E6=96=99?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx | 1 +
SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs | 5 ++++-
.../CLGL/ArrivalStatistics.aspx.designer.cs | 9 +++++++++
SGGL/FineUIPro.Web/File/Fastreport/管道焊接任务单.frx | 10 +++++-----
4 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx b/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx
index 8f14dbfe..ef42c711 100644
--- a/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx
+++ b/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx
@@ -41,6 +41,7 @@
LabelWidth="70px" LabelAlign="Right" Width="170px">
+
diff --git a/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs b/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs
index 939e3475..9976c2be 100644
--- a/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs
@@ -47,7 +47,10 @@ namespace FineUIPro.Web.CLGL
{
lbRate.Text = "总体匹配率：0%";
}
-
+ if (cbIsItAPerfectMatch.Checked)
+ {
+ tb = tb.Where(x => x.MatchRate < 1).ToList();
+ }
//tb = GetFilteredTable(Grid1.FilteredData, tb);
Grid1.DataSource = tb;
Grid1.DataBind();
diff --git a/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.designer.cs b/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.designer.cs
index 6aab4b8a..2ad17e65 100644
--- a/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.designer.cs
@@ -77,6 +77,15 @@ namespace FineUIPro.Web.CLGL
///
protected global::FineUIPro.TextBox txtMaterialCode;
+ ///
+ /// cbIsItAPerfectMatch 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.CheckBox cbIsItAPerfectMatch;
+
///
/// lbRate 控件。
///
diff --git a/SGGL/FineUIPro.Web/File/Fastreport/管道焊接任务单.frx b/SGGL/FineUIPro.Web/File/Fastreport/管道焊接任务单.frx
index 9a7ac123..ac0ae869 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;
@@ -59,7 +59,7 @@ namespace FastReport
}
-
+
@@ -145,7 +145,7 @@ namespace FastReport
-
+
@@ -164,7 +164,7 @@ namespace FastReport
-
+
@@ -173,7 +173,7 @@ namespace FastReport
-
+