Compare commits

...

4 Commits

View File

@ -169,7 +169,7 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
,c.FNAME as '购货单位' ---- ,c.FNAME as '购货单位' ----
,CONVERT(VARCHAR(10), A.FDate,23) AS '签订日期' ,CONVERT(VARCHAR(10), A.FDate,23) AS '签订日期'
,CONVERT(VARCHAR(10), A.FApproveDate,23) AS '审核日期' ---- ,CONVERT(VARCHAR(10), A.FApproveDate,23) AS '审核日期' ----
,A.F_contractnumber AS '땐데뵀'----谿 ,A.F_contractnumber AS '纸质合同号'----
,E.FNUMBER AS '产品代码' ,E.FNUMBER AS '产品代码'
,d.FNAME as '产品名称' ---- ,d.FNAME as '产品名称' ----
,d.FSPECIFICATION as '规格型号'---- ,d.FSPECIFICATION as '规格型号'----
@ -243,6 +243,7 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
,AE.FDATAVALUE AS '合同类型' ,AE.FDATAVALUE AS '合同类型'
,assl.FDATAVALUE '客户信用及分类'
INTO #TEMP4 INTO #TEMP4
FROM T_SAL_ORDER A -- FROM T_SAL_ORDER A --
INNER JOIN T_BAS_ASSISTANTDATAENTRY HT ON A.F_ORDERCATEGORY = HT.FMASTERID -- 关联辅助资料查询合同的编码 INNER JOIN T_BAS_ASSISTANTDATAENTRY HT ON A.F_ORDERCATEGORY = HT.FMASTERID -- 关联辅助资料查询合同的编码
@ -273,6 +274,7 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.=O.FNAME AND ISNULL(ACO.,'') != '' LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.=O.FNAME AND ISNULL(ACO.,'') != ''
LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACL ON ACL.=L.FNAME AND ISNULL(ACL.,'') != '' LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACL ON ACL.=L.FNAME AND ISNULL(ACL.,'') != ''
INNER JOIN T_BAS_ASSISTANTDATAENTRY_L AE ON AE.FENTRYID = A.F_Ordercategory INNER JOIN T_BAS_ASSISTANTDATAENTRY_L AE ON AE.FENTRYID = A.F_Ordercategory
LEFT JOIN dbo.T_BAS_ASSISTANTDATAENTRY_L assl ON assl.FENTRYID= a.F_CREDITCLASSIFICATIONTEXT
WHERE WHERE
1=1 AND 1=1 AND
A.FID NOT IN( A.FID NOT IN(