From efed46603080767c8a45ba9b9f805ea0aae1f696 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期日, 19 十月 2025 12:59:22 +0800
Subject: [PATCH] 生产领料单 生产入库单 采购入库单接口修改

---
 zymes/OperationService/zymes_RealessPrdInStock.cs |  101 ++++++++++++++------
 zymes/OperationService/zymes_RealessPurInStock.cs |   97 ++++++++++++++-----
 zymes/OperationService/zymes_RealessPrdReceive.cs |   88 +++++++++++++---
 3 files changed, 210 insertions(+), 76 deletions(-)

diff --git a/zymes/OperationService/zymes_RealessPrdInStock.cs b/zymes/OperationService/zymes_RealessPrdInStock.cs
index 9d0583e..c110ff5 100644
--- a/zymes/OperationService/zymes_RealessPrdInStock.cs
+++ b/zymes/OperationService/zymes_RealessPrdInStock.cs
@@ -54,37 +54,78 @@
                 string sql = string.Empty;
                 sql = $@"
                 /*dialect*/
-                 SELECT 
-                 a.FID HInterID,a.FENTRYID HEntryID, a.FMATERIALID HMaterID,a.FUNITID HUnitID,
-                 a.FREALQTY HQtyMust, 0 HQty, ISNULL(a.FPrice, 0) HPrice, 0 HMoney, a.FSTOCKID HWHID,
-                 0 HSPID, 'CLOUD瀵煎叆' HRemark, a.FSRCINTERID HSourceInterID, a.FSRCENTRYID HSourceEntryID,  
-                 a.FSRCBILLNO HSourceBillNo, 
-                 case a.FSRCBILLTYPE 
-                 when 'SFC_OperationReport' then '3714'
-                 when 'SFC_OperationTransfer' then '7507'
-                 when 'PRD_MO' then '3710'
-                 when 'PRD_MORPT' then '3711'
-                 end as   
-                 HSourceBillType,0 HPOOrderInterID,0 HPOOrderEntryID,
-                 '' HPOOrderBillNo,0 HSecUnitID,0 HSeOrderInterID, 0 HSeOrderEntryID, '' HSeOrderBillNo, 0 HRelationQty, 
-                 0 HSecUnitRate, a.FAUXPROPID HPropertyID
-                 from T_PRD_INSTOCKENTRY  a with(nolock)
-                Where a.FID={id}
-                select a.FID as HInterID,1202 as HBillType,1202 as HBillSubType,
-                a.FBILLNO as HBillNo,case when a.FAPPROVERID=0 then 1 else 2 end HBillStatus,
-                a.FDATE as HDate,YEAR(a.FDATE) as HYear,MONTH(a.FDATE) as HPeriod,'CLOUD瀵煎叆' as HRemark,
-                a.FCREATORID as HMaker,a.FCREATEDATE as HMakeDate,0 as HSupID,a.FSTOCKERID as HWHID,  
-                a.FSTOCKERID as HEmpID,0 as HManagerID,0 as HSecManagerID,a.FSTOCKERID as HKeeperID,
-                'CLOUD瀵煎叆' as HExplanation,a.FBILLNO as HInnerBillNo,a.FCurrID as HCurID,0 as HExRate,
-                o.FNUMBER as HOrganNumber,a.FAPPROVERID as HChecker,a.FAPPROVEDATE as HCheckDate,
-                a.FSTOCKORGID as HSTOCKORGID,
-                (select top 1 b.FWORKSHOPID 
-                		from T_PRD_INSTOCKEntry b with(nolock) 
-                		where b.FID = a.FID
-                		order by b.FID) as HDeptID
+                SELECT 
+                a.FID as HInterID,a.FEntryID as HEntryID,isnull(a.FMTONO,'') as HMTONo,
+                0 as HPlanMode,'CLD瀵煎叆' as HRemark,'' as HExpressNumber,isnull(a.FMATERIALID,0) as HMaterID,
+                isnull(a.FUNITID,0) as HUnitID,isnull(a.FLOT_TEXT,'') as HBatchNo,
+                isnull(a.FAUXPROPID,0) as HPropertyID,isnull(a.FSTOCKID,0) as HWHID,
+                isnull(a.FSTOCKLOCID,0) as HSPID,0 as HSCWHID,0 as HSCSPID,
+                a.FMUSTQTY as HQtyMust,a.FREALQTY as HQty,isnull(c.FPRICE,0) as HPrice,
+                isnull(a.FAMOUNT,0) as HMoney,0 as HTaxPrice,
+				0 as HTaxRate,isnull(a.FAMOUNT,0) as HTaxMoney,
+                0 as HRelationQty,0 as HRelationMoney,
+                0 as HSourceInterID,0 as HSourceEntryID,isnull(a.FSRCBILLNO,'') as HSourceBillNo,
+                '' as HSourceBillType,a.FID as HERPInterID,a.FEntryID as HERPEntryID,
+                '' as HERPBillNo_Sub,0 as HPOOrderInterID,0 as HPOOrderEntryID,
+                '' as HPOOrderBillNo,0 as HSeOrderInterID,
+                0 as HSeOrderEntryID,'' as HSeOrderBillNo,0 as HICMOInterID,
+                0 as HICMOEntryID,'' as HICMOBillNo,0 as HWWOrderInterID,
+                0 as HWWOrderEntryID,'' as HWWOrderBillNo,isnull(a.FPRODUCEDATE, '') as HProduceDate,
+                a.FEXPIRYDATE as HExpiryDate,isnull(a.FOWNERID,0) as HOWNERID,isnull(a.FOWNERTYPEID,'') as HOWNERTYPEID,
+                isnull(a.FKEEPERID,0) as HKEEPERID,isnull(a.FKEEPERTYPEID,'') as HKEEPERTYPEID,
+                '' as HSUPPLIERLOT,'' as HREQTRACENO,
+                isnull(a.FPROJECTNO,'') as HPROJECTNO,'' as HGIVEAWAY,
+                0 as HSYSPRICE,0 as HPRICECOEFFICIENT,
+                0 as HDISCOUNTRATE,0 as HBASEUNITPRICE,
+                0 as HTAXCOMBINATION,0 as HPRICELISTENTRY,
+                0 as HCOSTPRICE,isnull(a.FSEQ,0) as HSEQ,
+                '' as HROWTYPE,0 as HPARENTMATID,
+                '' as HPRILSTENTRYID,0 as HPURBASENUM,0 as HSTOCKBASEDEN,
+                isnull(a.FBFLOWID,'') as HBFLOWID,isnull(a.FSTOCKSTATUSID,0) as HSTOCKSTATUSID,
+                0 as HPRICEUNITID,isnull(a.FBASEUNITID,0) as HBASEUNITID,
+                isnull(a.FSNUNITID,0) as HSNUNITID, 0 as HREMAININSTOCKUNITID,
+                0 as HEXTAUXUNITID,0 as HTAXRATEID,
+                0 as HTAXRATE_TAX,0 as HTAXAMOUNT,
+                0 as HCOSTPERCENT,0 as HCOSTAMOUNT,
+                '' as HVAT,'' as HSELLERWITHHOLDING,
+                '' as HBUYERWITHHOLDING
+                from T_PRD_INSTOCKENTRY a with(nolock)
+				left join T_PRD_INSTOCKENTRY_A b  with(nolock) on a.FENTRYID = b.FENTRYID and a.FID = b.FID
+				left join T_PRD_INSTOCKENTRY_C c with(nolock) on a.FENTRYID = c.FENTRYID
+                Where a.FID = {id};
+                select 
+                a.FID as HInterID,year(a.FDATE) as HYear,month(a.FDATE) as HPeriod,
+                isnull(a.FBILLNO,'') as HBillNo,'1202' as HBillType,'1202' as HBillSubType,
+                '' as HMainSourceBillType,a.FDATE as HDate,0 as HSupID,
+                0 as HWHID,0 as HSCWHID,0 as HEmpID,0 as HManagerID,0 as HSecManagerID,
+                isnull(FSTOCKERID,0) as HKeeperID,0 as HDeptID,0 as HCurID,
+                '' as HSeOrderBillNo,'CLD瀵煎叆' as HExplanation,'' as HRemark,
+                '' as HInnerBillNo,0 as HRedBlueFlag,case when isnull(a.FAPPROVERID,0)=0 then 1 else 2 end as HBillStatus,
+                isnull(us1.FNAME,'') as HMaker,a.FCREATEDATE as HMakeDate,isnull(us2.FNAME,'') as HChecker,
+                a.FAPPROVEDATE as HCheckDate,isnull(us3.FNAME,'') as HUpDater,a.FMODIFYDATE as HUpDateDate,
+                isnull(us4.FNAME,'') as HDeleteMan,a.FCANCELDATE as HDeleteDate,isnull(a.FOWNERID,0) as HOWNERID,
+                isnull(a.FOWNERTYPEID,'') as HOWNERTYPEID,a.FID as HERPInterID,'' as HERPBillType,
+                isnull(a.FBILLNO,'') as HERPBillNo,0 as HPRDORGID,
+                isnull(a.FSTOCKORGID,0) as HSTOCKORGID,0 as HSTOCKERGROUPID,
+                0 as HPURCHASERGROUPID,0 as HDEMANDORGID,
+                0 as HCORRESPONDORGID, 0 as HPROVIDERCONTACTID,
+                0 as HSUPPLYID,0 as HSETTLEID,
+                0 as HCHARGEID,0 as HPURCHASEDEPTID,
+                '' as HBUSINESSTYPE,'' as HSUPPLYADDRESS,
+                0 as HPAYORGID,0 as HSETTLEORGID,
+                0 as HSETTLETYPEID,0 as HPAYCONDITIONID,
+                0 as HSETTLECURRID,0 as HEXCHANGETYPEID,
+                0 as HDISCOUNTLISTID,0 as HEXCHANGERATE,
+                '' as HPRICETIMEPOINT,0 as HLOCALCURRID,
+                '' as HISINCLUDEDTAX,'' as HISPRICEEXCLUDETAX
+                ,o.FNUMBER as HOrganNumber
                 from T_PRD_INSTOCK a with(nolock)
-                inner join T_ORG_Organizations o with (nolock) on a.FSTOCKORGID = o.FORGID
-                Where a.FID={id}
+                left join T_SEC_user us1 with(nolock) on a.FCREATORID=us1.FUSERID
+                left join T_SEC_user us2 with(nolock) on a.FAPPROVERID=us2.FUSERID
+                left join T_SEC_user us3 with(nolock) on a.FMODIFIERID=us3.FUSERID
+                left join T_SEC_user us4 with(nolock) on a.FCANCELER=us4.FUSERID
+                left join T_ORG_Organizations o with(nolock) on a.FSTOCKORGID=o.FORGID
+                Where a.FID = {id};
                 ";
                 DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
                 DataTable maindt = ds.Tables[1];
diff --git a/zymes/OperationService/zymes_RealessPrdReceive.cs b/zymes/OperationService/zymes_RealessPrdReceive.cs
index 1ecb9e8..694846a 100644
--- a/zymes/OperationService/zymes_RealessPrdReceive.cs
+++ b/zymes/OperationService/zymes_RealessPrdReceive.cs
@@ -54,27 +54,77 @@
                 string sql = string.Empty;
                 sql = $@"
                 /*dialect*/
-                select a.FID HInterID, a.FENTRYID HEntryID, '' as HCloseMan, '' as HEntryCloseDate, 0 as HCloseType
-                , 'CLOUD瀵煎叆' as HRemark, 0 HSourceInterID,0 HSourceEntryID,'' HSourceBillNo,'' HSourceBillType
-                , 0 HRelationQty,0 HRelationMoney
-                , a.FMATERIALID HMaterID,a.FAUXPROPID HPropertyID,0 HSecUnitID,0 HSecUnitRate,a.FUNITID HUnitID
-                , 0 HQtyMust, a.FACTUALQTY HQty,isnull(a.FPrice, 0) HPrice,0 HMoney
-                ,a.FSTOCKID HWHID,0 HSCWHID,0 HSPID, 0 HSCSPID, 0 HSPGroupID, a.FLOT HBatchNo, 0 HPOOrderInterID
-                ,0 HPOOrderEntryID, '' HPOOrderBillNo, 0 HSeOrderInterID,0 HSeOrderEntryID, '' HSeOrderBillNo
-                from T_PRD_PICKMTRLDATA as a with(nolock)
+                 select 
+                a.FID as HInterID,a.FEntryID as HEntryID,isnull(a.FMTONO,'') as HMTONo,
+                0 as HPlanMode,'CLD瀵煎叆' as HRemark,'' as HExpressNumber,isnull(a.FMATERIALID,0) as HMaterID,
+                isnull(a.FUNITID,0) as HUnitID,isnull(a.FLOT_TEXT,'') as HBatchNo,
+                isnull(a.FAUXPROPID,0) as HPropertyID,isnull(a.FSTOCKID,0) as HWHID,
+                isnull(a.FSTOCKLOCID,0) as HcD,0 as HSCWHID,0 as HSCcD,
+                0 as HQtyMust,0 as HQty,isnull(b.FPRICE,0) as HPrice,
+                isnull(a.FAMOUNT,0) as HMoney,0 as HTaxPrice,
+                0 as HTaxRate,a.FAMOUNT as HTaxMoney,
+                0 as HRelationQty,0 as HRelationMoney,
+                0 as HSourceInterID,0 as HSourceEntryID,isnull(a.FSRCBILLNO,'') as HSourceBillNo,
+                '' as HSourceBillType,a.FID as HERPInterID,a.FEntryID as HERPEntryID,
+                '' as HERPBillNo_Sub,0 as HPOOrderInterID,0 as HPOOrderEntryID,
+				'' as HPOOrderBillNo,0 as HSeOrderInterID,
+                0 as HSeOrderEntryID,'' as HSeOrderBillNo,0 as HICMOInterID,
+                0 as HICMOEntryID,'' as HICMOBillNo,0 as HWWOrderInterID,
+                0 as HWWOrderEntryID,'' as HWWOrderBillNo,isnull(a.FPRODUCEDATE, '') as HProduceDate,
+                a.FEXPIRYDATE as HExpiryDate,isnull(c.FOWNERID,0) as HOWNERID,isnull(c.FOWNERTYPEID,'') as HOWNERTYPEID,
+                0 as HKEEPERID,isnull(c.FKEEPERTYPEID,'') as HKEEPERTYPEID,
+                '' as HSUPPLIERLOT,'' as HREQTRACENO,
+                isnull(a.FPROJECTNO,'') as HPROJECTNO,'' as HGIVEAWAY,
+                0 as HSYSPRICE,0 as HPRICECOEFFICIENT,
+                0 as HDISCOUNTRATE,0 as HBASEUNITPRICE,
+                0 as HTAXCOMBINATION,0 as HPRICELISTENTRY,
+                0 as HCOSTPRICE,isnull(a.FSEQ,0) as HSEQ,
+                '' as HROWTYPE,0 as HPARENTMATID,
+                '' as HPRILSTENTRYID,0 as HPURBASENUM,0 as HSTOCKBASEDEN,
+                isnull(a.FBFLOWID,'') as HBFLOWID,isnull(a.FSTOCKSTATUSID,0) as HSTOCKSTATUSID,
+                0 as HPRICEUNITID,isnull(a.FBASEUNITID,0) as HBASEUNITID,
+                isnull(c.FSNUNITID,0) as HSNUNITID,0 as HREMAININSTOCKUNITID,
+                0 as HEXTAUXUNITID,0 as HTAXRATEID,
+                0 as HTAXRATE_TAX,0 as HTAXAMOUNT,
+                0 as HCOSTPERCENT,0 as HCOSTAMOUNT,
+                '' as HVAT,'' as HSELLERWITHHOLDING,
+				'' as HBUYERWITHHOLDING
+                from T_PRD_PICKMTRLDATA a with(nolock)
+                left join T_PRD_PICKMTRLDATA_C b with(nolock) on  a.FENTRYID=b.FENTRYID
+                left join T_PRD_PICKMTRLDATA_A c with(nolock) on a.FID=c.FID and a.FENTRYID=c.FENTRYID
                 Where a.FID={id}
-                select a.FID as HInterID, 1204 as HBillType, 1204 as HBillSubType, a.FBILLNO as HBillNo, case when a.FAPPROVERID=0 then 1 else 2 end HBillStatus
-                , a.FDATE as HDate, YEAR(a.FDATE) as HYear, MONTH(a.FDATE) as HPeriod, 'CLOUD瀵煎叆' as HRemark
-                , a.FCREATORID as HMaker, a.FCREATEDATE as HMakeDate, 0 as HSupID, FSTOCKERID as HWHID, 0 as HSCWHID
-                , a.FPICKERID as HEmpID, 0 as HManagerID, a.FPICKERID as HSecManagerID, a.FSTOCKERID as HKeeperID
-                , 'CLOUD瀵煎叆' as HExplanation, a.FBILLNO as HInnerBillNo, 0 as HRedBlueFlag
-                ,o.FNUMBER as HOrganNumber,a.FAPPROVERID as HChecker,a.FAPPROVEDATE as HCheckDate,
-                (select top 1 b.FWORKSHOPID 
-                     from T_PRD_PICKMTRLDATA b with(nolock) 
-                     where b.FID = a.FID
-                     order by b.FID) as HDeptID
+                select 
+                a.FID as HInterID,year(a.FDATE) as HYear,month(a.FDATE) as HPeriod,
+                isnull(a.FBILLNO,'') as HBillNo,'1204' as HBillType,'1204' as HBillSubType,
+                '' as HMainSourceBillType,a.FDATE as HDate,0 as HSupID,
+                0 as HWHID,0 as HSCWHID,0 as HEmpID,0 as HManagerID,0 as HSecManagerID,
+                isnull(FSTOCKERID,0) as HKeeperID,0 as HDeptID,0 as HCurID,
+                '' as HSeOrderBillNo,'CLD瀵煎叆' as HExplanation,'' as HRemark,
+                '' as HInnerBillNo,0 as HRedBlueFlag,case when isnull(a.FAPPROVERID,0)=0 then 1 else 2 end as HBillStatus,
+                isnull(us1.FNAME,'') as HMaker,a.FCREATEDATE as HMakeDate,isnull(us2.FNAME,'') as HChecker,
+                a.FAPPROVEDATE as HCheckDate,isnull(us3.FNAME,'') as HUpDater,a.FMODIFYDATE as HUpDateDate,
+                isnull(us4.FNAME,'') as HDeleteMan,a.FCANCELDATE as HDeleteDate,isnull(a.FOWNERID,0) as HOWNERID,
+                isnull(a.FOWNERTYPEID,'') as HOWNERTYPEID,a.FID as HERPInterID,isnull(a.FBILLTYPE,'') as HERPBillType,
+                isnull(a.FBILLNO,'') as HERPBillNo,isnull(FPRDORGID,0) as HPRDORGID,
+                isnull(a.FSTOCKORGID,0) as HSTOCKORGID, 0 as HSTOCKERGROUPID,
+                0 as HPURCHASERGROUPID,0 as HDEMANDORGID,
+                0 as HCORRESPONDORGI,0 as HPROVIDERCONTACTID,
+                0 as HSUPPLYID,0 as HSETTLEID,
+                0 as HCHARGEID,0 as HPURCHASEDEPTID,
+                '' as HBUSINESSTYPE,'' as HSUPPLYADDRESS,
+                0 as HPAYORGID,0 as HSETTLEORGID,
+                0 as HSETTLETYPEID,0 as HPAYCONDITIONID,
+                0 as HSETTLECURRID,0 as HEXCHANGETYPEID,
+                0 as HDISCOUNTLISTID,0 as HEXCHANGERATE,
+                '' as HPRICETIMEPOINT,0 as HLOCALCURRID,
+                '' as HISINCLUDEDTAX,'' as HISPRICEEXCLUDETAX
+                ,o.FNUMBER as HOrganNumber
                 from T_PRD_PICKMTRL a with(nolock)
-                inner join T_ORG_Organizations o with (nolock) on a.FSTOCKORGID = o.FORGID
+                left join T_SEC_user us1 with(nolock) on a.FCREATORID=us1.FUSERID
+                left join T_SEC_user us2 with(nolock) on a.FAPPROVERID=us2.FUSERID
+                left join T_SEC_user us3 with(nolock) on a.FMODIFIERID=us3.FUSERID
+                left join T_SEC_user us4 with(nolock) on a.FCANCELER=us4.FUSERID
+                left join T_ORG_Organizations o with(nolock) on a.FSTOCKORGID=o.FORGID
                 Where a.FID={id}
 ";
                 DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
diff --git a/zymes/OperationService/zymes_RealessPurInStock.cs b/zymes/OperationService/zymes_RealessPurInStock.cs
index 497e8c1..81b0da0 100644
--- a/zymes/OperationService/zymes_RealessPurInStock.cs
+++ b/zymes/OperationService/zymes_RealessPurInStock.cs
@@ -193,36 +193,79 @@
                 string sql = string.Empty;
                 sql = $@"
                 /*dialect*/
-                select a.FID HInterID,a.FENTRYID HEntryID,a.FMATERIALID HMaterID,a.FUNITID HUnitID
-                ,a.FREALQTY HQtyMust,0 HQty,f.FPRICE HPrice
-                ,f.FAMOUNT HMoney,f.FCOSTAMOUNT HOrderPrice,a.FSTOCKID HWHID,a.FSTOCKLOCID HSPID
-                ,0 HRelationQty,a.FLOT HBatchNo,0 HSourceInterID,0 HSourceEntryID,a.FSRCBILLNO HSourceBillNo
-                ,case  a.FSRCBILLTYPEID 
-                when 'PUR_PurchaseOrder' then 1100
-                when 'SAL_OUTSTOCK' then 1205
-                when 'PUR_ReceiveBill' then 1103
-                end
-                HSourceBillType
-                ,0 HPOOrderInterID,0 HPOOrderEntryID ,'' HPOOrderBillNo
-                ,a.FAUXPROPID HPropertyID,0 HSecUnitID,0 HSecUnitRate,0 HPlanMode,'CLOUD瀵煎叆' HRemark
-                ,0 HSeOrderInterID,0 HSeOrderEntryID,0 HSeOrderBillNo
-                ,f.FTAXRATE HTaxRate,f.FTAXPRICE HTaxPrice,0 HlineTotal
+                select 
+                a.FID as HInterID,a.FEntryID as HEntryID,isnull(a.FMTONO,'') as HMTONo,
+                0 as HPlanMode,a.FNOTE as HRemark,'' as HExpressNumber,isnull(a.FMATERIALID,0) as HMaterID,
+                isnull(a.FUNITID,0) as HUnitID,isnull(a.FLOT_TEXT,'') as HBatchNo,
+                isnull(a.FAUXPROPID,0) as HPropertyID,isnull(a.FSTOCKID,0) as HWHID,
+                isnull(a.FSTOCKLOCID,0) as HSPID,0 as HSCWHID,0 as HSCSPID,
+                a.FMUSTQTY as HQtyMust,a.FREALQTY as HQty,isnull(b.FPRICE,0) as HPrice,
+                isnull(b.FAMOUNT,0) as HMoney,isnull(b.FTAXPRICE,0) as HTaxPrice,
+                isnull(b.FTAXRATE,0) as HTaxRate,isnull(b.FAMOUNT,0) as HTaxMoney,
+                isnull(a.FRETURNJOINQTY,0) as HRelationQty,0 as HRelationMoney,
+                0 as HSourceInterID,0 as HSourceEntryID,isnull(a.FSRCBILLNO,'') as HSourceBillNo,
+                '' as HSourceBillType,a.FID as HERPInterID,a.FEntryID as HERPEntryID,
+                '' as HERPBillNo_Sub,0 as HPOOrderInterID,isnull(a.FPOORDERENTRYID,0) as HPOOrderEntryID,
+                isnull(a.FPOORDERNO,'') as HPOOrderBillNo,0 as HSeOrderInterID,
+                0 as HSeOrderEntryID,'' as HSeOrderBillNo,0 as HICMOInterID,
+                0 as HICMOEntryID,'' as HICMOBillNo,0 as HWWOrderInterID,
+                0 as HWWOrderEntryID,'' as HWWOrderBillNo,isnull(a.FPRODUCEDATE, '') as HProduceDate,
+                a.FEXPIRYDATE as HExpiryDate,isnull(a.FOWNERID,0) as HOWNERID,isnull(a.FOWNERTYPEID,'') as HOWNERTYPEID,
+                isnull(a.FKEEPERID,0) as HKEEPERID,isnull(a.FKEEPERTYPEID,'') as HKEEPERTYPEID,
+                isnull(a.FSUPPLIERLOT,'') as HSUPPLIERLOT,isnull(a.FREQTRACENO,'') as HREQTRACENO,
+                isnull(a.FPROJECTNO,'') as HPROJECTNO,isnull(a.FGIVEAWAY,'') as HGIVEAWAY,
+                isnull(b.FSYSPRICE,0) as HSYSPRICE,isnull(b.FPRICECOEFFICIENT,0) as HPRICECOEFFICIENT,
+                isnull(b.FDISCOUNTRATE,0) as HDISCOUNTRATE,isnull(b.FBASEUNITPRICE,0) as HBASEUNITPRICE,
+                isnull(b.FTAXCOMBINATION,0) as HTAXCOMBINATION,isnull(b.FPRICELISTENTRY,0) as HPRICELISTENTRY,
+                isnull(b.FCOSTPRICE,0) as HCOSTPRICE,isnull(a.FSEQ,0) as HSEQ,
+                isnull(spi.FROWTYPE,'') as HROWTYPE,isnull(spi.FPARENTMATID,0) as HPARENTMATID,
+                isnull(spi.FPRILSTENTRYID,'') as HPRILSTENTRYID,isnull(spi.FPURBASENUM,0) as HPURBASENUM,isnull(spi.FSTOCKBASEDEN,0) as HSTOCKBASEDEN,
+                isnull(a.FBFLOWID,'') as HBFLOWID,isnull(a.FSTOCKSTATUSID,0) as HSTOCKSTATUSID,
+                isnull(b.FPRICEUNITID,0) as HPRICEUNITID,isnull(a.FBASEUNITID,0) as HBASEUNITID,
+                isnull(spi.FSNUNITID,0) as HSNUNITID,isnull(b.FREMAININSTOCKUNITID,0) as HREMAININSTOCKUNITID,
+                isnull(a.FEXTAUXUNITID,0) as HEXTAUXUNITID,isnull(px.FTAXRATEID,0) as HTAXRATEID,
+                isnull(px.FTAXRATE,0) as HTAXRATE_TAX,isnull(px.FTAXAMOUNT,0) as HTAXAMOUNT,
+                isnull(px.FCOSTPERCENT,0) as HCOSTPERCENT,isnull(px.FCOSTAMOUNT,0) as HCOSTAMOUNT,
+                isnull(px.FVAT,'') as HVAT,isnull(px.FSELLERWITHHOLDING,'') as HSELLERWITHHOLDING,
+                isnull(px.FBUYERWITHHOLDING,'') as HBUYERWITHHOLDING
                 from T_STK_INSTOCKENTRY a with(nolock)
-                left join T_STK_INSTOCKENTRY_F f with(nolock) on a.FENTRYID = f.FENTRYID
-                left join T_STK_INSTOCKENTRY_TAX t with(nolock) on a.FENTRYID=t.FENTRYID
-                left join T_STK_INSTOCKFIN fin with(nolock) on a.FENTRYID=fin.FENTRYID
+                left join T_STK_INSTOCKENTRY_F b with(nolock) on  a.FID=b.FID and a.FENTRYID=b.FENTRYID
+                left join T_STK_INSTOCKENTRY_I spi with(nolock) on a.FID=spi.FID and a.FENTRYID=spi.FENTRYID
+                left join T_STK_INSTOCKENTRY_TAX px with(nolock) on a.FENTRYID=px.FENTRYID
                 Where a.FID={id}
                 select 
-                a.FID as HInterID,YEAR(a.FDATE) HYear,MONTH(a.FDATE) HPeriod,1201 HBillType,1201 HBillSubType,
-                a.FDATE HDate,a.FBILLNO HBillNo,case when a.FAPPROVERID=0 then 1 else 2 end HBillStatus
-                ,a.FSUPPLYADDRESS HAddress,a.FSUPPLIERID HSupID,0 HCurID,0 HWHID,a.FPURCHASERID HEmpID
-                ,0 HManagerID,0 HSecManagerID,a.FSTOCKERID HKeeperID,a.FPURCHASEDEPTID HDeptID
-                , '' HExplanation,'CLOUD瀵煎叆' HRemark,a.FBILLNO HInnerBillNo,a.FSTOCKORGID HSTOCKORGID
-                ,a.FOWNERID HOWNERID,a.FCREATORID HMaker,a.FCREATEDATE HMakeDate
-                ,0 HProjectID,'' HInvoiceBillNo
-                ,o.FNUMBER as HOrganNumber,a.FAPPROVERID as HChecker,a.FAPPROVEDATE as HCheckDate
-                from  T_STK_INSTOCK a
-                inner join T_ORG_Organizations o with (nolock) on a.FSTOCKORGID = o.FORGID
+                a.FID as HInterID,year(a.FDATE) as HYear,month(a.FDATE) as HPeriod,
+                isnull(a.FBILLNO,'') as HBillNo,'1201' as HBillType,'1201' as HBillSubType,
+                '' as HMainSourceBillType,a.FDATE as HDate,a.FSUPPLIERID as HSupID,
+                0 as HWHID,0 as HSCWHID,0 as HEmpID,0 as HManagerID,a.FPURCHASERID as HSecManagerID,
+                isnull(FSTOCKERID,0) as HKeeperID,a.FSTOCKDEPTID as HDeptID,0 as HCurID,
+                '' as HSeOrderBillNo,'CLD瀵煎叆' as HExplanation,'' as HRemark,
+                '' as HInnerBillNo,0 as HRedBlueFlag,case when isnull(a.FAPPROVERID,0)=0 then 1 else 2 end as HBillStatus,
+                isnull(us1.FNAME,'') as HMaker,a.FCREATEDATE as HMakeDate,isnull(us2.FNAME,'') as HChecker,
+                a.FAPPROVEDATE as HCheckDate,isnull(us3.FNAME,'') as HUpDater,a.FMODIFYDATE as HUpDateDate,
+                isnull(us4.FNAME,'') as HDeleteMan,a.FCANCELDATE as HDeleteDate,isnull(a.FOWNERID,0) as HOWNERID,
+                isnull(a.FOWNERTYPEID,'') as HOWNERTYPEID,a.FID as HERPInterID,isnull(a.FBILLTYPEID,'') as HERPBillType,
+                isnull(a.FBILLNO,'') as HERPBillNo,isnull(FPURCHASEORGID,0) as HPRDORGID,
+                isnull(a.FSTOCKORGID,0) as HSTOCKORGID,isnull(a.FSTOCKERGROUPID,0) as HSTOCKERGROUPID,
+                isnull(a.FPURCHASERGROUPID,0) as HPURCHASERGROUPID,isnull(a.FDEMANDORGID,0) as HDEMANDORGID,
+                isnull(a.FCORRESPONDORGID,0) as HCORRESPONDORGID,isnull(a.FPROVIDERCONTACTID,0) as HPROVIDERCONTACTID,
+                isnull(a.FSUPPLYID,0) as HSUPPLYID,isnull(a.FSETTLEID,0) as HSETTLEID,
+                isnull(a.FCHARGEID,0) as HCHARGEID,isnull(a.FPURCHASEDEPTID,0) as HPURCHASEDEPTID,
+                isnull(a.FBUSINESSTYPE,'') as HBUSINESSTYPE,isnull(a.FSUPPLYADDRESS,'') as HSUPPLYADDRESS,
+                isnull(fin.FPAYORGID,0) as HPAYORGID,isnull(fin.FSETTLEORGID,0) as HSETTLEORGID,
+                isnull(fin.FSETTLETYPEID,0) as HSETTLETYPEID,isnull(fin.FPAYCONDITIONID,0) as HPAYCONDITIONID,
+                isnull(fin.FSETTLECURRID,0) as HSETTLECURRID,isnull(fin.FEXCHANGETYPEID,0) as HEXCHANGETYPEID,
+                isnull(fin.FDISCOUNTLISTID,0) as HDISCOUNTLISTID,isnull(fin.FEXCHANGERATE,0) as HEXCHANGERATE,
+                isnull(fin.FPRICETIMEPOINT,'') as HPRICETIMEPOINT,isnull(fin.FLOCALCURRID,0) as HLOCALCURRID,
+                isnull(fin.FISINCLUDEDTAX,'') as HISINCLUDEDTAX,isnull(fin.FISPRICEEXCLUDETAX,'') as HISPRICEEXCLUDETAX
+                ,o.FNUMBER as HOrganNumber          
+				from T_STK_INSTOCK a with(nolock)
+                left join T_STK_INSTOCKFIN fin with(nolock) on a.FID=fin.FID
+                left join T_SEC_user us1 with(nolock) on a.FCREATORID=us1.FUSERID
+                left join T_SEC_user us2 with(nolock) on a.FAPPROVERID=us2.FUSERID
+                left join T_SEC_user us3 with(nolock) on a.FMODIFIERID=us3.FUSERID
+                left join T_SEC_user us4 with(nolock) on a.FCANCELLERID=us4.FUSERID
+				left join T_ORG_Organizations o with(nolock) on a.FPURCHASEORGID=o.FORGID
                 Where a.FID={id}
                 ";
                 DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);

--
Gitblit v1.9.1