From aac8c334d394db1e3e90d9a78c2cb947d898ca98 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Thu, 7 Sep 2023 08:44:11 +0800 Subject: [PATCH] 2023-09-07 --- .vs/SGGL_SeDin/v17/.wsuo | Bin 263168 -> 264192 bytes .../1-5焊接管理（Menu_HJGL）.sql | 2 +- .../File/Fastreport/组件打印.frx | 22 +++++++++--------- .../HJGL/WeldingManage/WeldReportEdit.aspx.cs | 8 +++---- .../HJGL/WeldingManage/WeldTask.aspx.cs | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 8326a29aeccd0e42f21860e96045767e42b24d2e..eac8775749e7676d590f3a9026e92c8ecc36da03 100644 GIT binary patch delta 2092 zcmdUwT}+!*7{}jp+Cr)2qqN=1hs+|3!T>20#%FmMjQD|+2|<&^gz}|qWo_W?1cu{9 z-Lgb3uulx}&R~LGcr)H;yfBeuyVJxQz3|G#3qRr)%SO!RM*TlX7ubx(3oks$ujhH6 z^U>%0&vVYvFXiaVIm@kHyP_x(Y$uaRREhwLzytC@o*{hih=hz}y_fZX7Sx3x6Yyj; zfaA#~;XCNP3o8YW%tb5LT(a1v4x7_`7*-kZfgDf)N_l*%A66}>0|8JE8bBiuSo%@a z&7cLef;JEY?SSs&>XkzDy+X5>}XGZ>!BtmzS04!pHh9V z)@*axtNBCd`=I7-c>lMW+td}+EUboV`$#1AePmt96f9B^FB*mOn{H<5;$b769TIkK z%YLAZ;*J~k0=QXyhP2!n7bjQB!O6vT!Z~jqf=zw79v3GQJ2{zB9qE0i$I1!C$wQwx z3u!3Vnz=7)=&t)IEAK0Y?gVIP2fh$iKGi9YY*Of~=e#&aTb_{JwA+$u6>}8N>&+CU z@bf<2^Uu;&UN2qA_mh^di!s{DUl5}dF9_LL57(Zq7Csn3y5)%em+PiY=WAk^;;seK zT!ob5ZnSbP--}nJxcl`)e&=6?%)R!8Y~KkP!?~YMMFpENXeI^ zmTs)*CbLePQx3y%I4V{PSU?&` z2UcJMJS2O!W;<2Bh0k#Kt_llJ=rBZsNnVaEiJI@w@ICke{0Ml!PpE$ezkpxCCb$lM z2XBN+EO$_E)Agoj?@zELkqBxcNb%r;XrnFs7E-+ZRoSB$w_BbtQ)lbtG`{_%q}#1e zQkS=ew2lyOjD_#ZLE~0Ix=eImwev+)1~?i%UB=DsK4Elqe=OE3%rb-5U;^8QsJtQ8 zdvqy|(PD4A9f9pUR>z<29w6^C0ejtGe;+%KclP&@Jrr0EZJ1XF?Dq?wC{-!@#2T#) zbx}olkZPov^ss9m!SPCCBdp2~^W`@dDvlIk9|Uzq+AMs`6uJ;;Aw3ezP}2ChI;lKQ z>61-DkXO2CaI%8b$&+~=$uU5qu8 zKIQXh@zIHB^@(^mGNH{5M5B@E>Vb*aboINsPl`nBg7w&A{R7SZ+D7^`TAsnLKHmb0 l@ky*hyrNyy#6?Z6X{O~ByM(;t^$bl3m@ delta 2453 zcmb`}dsGxv9Kdnzu;ik<$YX&O7e!nRQ50oSFoZ>jtPCWr%wB+?mZoOAhWKDKHA^dY zZ??TtNwcztY>B-sdS}_g9`@48>||o`lklO5Z!MvK{M>&S}p1?7j1wxwG@Tcjn&F zn_~5Ku}uZen23l74W~LgJ1HUr5|M;{NI^@nQp}Go%*VVp-Hdd&*+N5r>`4(F2nZ$-;1hOy^aoAa1YGhRW-_WLVH9_SP$}^g}4Zdo-s~2S`r|?|E^ZGA2C38I^CyQI0k}FLK z!L;lh!vFWZm^Rs_jh5{(x^M)&eJg||o@U`=*L6&KJH55E{%iRqa5Z?3%NJJVP4A7Wspbuua@l&hir1xiYnRRm}*wfnCdj+ z$tjZF)b)PbB(r)9LeZedwqKYd!y=kZ$i+!3#1h$&RAEuw9D1~jtJF(xa=A5P2yyi^ zhprUNK)l^ym*F;jZ`Ran$ZphhNiYE%t7g~8)PdTIXnIsa!@B!;?T zIsdQ%jnIQ92bKw0QaoCEhV7FjcE%{IlgLHAB4_kexmBne4u485s@pl&*qYtxLiVk6 zOZVVCLEWhfdB~}o)Q|_`Tqi`!B$F0QbfsyHeMDF47D_8(5ZfJ#ql`y_+D9UikPJKe zAqD;6Kq>}cAkr`h=@<+rhF~bpMh1onx*(IvaEw3}Mq(7QF&bl#0~c~J7UPhIe2m9A zD8K|1q6lsjVlhEXRVmY@Mku?)+x z0*%n|kIzBlN{+0;%~*{!Sc_Y*4!7bqtj7l2jyrHCn&5*U5_e%E?nVIj;9lH^`|$uC z#6x%(o7A9hrm_Xicm!Lq4Ub|w9>e2!0z2>|p2E|320PJ$AfCl@*o9W?#`AaqFXAP< zj92g~_NYOBjmqn2!y9-LZ{cmcgLm;B-p5{ifDf?`AK_zsf={s@pW$?~HkNgJ>xzFY9F2ocy^rxo>@zE7ph3lJ^x<(`EZfvQoO&AL0H)cD9!tNFx$ cPcvl(q9aW)8`qdRS9#WY#9EKG%@f)57a51lhyVZp diff --git a/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql b/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql index 4c762b12..20cc9602 100644 --- a/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql +++ b/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql @@ -365,7 +365,7 @@ GO GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('27AA3C4C-D424-4CBA-ABBE-EDA953A196A4','޼ⵥ¼','HJGL/NDT/NDTBatch.aspx?Type=R',30,'E7533566-73A9-4507-8FCB-1FE713819A24','Menu_HJGL',0,1,1) + VALUES('27AA3C4C-D424-4CBA-ABBE-EDA953A196A4','޼ⵥ¼','HJGL/NDT/NDTBatch.arspx?Type=R',30,'E7533566-73A9-4507-8FCB-1FE713819A24','Menu_HJGL',0,1,1) GO /*ⵥ¼*/ INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('A4284CC7-4F99-4188-8CAB-A2CF578A0F2A','27AA3C4C-D424-4CBA-ABBE-EDA953A196A4','',1) diff --git a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx index 5d47cd9a..c05040e6 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 } - + @@ -153,15 +153,15 @@ namespace FastReport - + - - + + - + @@ -174,28 +174,28 @@ namespace FastReport - + - + - + - + - + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs index 558a3655..ec18c3f4 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs @@ -526,7 +526,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { var t = BLL.WeldTaskService.GetWeldTaskById(row); - errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, false); + errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, true); } } else @@ -536,7 +536,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage if (Grid1.SelectedRowIDArray.Contains(Grid1.Rows[i].RowID)) { var t = BLL.WeldTaskService.GetWeldTaskById(Grid1.Rows[i].RowID); - errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, false); + errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, true); } else { @@ -1062,7 +1062,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage var pointBatchItems = from x in Funs.DB.HJGL_Batch_PointBatchItem where x.WeldJointId == weldJointId select x; string pointBatchId = pointBatchItems.FirstOrDefault().PointBatchId; - /*// 删除焊口所在批明细信息 + // 删除焊口所在批明细信息 BLL.PointBatchDetailService.DeleteBatchDetail(weldJointId); // 删除批信息 @@ -1070,7 +1070,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage if (pointBatchId != null && batch.Count() == 0) { BLL.PointBatchService.DeleteBatch(pointBatchId); - }*/ + } } } else diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs index 025e2f42..49415846 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs @@ -427,7 +427,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage if (batchC != null) { string batchCondition = batchC.SetValue; - BLL.PointBatchService.AddBatchByWeldJointId(item.WeldJointId,null, batchCondition); + //BLL.PointBatchService.AddBatchByWeldJointId(item.WeldJointId,null, batchCondition); } @@ -919,7 +919,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage if (task != null) { BLL.WeldTaskService.DeleteWeldingTask(task.WeldTaskId); - PointBatchService.DeleteBatchByWeldJointId(task.WeldJointId); + //PointBatchService.DeleteBatchByWeldJointId(task.WeldJointId); } } ShowNotify("删除成功！", MessageBoxIcon.Success);