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

2022-09-08 20:14:51 +08:00
parent e0f256688a
commit 6881455e9d
22 changed files with 2744 additions and 259 deletions
@@ -72,6 +72,23 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                                    Con.EPCCode,
                                    con.ProjectShortName,
                                   (convert(varchar(20), Sub.SignedYear) + '年' + convert(varchar(20), Sub.SignedMonth) + '月') as DepartName,
+                                    (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,
                                    Sub.Bank1,
                                    Sub.SubcontractPriceForm,
                                    Sub.Account1"