2022-09-08 合同基本修改，焊接数据分析修改

2022-09-08 20:14:51 +08:00
parent e0f256688a
commit 6881455e9d
22 changed files with 2744 additions and 259 deletions
@@ -46,11 +46,11 @@ namespace FineUIPro.Web.PHTGL.Filing
                                     WHEN '5' THEN 'ds' END) AS ContractType,
                                    ( CASE Rev.State
                                    WHEN  @ContractCreating     THEN '编制中'
-                                     WHEN  @Contract_countersign     THEN '会签中'
+                                    WHEN  @Contract_countersign     THEN '会签中'
                                    WHEN  @ContractReviewing        THEN '审批中'
                                    WHEN  @ContractReview_Complete  THEN '审批成功'
                                    WHEN  @ContractReview_Refuse    THEN '审批被拒'   END) AS State ,
-                                      Con.Remarks,
+                                    Con.Remarks,
                                    Con.EPCCode,
                                    Con.ProjectShortName,
                                    Con.[OpeningBank-TT] as OpeningBank_TT ,
@@ -58,11 +58,28 @@ namespace FineUIPro.Web.PHTGL.Filing
                                    Con.[BankAccount-TT] as BankAccount_TT,
                                    Con.[BankAccount-electrophore] as BankAccount_electrophore,
                                    Con.[LineNumber-electrophore] as LineNumber_electrophore,
-                                    Con.Retentionmoney,
+                                    Con.Retentionmoney,                               
+                                    (CASE Con.Status WHEN '0' THEN '已签订'
+                                     WHEN '1' THEN '已完毕' END) as Status,  
+                                    Con.ContactUnitOfPartyA,  
+                                    Con.ContactPersonOfPartyA,  
+                                    Con.ContactPersonOfPartyB,  
+                                    Con.ContactPersonPhoneOfPartyB,  
+                                    Con.ContactPersonEmailOfPartyB,  
+                                    Con.ContractAmountExcludingTax,   
+                                    Con.PriceMethod,  
+                                    CONVERT(varchar(100), SignedOnDate, 111) as SignedOnDate,
+                                    CONVERT(varchar(100), ContractStartDate, 111) as ContractStartDate,
+                                    CONVERT(varchar(100), ContractEndDate, 111) as ContractEndDate,
+                                    Con.PricingBasis,  
+                                    (CASE Con.SubcontractingMethod WHEN '1' then '内部分包'
+                                     WHEN '2' THEN '外部分包' END ) as SubcontractingMethod, 
+                                    (CASE Con.IsItACentralizedPurchaseSupplier WHEN '0' then '否'
+                                     WHEN '1' THEN '是' END ) as IsItACentralizedPurchaseSupplier,
                                    Pro.ProjectCode,
                                    Pro.ProjectName,
                                    Dep.DepartName,
-                                    U.PersonName AS AgentName"
+                                    U.PersonName AS AgentName "
                            + @" from PHTGL_ContractReview AS Rev"
                            + @"  LEFT JOIN PHTGL_Contract AS Con  ON Con.ContractId=Rev.ContractId"
                            //+ @"  left join PHTGL_ActionPlanFormation as Act on Act.EPCCode=Con.EPCCode"