1
This commit is contained in:
parent
07a043d45a
commit
e5a925b91b
@ -71,7 +71,7 @@ namespace GZ_LTHReportForms.ReporyDDWFH
|
|||||||
header.AddChild("规格型号", new LocaleValue("规格型号"), SqlStorageType.Sqlnvarchar);
|
header.AddChild("规格型号", new LocaleValue("规格型号"), SqlStorageType.Sqlnvarchar);
|
||||||
header.AddChild("数量", new LocaleValue("数量"), SqlStorageType.SqlDecimal);
|
header.AddChild("数量", new LocaleValue("数量"), SqlStorageType.SqlDecimal);
|
||||||
header.AddChild("含税单价", new LocaleValue("含税单价"), SqlStorageType.SqlDecimal);
|
header.AddChild("含税单价", new LocaleValue("含税单价"), SqlStorageType.SqlDecimal);
|
||||||
header.AddChild("折扣率", new LocaleValue("折扣率%"), SqlStorageType.SqlDecimal);
|
header.AddChild("折扣率", new LocaleValue("折扣率"), SqlStorageType.SqlDecimal);
|
||||||
header.AddChild("价税合计", new LocaleValue("价税合计"), SqlStorageType.SqlDecimal);
|
header.AddChild("价税合计", new LocaleValue("价税合计"), SqlStorageType.SqlDecimal);
|
||||||
header.AddChild("已发货数量", new LocaleValue("已发货数量"), SqlStorageType.SqlDecimal);
|
header.AddChild("已发货数量", new LocaleValue("已发货数量"), SqlStorageType.SqlDecimal);
|
||||||
header.AddChild("已发货金额", new LocaleValue("已发货金额"), SqlStorageType.SqlDecimal);
|
header.AddChild("已发货金额", new LocaleValue("已发货金额"), SqlStorageType.SqlDecimal);
|
||||||
|
|||||||
@ -122,14 +122,37 @@ BEGIN
|
|||||||
|
|
||||||
UPDATE a
|
UPDATE a
|
||||||
SET a.[K3发货数量]=b.发货数量,a.[K3发货金额]=b.发货金额,a.[K3退货数量]=b.退货数量
|
SET a.[K3发货数量]=b.发货数量,a.[K3发货金额]=b.发货金额,a.[K3退货数量]=b.退货数量
|
||||||
,a.[K3退货金额]=b.退货金额,a.[K3专票金额] = b.专票金额 ,a.[K3普票金额]= b.普票金额
|
,a.[K3退货金额]=b.退货金额--,a.[K3专票金额] = b.专票金额 ,a.[K3普票金额]= b.普票金额
|
||||||
FROM YingShouZhanKuanMX_GZTH A
|
FROM YingShouZhanKuanMX_GZTH A
|
||||||
INNER JOIN [oldk3seorder0701] b
|
INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID
|
||||||
ON a.FBILLNO=b.[单据编码] AND a.旧物料编码=[物料编码] AND a.FQty=[数量] AND (ABS(a.FTaxPrice-b.[含税单价])<=0.02 OR ABS(a.FTaxPrice-b.[面价])<=0.02)
|
INNER JOIN [oldk3seorder0701] b
|
||||||
|
ON C.F_K3SEQ = b.行号 AND a.FBILLNO=b.[单据编码] --AND a.旧物料编码=[物料编码] AND a.FQty=[数量] AND (ABS(a.FTaxPrice-b.[含税单价])<=0.02 OR ABS(a.FTaxPrice-b.[面价])<=0.02)
|
||||||
WHERE 是否K3数据=0
|
WHERE 是否K3数据=0
|
||||||
AND B.日期 >= @StartDate
|
AND B.日期 >= @StartDate
|
||||||
AND B.日期 < @EndDate
|
AND B.日期 < @EndDate
|
||||||
|
|
||||||
|
--k3专票
|
||||||
|
UPDATE a
|
||||||
|
SET a.[K3专票金额] = b.发票金额
|
||||||
|
FROM YingShouZhanKuanMX_GZTH A
|
||||||
|
INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID
|
||||||
|
INNER JOIN [oldk3ICSale0802] b
|
||||||
|
ON C.FSEQ = 1 AND a.CONTRACTNUMBER=b.合同号 --AND a.旧物料编码=[物料编码] AND a.FQty=[数量] AND (ABS(a.FTaxPrice-b.[含税单价])<=0.02 OR ABS(a.FTaxPrice-b.[面价])<=0.02)
|
||||||
|
WHERE 是否K3数据=0
|
||||||
|
AND b.发票类型 = '专'
|
||||||
|
--AND B.日期 >= @StartDate
|
||||||
|
--AND B.日期 < @EndDate
|
||||||
|
|
||||||
|
--k3普票
|
||||||
|
UPDATE a
|
||||||
|
SET a.[K3普票金额] = b.发票金额
|
||||||
|
FROM YingShouZhanKuanMX_GZTH A
|
||||||
|
INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID
|
||||||
|
INNER JOIN [oldk3ICSale0802] b
|
||||||
|
ON C.FSEQ = 1 AND a.CONTRACTNUMBER=b.合同号 --AND a.旧物料编码=[物料编码] AND a.FQty=[数量] AND (ABS(a.FTaxPrice-b.[含税单价])<=0.02 OR ABS(a.FTaxPrice-b.[面价])<=0.02)
|
||||||
|
WHERE 是否K3数据=0
|
||||||
|
AND b.发票类型 = '普'
|
||||||
|
|
||||||
|
|
||||||
UPDATE a SET a.[K3专票金额] = CASE B.rownumber WHEN 1 THEN b.专票金额 ELSE 0 END,a.[K3普票金额]= CASE B.rownumber WHEN 1 THEN b.普票金额 ELSE 0 END
|
UPDATE a SET a.[K3专票金额] = CASE B.rownumber WHEN 1 THEN b.专票金额 ELSE 0 END,a.[K3普票金额]= CASE B.rownumber WHEN 1 THEN b.普票金额 ELSE 0 END
|
||||||
FROM YingShouZhanKuanMX_GZTH A
|
FROM YingShouZhanKuanMX_GZTH A
|
||||||
|
|||||||
@ -1,10 +1,3 @@
|
|||||||
USE [AIS20250723115352]
|
|
||||||
GO
|
|
||||||
/****** Object: StoredProcedure [dbo].[UpdateYSDZBMX_GZTH] Script Date: 2025/8/2 10:16:20 ******/
|
|
||||||
SET ANSI_NULLS ON
|
|
||||||
GO
|
|
||||||
SET QUOTED_IDENTIFIER ON
|
|
||||||
GO
|
|
||||||
ALTER PROCEDURE [dbo].[UpdateYSDZBMX_GZTH]
|
ALTER PROCEDURE [dbo].[UpdateYSDZBMX_GZTH]
|
||||||
@FSDATE varchar(1000),
|
@FSDATE varchar(1000),
|
||||||
@FEDATE varchar(1000),
|
@FEDATE varchar(1000),
|
||||||
@ -122,14 +115,37 @@ BEGIN
|
|||||||
|
|
||||||
UPDATE a
|
UPDATE a
|
||||||
SET a.[K3发货数量]=b.发货数量,a.[K3发货金额]=b.发货金额,a.[K3退货数量]=b.退货数量
|
SET a.[K3发货数量]=b.发货数量,a.[K3发货金额]=b.发货金额,a.[K3退货数量]=b.退货数量
|
||||||
,a.[K3退货金额]=b.退货金额,a.[K3专票金额] = b.专票金额 ,a.[K3普票金额]= b.普票金额
|
,a.[K3退货金额]=b.退货金额--,a.[K3专票金额] = b.专票金额 ,a.[K3普票金额]= b.普票金额
|
||||||
FROM YingShouZhanKuanMX_GZTH A
|
FROM YingShouZhanKuanMX_GZTH A
|
||||||
INNER JOIN [oldk3seorder0701] b
|
INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID
|
||||||
ON a.FBILLNO=b.[单据编码] AND a.旧物料编码=[物料编码] AND a.FQty=[数量] AND (ABS(a.FTaxPrice-b.[含税单价])<=0.02 OR ABS(a.FTaxPrice-b.[面价])<=0.02)
|
INNER JOIN [oldk3seorder0701] b
|
||||||
|
ON C.F_K3SEQ = b.行号 AND a.FBILLNO=b.[单据编码] --AND a.旧物料编码=[物料编码] AND a.FQty=[数量] AND (ABS(a.FTaxPrice-b.[含税单价])<=0.02 OR ABS(a.FTaxPrice-b.[面价])<=0.02)
|
||||||
WHERE 是否K3数据=0
|
WHERE 是否K3数据=0
|
||||||
AND B.日期 >= @StartDate
|
AND B.日期 >= @StartDate
|
||||||
AND B.日期 < @EndDate
|
AND B.日期 < @EndDate
|
||||||
|
|
||||||
|
--k3专票
|
||||||
|
UPDATE a
|
||||||
|
SET a.[K3专票金额] = b.发票金额
|
||||||
|
FROM YingShouZhanKuanMX_GZTH A
|
||||||
|
INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID
|
||||||
|
INNER JOIN [oldk3ICSale0802] b
|
||||||
|
ON C.FSEQ = 1 AND a.CONTRACTNUMBER=b.合同号 --AND a.旧物料编码=[物料编码] AND a.FQty=[数量] AND (ABS(a.FTaxPrice-b.[含税单价])<=0.02 OR ABS(a.FTaxPrice-b.[面价])<=0.02)
|
||||||
|
WHERE 是否K3数据=0
|
||||||
|
AND b.发票类型 = '专'
|
||||||
|
--AND B.日期 >= @StartDate
|
||||||
|
--AND B.日期 < @EndDate
|
||||||
|
|
||||||
|
--k3普票
|
||||||
|
UPDATE a
|
||||||
|
SET a.[K3普票金额] = b.发票金额
|
||||||
|
FROM YingShouZhanKuanMX_GZTH A
|
||||||
|
INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID
|
||||||
|
INNER JOIN [oldk3ICSale0802] b
|
||||||
|
ON C.FSEQ = 1 AND a.CONTRACTNUMBER=b.合同号 --AND a.旧物料编码=[物料编码] AND a.FQty=[数量] AND (ABS(a.FTaxPrice-b.[含税单价])<=0.02 OR ABS(a.FTaxPrice-b.[面价])<=0.02)
|
||||||
|
WHERE 是否K3数据=0
|
||||||
|
AND b.发票类型 = '普'
|
||||||
|
|
||||||
|
|
||||||
UPDATE a SET a.[K3专票金额] = CASE B.rownumber WHEN 1 THEN b.专票金额 ELSE 0 END,a.[K3普票金额]= CASE B.rownumber WHEN 1 THEN b.普票金额 ELSE 0 END
|
UPDATE a SET a.[K3专票金额] = CASE B.rownumber WHEN 1 THEN b.专票金额 ELSE 0 END,a.[K3普票金额]= CASE B.rownumber WHEN 1 THEN b.普票金额 ELSE 0 END
|
||||||
FROM YingShouZhanKuanMX_GZTH A
|
FROM YingShouZhanKuanMX_GZTH A
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
USE [AIS20250723115352]
|
USE [AIS2025]
|
||||||
GO
|
GO
|
||||||
/****** Object: StoredProcedure [dbo].[GetIV_SALESICYSMX_GZTH] Script Date: 2025/8/2 10:25:18 ******/
|
/****** Object: StoredProcedure [dbo].[GetIV_SALESICYSMX_GZTH] Script Date: 2025/8/2 10:25:18 ******/
|
||||||
SET ANSI_NULLS ON
|
SET ANSI_NULLS ON
|
||||||
@ -37,7 +37,8 @@ BEGIN
|
|||||||
WHERE D.FID IN (SELECT FID FROM YingShouZhanKuanMX_GZTH)
|
WHERE D.FID IN (SELECT FID FROM YingShouZhanKuanMX_GZTH)
|
||||||
AND A.FDOCUMENTSTATUS = 'C'
|
AND A.FDOCUMENTSTATUS = 'C'
|
||||||
AND A.FApproveDate >= @StartDate
|
AND A.FApproveDate >= @StartDate
|
||||||
AND A.FApproveDate < @EndDate
|
AND A.FApproveDate < @EndDate
|
||||||
|
AND A.F_SFQC = 0
|
||||||
|
|
||||||
--销售增值税专用发票-应收单-销售订单
|
--销售增值税专用发票-应收单-销售订单
|
||||||
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
|
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
|
||||||
@ -60,7 +61,8 @@ BEGIN
|
|||||||
WHERE F.FID IN (SELECT FID FROM YingShouZhanKuanMX_GZTH)
|
WHERE F.FID IN (SELECT FID FROM YingShouZhanKuanMX_GZTH)
|
||||||
AND A.FDOCUMENTSTATUS = 'C'
|
AND A.FDOCUMENTSTATUS = 'C'
|
||||||
AND A.FApproveDate >= @StartDate
|
AND A.FApproveDate >= @StartDate
|
||||||
AND A.FApproveDate < @EndDate
|
AND A.FApproveDate < @EndDate
|
||||||
|
AND A.F_SFQC = 0
|
||||||
|
|
||||||
--销售增值税专用发票-应收单-销售出库单-发货通知单-销售订单
|
--销售增值税专用发票-应收单-销售出库单-发货通知单-销售订单
|
||||||
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
|
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
|
||||||
@ -88,6 +90,7 @@ BEGIN
|
|||||||
AND A.FDOCUMENTSTATUS = 'C'
|
AND A.FDOCUMENTSTATUS = 'C'
|
||||||
AND A.FApproveDate >= @StartDate
|
AND A.FApproveDate >= @StartDate
|
||||||
AND A.FApproveDate < @EndDate
|
AND A.FApproveDate < @EndDate
|
||||||
|
AND A.F_SFQC = 0
|
||||||
|
|
||||||
--销售增值税专用发票-应收单-销售出库单-销售订单
|
--销售增值税专用发票-应收单-销售出库单-销售订单
|
||||||
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
|
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
|
||||||
@ -113,6 +116,7 @@ BEGIN
|
|||||||
AND A.FDOCUMENTSTATUS = 'C'
|
AND A.FDOCUMENTSTATUS = 'C'
|
||||||
AND A.FApproveDate >= @StartDate
|
AND A.FApproveDate >= @StartDate
|
||||||
AND A.FApproveDate < @EndDate
|
AND A.FApproveDate < @EndDate
|
||||||
|
AND A.F_SFQC = 0
|
||||||
|
|
||||||
--销售增值税专用发票-应收单-期初销售出库单-销售订单
|
--销售增值税专用发票-应收单-期初销售出库单-销售订单
|
||||||
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
|
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
|
||||||
@ -137,6 +141,7 @@ BEGIN
|
|||||||
AND A.FDOCUMENTSTATUS = 'C'
|
AND A.FDOCUMENTSTATUS = 'C'
|
||||||
AND A.FApproveDate >= @StartDate
|
AND A.FApproveDate >= @StartDate
|
||||||
AND A.FApproveDate < @EndDate
|
AND A.FApproveDate < @EndDate
|
||||||
|
AND A.F_SFQC = 0
|
||||||
|
|
||||||
--红票销售增值税专用发票-应收单-销售退货单-退货通知单-销售订单
|
--红票销售增值税专用发票-应收单-销售退货单-退货通知单-销售订单
|
||||||
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
|
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
|
||||||
@ -164,6 +169,7 @@ BEGIN
|
|||||||
AND A.FDOCUMENTSTATUS = 'C'
|
AND A.FDOCUMENTSTATUS = 'C'
|
||||||
AND A.FApproveDate >= @StartDate
|
AND A.FApproveDate >= @StartDate
|
||||||
AND A.FApproveDate < @EndDate
|
AND A.FApproveDate < @EndDate
|
||||||
|
AND A.F_SFQC = 0
|
||||||
|
|
||||||
--红票销售增值税专用发票-应收单-销售退货单-销售订单
|
--红票销售增值税专用发票-应收单-销售退货单-销售订单
|
||||||
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
|
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
|
||||||
@ -189,6 +195,7 @@ BEGIN
|
|||||||
AND A.FDOCUMENTSTATUS = 'C'
|
AND A.FDOCUMENTSTATUS = 'C'
|
||||||
AND A.FApproveDate >= @StartDate
|
AND A.FApproveDate >= @StartDate
|
||||||
AND A.FApproveDate < @EndDate
|
AND A.FApproveDate < @EndDate
|
||||||
|
AND A.F_SFQC = 0
|
||||||
|
|
||||||
--红票销售增值税专用发票-应收单-销售退货单-退货通知单-销售出库单-发货通知单-销售订单
|
--红票销售增值税专用发票-应收单-销售退货单-退货通知单-销售出库单-发货通知单-销售订单
|
||||||
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
|
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
|
||||||
@ -218,6 +225,7 @@ BEGIN
|
|||||||
AND A.FDOCUMENTSTATUS = 'C'
|
AND A.FDOCUMENTSTATUS = 'C'
|
||||||
AND A.FApproveDate >= @StartDate
|
AND A.FApproveDate >= @StartDate
|
||||||
AND A.FApproveDate < @EndDate
|
AND A.FApproveDate < @EndDate
|
||||||
|
AND A.F_SFQC = 0
|
||||||
|
|
||||||
--红票销售增值税专用发票-应收单-销售退货单-销售出库单-发货通知单-销售订单
|
--红票销售增值税专用发票-应收单-销售退货单-销售出库单-发货通知单-销售订单
|
||||||
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
|
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
|
||||||
@ -245,6 +253,7 @@ BEGIN
|
|||||||
AND A.FDOCUMENTSTATUS = 'C'
|
AND A.FDOCUMENTSTATUS = 'C'
|
||||||
AND A.FApproveDate >= @StartDate
|
AND A.FApproveDate >= @StartDate
|
||||||
AND A.FApproveDate < @EndDate
|
AND A.FApproveDate < @EndDate
|
||||||
|
AND A.F_SFQC = 0
|
||||||
|
|
||||||
--红票销售增值税专用发票-应收单-销售退货单-销售出库单-销售订单
|
--红票销售增值税专用发票-应收单-销售退货单-销售出库单-销售订单
|
||||||
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
|
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
|
||||||
@ -271,6 +280,7 @@ BEGIN
|
|||||||
AND A.FDOCUMENTSTATUS = 'C'
|
AND A.FDOCUMENTSTATUS = 'C'
|
||||||
AND A.FApproveDate >= @StartDate
|
AND A.FApproveDate >= @StartDate
|
||||||
AND A.FApproveDate < @EndDate
|
AND A.FApproveDate < @EndDate
|
||||||
|
AND A.F_SFQC = 0
|
||||||
|
|
||||||
--对表的数据进行分组合计
|
--对表的数据进行分组合计
|
||||||
SELECT DISTINCT
|
SELECT DISTINCT
|
||||||
@ -325,7 +335,8 @@ BEGIN
|
|||||||
WHERE 1=1
|
WHERE 1=1
|
||||||
AND A.FDOCUMENTSTATUS = 'C'
|
AND A.FDOCUMENTSTATUS = 'C'
|
||||||
AND A.FApproveDate >= @StartDate
|
AND A.FApproveDate >= @StartDate
|
||||||
AND A.FApproveDate < @EndDate
|
AND A.FApproveDate < @EndDate
|
||||||
|
AND A.F_SFQC = 0
|
||||||
|
|
||||||
--对表进行分组合计
|
--对表进行分组合计
|
||||||
SELECT DISTINCT
|
SELECT DISTINCT
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user