From 98663b00f7014b56b9e6a8a5d52c9f6dc712c256 Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Fri, 24 Oct 2025 17:04:31 +0800 Subject: [PATCH] 1 --- .vs/SGGL_SeDin_New.slnx/v18/.wsuo | Bin 464896 -> 471552 bytes .../v18/DocumentLayout.backup.json | 16 +++ .../v18/DocumentLayout.json | 8 ++ .../版本日志/SGGLDB_V2025-10-24-001-lpf.sql | 136 ++++++++++++++++++ 4 files changed, 160 insertions(+) create mode 100644 DataBase/版本日志/SGGLDB_V2025-10-24-001-lpf.sql diff --git a/.vs/SGGL_SeDin_New.slnx/v18/.wsuo b/.vs/SGGL_SeDin_New.slnx/v18/.wsuo index 9f69490a81f4ec69390309627f85fda11fadf260..f2acacff0e82858b32b75c79f81a65ec9b7b5f9c 100644 GIT binary patch delta 3304 zcmchYe{5UT702K8eSXhLpJTUi+OWE5QnHZHxUo~aaXcEl#L0mEh^M%St({t%#L{2_ zik#6graW2^4N*$tljb6=NK8QZ2c&^T%^wIN5;isl4I5)HV3f7&7aeQC8A(XfeXnD; zVG^23H?I8gyZ794-#h1?d(Jg~<~C2b4@TYNOi?Dl3Pn+vMN#eqKJ=G>jL$#J(w5E4 zM>Uq!rOtOfyCx!UvlkeBUwhfkG^m^{G#Xl2ODP^TJP_6wCZy0l4-Jg-%|T3E(dk0J zxYmw-@f}}9zq&A9isy2m7se%cy1^MJzXEg5(49-l?M7iX{{~1_*vl75ej$AK@Jp#z zbvJU?I>6vzbE}FdLk_^1=Wk@rH-^zdQt|YCvr{R6Z)3A+HQkH zYUSI1v)*v4ay3<##?&e-q&=m(N~A>6O5ZFkXKnJ|)lv9PXW@B`RCe1>q%ZmnBL{ej zQqHI$-N_p*4U&P+LFoKXVQOiVCM;g93lm|LW-GSZaJKRb7f#Fas8Iodb&-(mq^act ztX=dE@gAGpI{6)`ZcJh?jY1VYawX- zjBpiRaycZIE|QKs&Q)6%ESGI)ccXtl9Jm)80QZ4|Ut}yhmnLZEJkJFBos> z^|Us(_&olk-|I;PdRsl{BsX|_eJz1_0u>9t!tN^H4J%5882brtCrjJ&6shr2uC1HK zT^q@~GGfScAdQnv9w_$?2-<*bd#C2EyKnlfN49tDdhwHnmriD!b*EUmy@SS^0<>q{ zChDjPi0Oy<9jt`53n)2=!NX8!}L`JQQC~xk{6Lo%%09AY@UJC89WI zgfWoyLbfk*Dr5u}PQ@B?AwEy+HrRkHj*_2aOJogx5zk+OUxAmv;uJlKvA`jF70=&* z--6e`@4)Ne_uviiCinw*3%m{90e=MVf@9!4@F#GbDFez0blwMl27dv61%Cs72Oofw z;2+>a@K10GoCY6(k3kMhfq#Kdz%-Zvv*1%O2hMw^dIKkvLaEc#!b$e^)z0C;QBTjmq53<=ZshZ? z{2F5oj9GWyx_a8P3ToGGC-sr<)&4ZW+OARMR%sxeO^vk^Es87*{Q2Xp67d5 z{<;%)jPs!FCb)DD7}_1#n;cBC!K7t0$*Yh#feWpt_v1D5@Zli~{a7{f8S{DB@@pKh zmw~**{}0(BlV#vb&z6ORDE?4EEf zG_~C!B2V!cnLAv&ZmHC2#n=%({AJ!LG}aJKFBIBI3muG4wB)VxO6z>r`;&cr@wms|;tP8G z@p!8z7-+?<<-fkKIne71HYeggYHxxwzUCl23uMfM$wnu5!e&8A%4(gpJH|JT1a?>IM;QVL?&d$4e=Cw=KK>SuMq^GO4$SpO))yien{uDBFHa z)0sH>q4qW5cj`mJVb%SjX;#y+``*)9EF)!lNIZ8!8)n})^s4R?hD}do?|ol;!7kT? zvcV~BDHjKpKr2+H4^wz;D7$Z3+sCuV=d?%p=rJuQPVePihbHxt*=U9CWa1RlZxpwj z)iiqe^26u9C*l@8KMaXPPFv_@AK>~%RcLeCJ5n(uZnEizrAgVlO7#vVzGv5m7bZpw zEI#vr781GRTHcG0*#EKiy0AI))6%|I^7e|ePJNd3z?Cb-My}V1tEb__?RW7(mAn=; Jqi&dE{{||_I7R>f delta 4580 zcmeH~adcaC702_-dr8yuCC%D&)RJ|jEnV8R*fhzSrgTl4Fvi+7QTQ&<`SD01SdCh=H5HHgGf84sHQEzz`S) zJ546?SNJlY!uSp_2JQr(26utoU=J7v2`~XBK@xlh>;-p&&w?p%54ab64%`Rs2m8S1 z!52UZq``i008E2}CesGfAq>6<4uda&BOn7*P_XMC%nju)mCQ=}&A-1&W71NYJ7a^I z(x$UX*lZ_D8o+koR$CmiIr+L|P9E##gxm_s0bgH>p7oR(8@e<`PZhrMD;vG8 zIQjoZ$40Cg-R_auYSdugMfclfnzrwD@G;2S{7er;OAzu5jw_dDR*ov{o!1+L3LoKf5`NIMhM3|*UkW3IsMb(WwE;I) zRV_7~rC39!l@GStL>C5jD4Q_cd})rCrU!>8TGdbH=m4EE`zRGX;}Goq{5q?eQm#?f zB<`bSS4KoBy)LeBSaupFm384lsg>wr>p^i7rQ6~Zs~RTP<_R%K>CGb)-5iu~PUzyg z?GEu__Sst4XSz^x3q`wBI<@{N#r!8VcS_V!+Kqpx>eFhXh4<*2C3ARC;Z3s`Rw=ep zIy~YK9KStAc^@r@VbNwEErmUFyw^|B-k_PcZNsq$?>&d==JD>y(8Qi`e@7zN8SDs5 zCObPqKHruO|9DTQzb6^$o=m`Jk+e8*>Fw?aOqEmXBSIUDU1|UO=*duw-i+Qz&lGxX zIF^gGoD?)4iaha@WT(^P^|ZIKmLiRAawpp8NaMZKY_8FoK8Z)$DBl#Jvtt&rZ0U8) zEWdmEqv!wp{2kHVzxzk)TYt~y+sf*)`P0_$qQ9zaOk|E?Z8P8j@F4gyI0ha9UjYw; zuY#|EN5I#?EO-$W8Cm?8rsCgiYZ{bS3ZQ6STVQ_j_+Z4=hFpzogosM}TI-;-<%~Hcof?5pC5I z93NIMrF-KFXF%h5*K-pmIc}OWB?c(%ETs8@zM{qmEjy9g8#*af8E4H_PW&E;E>w=# zj58_aiaYd=B|g=q6`5ZU^tS7WxB*4PCv0m92##oa0a1Mrc@7@#=GtU6rRz@L_m)HO zcb2g{5iv?P$MveIREO*D9;Ic7xoBuHEPztiV_94%$p)#FzoNG4**>R+RG|$=Dcagc zY72UIkj}U0Yaw+Lvc`3o+h}+g8CtGjb8x%;jGg8}eUu;f7BjX?aw1GxXom6$H;&~! zNY{gUb;6snCcd+|3Z_{T-rsLKe$E)&tz6e}tx~;1&p>O+%qwkW&5%Ph;5lPNr==Qf z4sX}m{LppzN3(^$Efu`#kfCr<6*#Bvt-M6G0=!^U;V)(uaMMjwC?wej;tHFR6J6P%Uvz5&EoY*D{Q}&H{sT!sVK(UpayX@KWS;?D?%t{gcN4T$v~<>N;TMzee^b)c zd1k~W@TFn~i#Az4FKkCKoGDyd&Wl$jriFYLmPUssLl!+o(Q89DFPxCZ7p(G1*7c^4 iACj$>McHb#y_$PGG$rtI4{L#Tv4T|gN3n3u8u}N|U?_P2 diff --git a/.vs/SGGL_SeDin_New.slnx/v18/DocumentLayout.backup.json b/.vs/SGGL_SeDin_New.slnx/v18/DocumentLayout.backup.json index 75ab69a7..7c674097 100644 --- a/.vs/SGGL_SeDin_New.slnx/v18/DocumentLayout.backup.json +++ b/.vs/SGGL_SeDin_New.slnx/v18/DocumentLayout.backup.json @@ -70,6 +70,22 @@ { "$type": "Bookmark", "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" + }, + { + "$type": "Bookmark", + "Name": "ST:130:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:132:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:131:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" } ] } diff --git a/.vs/SGGL_SeDin_New.slnx/v18/DocumentLayout.json b/.vs/SGGL_SeDin_New.slnx/v18/DocumentLayout.json index 7c674097..3a6bdf60 100644 --- a/.vs/SGGL_SeDin_New.slnx/v18/DocumentLayout.json +++ b/.vs/SGGL_SeDin_New.slnx/v18/DocumentLayout.json @@ -86,6 +86,14 @@ { "$type": "Bookmark", "Name": "ST:131:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}" + }, + { + "$type": "Bookmark", + "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" } ] } diff --git a/DataBase/版本日志/SGGLDB_V2025-10-24-001-lpf.sql b/DataBase/版本日志/SGGLDB_V2025-10-24-001-lpf.sql new file mode 100644 index 00000000..5eb2580e --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-10-24-001-lpf.sql @@ -0,0 +1,136 @@ +drop view View_HJGL_InstallData +go +Create VIEW View_HJGL_InstallData + AS + WITH PackagingManage AS (SELECT p.PackagingManageId, + p.ProjectId, + p.PackagingCode, + p.TrainNumberId, + s.Value as SplitPipelineComponentId + FROM HJGL_PackagingManage p + CROSS APPLY dbo.SplitString(p.PipelineComponentId, ',', 1) s + WHERE p.PipelineComponentId IS NOT NULL + AND p.PipelineComponentId != '' -- Ìí¼Ó¿Õ×Ö·û´®¼ì²é + ), + TwOutPutData as (select distinct twRelation.PipelineId, + outdetail.Id as TwOutputDetailId, + twRelation.MaterialCode, + master.Id as OutputMasterId + from Tw_OutputMaster master + join Tw_OutputDetail outdetail on outdetail.OutputMasterId = master.Id + join Tw_InOutPlanMaster planmaster on planmaster.Id = master.InOutPlanMasterId + join Tw_InOutPlanDetail_Relation twRelation + on twRelation.InOutPlanMasterId = planmaster.Id and + outdetail.MaterialCode = twRelation.MaterialCode), + PrefabricatedData AS (SELECT pipe.PipeLineMatId as Id, + line.PipelineCode, + pipe.PrefabricatedComponents as Code, + 'Ô¤ÖÆ×é¼þ' as TypeStr, + '' as Matdef, + CAST(NULL AS DECIMAL(18, 2)) as Number, -- Ã÷È·Ö¸¶¨Êý¾ÝÀàÐÍ + pack.PackagingCode, + trainnumber.TrainNumber, + line.FlowingSection, + line.UnitWorkId, + line.ProjectId + FROM dbo.HJGL_PipeLineMat pipe + INNER JOIN dbo.HJGL_Pipeline line -- ¸ÄΪINNER JOIN£¬Èç¹û¹ÜµÀ±ØÐë´æÔÚ + ON pipe.PipelineId = line.PipelineId + LEFT JOIN dbo.HJGL_MaterialCodeLib lib + ON lib.MaterialCode = pipe.MaterialCode + LEFT JOIN HJGL_Pipeline_Component comonent + ON comonent.PipelineComponentCode = pipe.PrefabricatedComponents + LEFT JOIN PackagingManage pack + ON pack.SplitPipelineComponentId = comonent.PipelineComponentId + AND pack.ProjectId = line.ProjectId -- Ìí¼ÓÏîÄ¿¹ØÁªÌõ¼þ + LEFT JOIN HJGL_TrainNumberManage trainnumber + ON pack.TrainNumberId = trainnumber.Id + WHERE line.PipeArea = '1' + and (pipe.PrefabricatedComponents != '' + AND pipe.PrefabricatedComponents IS NOT NULL)), + LooseComponentsData AS (SELECT distinct pipe.PipeLineMatId as Id, + line.PipelineCode, + pipe.MaterialCode as Code, + 'Ô¤ÖÆÉ¢¼þ' as TypeStr, + lib.MaterialDef as Matdef, + cast( packdetail.Number as DECIMAL(18, 2)) as Number, + pack.PackagingCode, + trainnumber.TrainNumber, + line.FlowingSection, + line.UnitWorkId, + line.ProjectId + FROM dbo.HJGL_PipeLineMat pipe + INNER JOIN HJGL_Pipeline line -- ¸ÄΪINNER JOIN + ON pipe.PipelineId = line.PipelineId + LEFT JOIN dbo.HJGL_MaterialCodeLib lib + ON lib.MaterialCode = pipe.MaterialCode + LEFT JOIN HJGL_PackagingManageDetail packdetail + ON packdetail.MaterialCode = pipe.MaterialCode + LEFT JOIN TwOutPutData twOutPutData + ON twOutPutData.PipelineId = pipe.PipelineId and + twOutPutData.MaterialCode = packdetail.MaterialCode + LEFT JOIN HJGL_PackagingManage pack + ON packdetail.PackagingManageId = pack.PackagingManageId + AND pack.ProjectId = line.ProjectId -- Ìí¼ÓÏîÄ¿¹ØÁªÌõ¼þ + LEFT JOIN HJGL_TrainNumberManage trainnumber + ON pack.TrainNumberId = trainnumber.Id + where line.PipeArea = '1' + and (pipe.PrefabricatedComponents is null or pipe.PrefabricatedComponents = '')) + +-- ºÏ²¢½á¹û + SELECT * + FROM PrefabricatedData + UNION ALL + SELECT * + FROM LooseComponentsData + +go +alter table dbo.HJGL_PackagingManage + add CategoryInt int +go + +exec sp_addextendedproperty 'MS_Description', N'°ü×°Àà±ð', 'SCHEMA', 'dbo', 'TABLE', 'HJGL_PackagingManage', 'COLUMN', + 'CategoryInt' +go + +drop table Base_MaterialColor +CREATE TABLE [dbo].[Base_MaterialColor] +( + [MaterialColorId] nvarchar(50) NOT NULL DEFAULT (NEWID()) PRIMARY KEY, + [UnitId] nvarchar(50), + [MaterialId] nvarchar(50), + [ColorName] NVARCHAR(50), + [ColorCardNo] NVARCHAR(50), + [RGB] NVARCHAR(20), + [Remark] NVARCHAR(200) +); + +go +exec sp_addextendedproperty 'MS_Description', N'µ¥Î»id', 'SCHEMA', 'dbo', 'TABLE', 'Base_MaterialColor', 'COLUMN', + 'UnitId' +go + +exec sp_addextendedproperty 'MS_Description', N'²ÄÖÊid', 'SCHEMA', 'dbo', 'TABLE', 'Base_MaterialColor', 'COLUMN', + 'MaterialId' +go + + +exec sp_addextendedproperty 'MS_Description', N'ÑÕÉ«Ãû³Æ', 'SCHEMA', 'dbo', 'TABLE', 'Base_MaterialColor', 'COLUMN', + 'ColorName' +go + +exec sp_addextendedproperty 'MS_Description', N'É«¿¨ºÅ', 'SCHEMA', 'dbo', 'TABLE', 'Base_MaterialColor', 'COLUMN', + 'ColorCardNo' +go + +exec sp_addextendedproperty 'MS_Description', N'±¸×¢', 'SCHEMA', 'dbo', 'TABLE', 'Base_MaterialColor', 'COLUMN', + 'Remark' +go + +alter table dbo.HJGL_PackagingManageDetail + add TwOutputDetailId nvarchar(50) +go + +exec sp_addextendedproperty 'MS_Description', N'³ö¿âÃ÷ϸ±íÖ÷¼ü', 'SCHEMA', 'dbo', 'TABLE', 'HJGL_PackagingManageDetail', + 'COLUMN', 'TwOutputDetailId' +go