From 5899ff57c02795f367010f81fccd553d3a2b7e0c Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Mon, 18 Sep 2023 13:04:48 +0800 Subject: [PATCH] 2023-09-18 --- .vs/SGGL_SeDin/v17/.wsuo | Bin 264704 -> 263680 bytes .../RepairAndExpand/RepairAndExpand.aspx.cs | 86 +++++++++--------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 24509a06840e0a7db92b957cb451c93de84bb9e8..8a1ade310213944590ccfcab54451d66e7b5da16 100644 GIT binary patch delta 2840 zcmdUxUrbY19LIakya^WUJd zWm_T-(4Vu(9t?wo?7^4WXkS_ML0w|hhix%S=6rCv>E^PMxJ_Zd-!0d5les@{JIUvs zbI(2Jch2v7e&?JUK57Y%TE={(nFfP_BXjff^OzYJau~@+oT zr5&+M+_?q){0cPYy4gV(5Srmk?uLvWY)Z)tOkC!Zu!J_Xl$BC0#&Q~xfn+0gBptCJ zZp4a=D|YA=#pN`q2MZ)EC7*NSif!i_Y*>b@MX1__xf5|Lyz3n*@ZEz{B3@(z@)S~q zR3rD%Woo+#%RZzQsYB`!8Hw1!P6hKI(t&g$A*2g=71@dGLb?%>08ZEns$a)~iVPrw z$Q#H$WIu8MIfxuW-b99wVI+(sRW9Z$(=DBg%RH>htovueZX^;kv(@2ZC7<0y1WRWU! zLnfm=Li>dj0jsriN;NZ900UVqMp^*98WLIlM;n7`2}q=~zDdXeB+TJOEm&1(&o+v* zGeOPXXV)f&15m(HS;jnKI|PC3Jc$C7>L@^A!nQ4sUKR~HUqhxL4_o1PEooCwef~_t zlUQqB_>!EMFCbBy)v1+gZ8(Fr!U$r32e$1-+R@aE`tXeg7_<+u12AiEG3sHM93!U{ zw&gmf5;=@@!ffs^>wtk}&6$Qm?5_tXwM?VkR|h|@+%B!c62-P|9@L_ML_to6!NbZ# z5o)~>Yl>29)ncrr6NW-mZ<|hM;8q5|SYP|^;)*0L+_tqn#&vQ^9~9KTa-CW%=6d}> zRtp2NUz2}XiYexUS$UYPfPu|#8A%yRk>|I;Iqn3t@Y18vr7jPkxFKGtbzN?yw#%P)hx;S*rx4H6wc zWQtO9-OK%OhF8QAbrMUNDP1Ulll$Gkx*6!}%ZrY2aa}Y+5Y1rqtdGrjWCqtfa>OZ$ zBm{2GdrWtTX7+HL$2zn%DP^hxFh7NeAXxtlc!u+}~igo5(HXJA^FX#{3TQJ@Nx`7x@wS6&Y7bjif!p z#e~GBfJE1#eg!7A_60Ou6FyCIP-{mc^4UkC2ofd9olR#8jhgJdd30fYVrt$fiuawiN{1ZFb7UpaV9B!(Y zDqm;`peBYb4J`ps0^TY4Sz)q?$K=2agTi)svQ>mW|K-@_=JmoKVoYxTHs4v&vbSFi z^zZEr^{e}vl|7-7jU@rJW`JvJOQB485oYke#LY!5PnL}_V=&(c*LM|SY|zjKSkhf1 z;4XxQ?pm1Xu3P$w_IvY^;bp8l-(AHR6muKcdz=vN>B;HB`__g3C2l07m4XIOWcNt) zX$OCIRZUHYCs@%DbOn{Fkjq=?@wkE^#p_Z+ic;0(4FKOQTOM96n7Nyt86l8oW3aV)1~}8UlmkBo~o`&k4x$FR=T_%Z>Ouq-C5)62v&Nl zm6}ke*ZWT=GhNR4^d*7639D`7AmzAuE?F;TpF>I2ci mV5U!g-z(Zr*~JqqI#I`V#COaIlPnq@6|if%I3}bv5q<-e%e?Ub delta 3402 zcmbW(4|Ej89S88t?j~MvFS-07cL@PPa)glNlD$hVxug)5n#Ga^yg? zzRt@hvpYLGJ2U&6+0zD1+K_3-f;n6b6n&yRgUVW#+C3uZ7jllNt=HdrV7OK*;k zWwz609yEDmdKUI}#y!~Piy$G7@r`*~*-m~kZ?%C+DaCpiG_NsGXeJ8wjhPwi;wLQw%+LGs z+l*`uu1-s;k?O-q6F*(D+{oyzf~0HVU^9X``-cC20Mlszn_&xVg#pm`S@Ws$dqp$( zS$oBU)+4d$r|wdUk9_W6sK6~#%uu{dl^1wqS`~@Fi@(T%c4KS}6`oghM(p*b8Bw@| z@iVP${E$$|gDNUhoYGo9*Y23=kqsy)OD+s9ZjaC6yrj}pn$ng0bju2vR>AD4OJ%&@ zy@DTfE+ z;T$0oTlba$8LP$!8DIjcnT0$Xav+z=2$C7O1@fT)W4iyY9yAlUBsDf%xzzzbmcUY2 z2A_xJu!14jR^s3b&<5?`fmLuBtcEpkIa~o(!dmzuTm@G{2V4W!!k6GW=manLzz!`t-;AZHC_0R(wpcig|AoRgT_zLvHt#BJ`g3Yi6w!#2tz@t~He3rL@ zSCqZV)%nqoL*i>CQ@E({1PhhBx!baUYvnCQHW#r_3iN*CfnSaQEt)JjR~oDs9N30- zZ-+ZzJA4(s26w_;a5vlo_rf6D2lvC*VF&Dl5O5fRU9cN;cmN)RZ@@R0fDC_Dxu@HjjH--hqNlkgOL7rqBi!}no79Dp$V0DcJ1Km>jSKZc*cPvK|q zb9feh0Z|H-=Wy^#I0(Dx(I1Der%kT;ufuk@Azk}bytMD590bYkU z;269Ke}q55pW!WdyBh!g0>|O6@HhB7{0rzkC8zgLwzIR)^*-`3I0+xXDfkdh!x=aW ziTlQJEYL>;xT>gJ>n-D@f`w~}iF&7YJ8s= zEtAnTRTOG+%ZXCzPkg^_^2qa1HGi^tJUnwfaxMz!m&8=fMS~v;>ZDE78XhZ`Sx9|e zzSthk-6aYSE*=amS@x-$IktG(%@e=5;$8e7yE**`OIlsDo3D&@KY8~LkGTtJZ?B;n_s75`M5`9oJ& zLmn-xta|f8vMw_eq2|<#S|>kK=Y71!nqM)p3&v!Xow$)^hSKm_34aIL zG$Hnc;h+$X`ic#a;$k69;QzS!swR9=P|xbHcRD)*T|S%3S0Av|`dwaIXH8AOrZ@ui zj=H*9U#;Seje@b12gUwvS6lm4JceuC%EIRA)oU8xXEs>^V715HR|`fYP?EU zy{*&b=(5#18tQG{278^&?sWNF0mbLE*W1JY?&d7CAsXscd31xC>8J_#w$Sf)5fJ&+ z6ZT7J($=S}=SzDV!qHxp?LH%_e8V+I!$&)+#oITIY-D>bSOihM`LNKj`)MJAD~G1( z|4A1NkWL_u$QOX!L8yd&<&+%+uKMe2@=FN*r`o1zxcJ`gpgx2w?@~&cKDv!s8y9zo{{`f-1SS9g diff --git a/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs b/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs index 21cbc5bd..92173db4 100644 --- a/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs @@ -259,7 +259,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand var trustItems = from x in Funs.DB.HJGL_Batch_BatchTrustItem where x.RepairRecordId == r.RepairRecordId select x; if (trustItems.Count() == 0) //未生成返修委托单 { - bool b = false; + bool b = false; //查找无损检测委托单中是否已进行过返修 是 节点标记为红色 var trustItem = (from x in Funs.DB.HJGL_Batch_BatchTrustItem join y in Funs.DB.HJGL_Batch_NDEItem on x.TrustBatchItemId equals y.TrustBatchItemId where y.NDEItemID == r.NDEItemID @@ -702,27 +702,27 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand join y in Funs.DB.HJGL_Batch_NDEItem on x.TrustBatchItemId equals y.TrustBatchItemId where y.NDEItemID == repairRecord.NDEItemID select x).FirstOrDefault(); - if (trustItem != null) - { - var trustItems2 = from x in Funs.DB.HJGL_Batch_BatchTrustItem where x.TrustBatchId == trustItem.TrustBatchId select x; - foreach (var item in trustItems2) - { - var ndeItem = Funs.DB.HJGL_Batch_NDEItem.FirstOrDefault(x => x.TrustBatchItemId == item.TrustBatchItemId); - if (ndeItem != null) - { - var repair = Funs.DB.HJGL_RepairRecord.FirstOrDefault(x => x.NDEItemID == ndeItem.NDEItemID); - if (repair != null) - { - var trustItem3s = from x in Funs.DB.HJGL_Batch_BatchTrustItem where x.RepairRecordId == repair.RepairRecordId select x; - if (trustItem3s.Count() > 0) - { - Alert.ShowInTop("本次返修已扩透！", MessageBoxIcon.Warning); - return; - } - } - } - } - } + //if (trustItem != null) + //{ + // var trustItems2 = from x in Funs.DB.HJGL_Batch_BatchTrustItem where x.TrustBatchId == trustItem.TrustBatchId select x; + // foreach (var item in trustItems2) + // { + // var ndeItem = Funs.DB.HJGL_Batch_NDEItem.FirstOrDefault(x => x.TrustBatchItemId == item.TrustBatchItemId); + // if (ndeItem != null) + // { + // var repair = Funs.DB.HJGL_RepairRecord.FirstOrDefault(x => x.NDEItemID == ndeItem.NDEItemID); + // if (repair != null) + // { + // var trustItem3s = from x in Funs.DB.HJGL_Batch_BatchTrustItem where x.RepairRecordId == repair.RepairRecordId select x; + // if (trustItem3s.Count() > 0) + // { + // Alert.ShowInTop("本次返修已扩透！", MessageBoxIcon.Warning); + // return; + // } + // } + // } + // } + //} if (!repairRecord.AuditDate.HasValue) { // 更新返修记录 @@ -855,27 +855,27 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand join y in Funs.DB.HJGL_Batch_NDEItem on x.TrustBatchItemId equals y.TrustBatchItemId where y.NDEItemID == repairRecord.NDEItemID select x).FirstOrDefault(); - if (trustItem1 != null) - { - var trustItems2 = from x in Funs.DB.HJGL_Batch_BatchTrustItem where x.TrustBatchId == trustItem1.TrustBatchId select x; - foreach (var item in trustItems2) - { - var ndeItem = Funs.DB.HJGL_Batch_NDEItem.FirstOrDefault(x => x.TrustBatchItemId == item.TrustBatchItemId); - if (ndeItem != null) - { - var repair = Funs.DB.HJGL_RepairRecord.FirstOrDefault(x => x.NDEItemID == ndeItem.NDEItemID); - if (repair != null) - { - var trustItem3s = from x in Funs.DB.HJGL_Batch_BatchTrustItem where x.RepairRecordId == repair.RepairRecordId select x; - if (trustItem3s.Count() > 0) - { - Alert.ShowInTop("本次返修已委托！", MessageBoxIcon.Warning); - return; - } - } - } - } - } + //if (trustItem1 != null) + //{ + // var trustItems2 = from x in Funs.DB.HJGL_Batch_BatchTrustItem where x.TrustBatchId == trustItem1.TrustBatchId select x; + // foreach (var item in trustItems2) + // { + // var ndeItem = Funs.DB.HJGL_Batch_NDEItem.FirstOrDefault(x => x.TrustBatchItemId == item.TrustBatchItemId); + // if (ndeItem != null) + // { + // var repair = Funs.DB.HJGL_RepairRecord.FirstOrDefault(x => x.NDEItemID == ndeItem.NDEItemID); + // if (repair != null) + // { + // var trustItem3s = from x in Funs.DB.HJGL_Batch_BatchTrustItem where x.RepairRecordId == repair.RepairRecordId select x; + // if (trustItem3s.Count() > 0) + // { + // Alert.ShowInTop("本次返修已委托！", MessageBoxIcon.Warning); + // return; + // } + // } + // } + // } + //} var trustItem = from x in Funs.DB.HJGL_Batch_BatchTrustItem where x.RepairRecordId == repairRecordId select x; if (trustItem.Count() == 0) {