simoer_jiekou.git

parent: 319ab70c | 补丁 | 提交 | ignore whitespace

llj

2025-10-24 0ab6b76d3f7a1c8485d9bf840916715d39460f7f

更新委外用料清单

2个文件已修改

	zymes/OperationService/zymes_RealessEntrustOrderBill.cs	27 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	zymes/OperationService/zymes_RealessWW_PPBomBill.cs	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 zymes/OperationService/zymes_RealessEntrustOrderBill.cs

@@ -82,14 +82,14 @@
                left join  T_ORG_Organizations oo on oo.FORGID=a.FSUBORGID
                where a.FID={id} 

                select a.FID HInterID,a.FEntryID,a.FMATERIALID,a.FUnitID,a.FNEEDQTY,a.FNEEDQTY,isnull(C.FStockID,0),isnull(pl.FMEMO,'')
                 select a.FID HInterID,a.FEntryID HEntryID,a.FMATERIALID HMaterID,a.FUnitID HUnitID,a.FNEEDQTY HQty,a.FNEEDQTY HQtyMust,isnull(C.FStockID,0) HWHID,isnull(pl.FMEMO,'') HRemark
                ,a.FSUBREQID HSourceInterID,a.FSUBREQENTRYID HSourceEntryID,isnull(a.FSUBREQBILLNO,'') HSourceBillNo,'' HSourceBillType
                ,0 HICMOInterID,0 HICMOEntryID,'' HICMOBillNo
                ,isnull(C.FCHILDSUPPLYORGID,0),isnull(C.FSUPPLYORG,0),isnull(C.FGROUPBYOWNERID,0),isnull(C.FSRCTRANSORGID,0),isnull(C.FGROUPBYOWNERID,0),isnull(C.FOWNERID,0),isnull(C.FOWNERTYPEID,'')
                ,q.FSELPICKEDQTY-q.FSELPRCDRETURNQTY,q.FSELTRANSLATEQTY,isnull(a.FAUXPROPID,0),isnull(C.FLOT_TEXT,''),isnull(a.FMTONo,''),0,a.FID,a.FEntryID
                ,q.FSELPICKEDQTY-q.FSELPRCDRETURNQTY
                ,isnull(a.FPROCESSID,0),isnull(a.FBASEUNITID,0),isnull(a.FPROJECTNO,''),isnull(a.FOPERID,0),isnull(a.FSEQ,0)
                ,isnull(c.FSTOCKSTATUSID,0),isnull(c.FRESERVETYPE,'')
                ,isnull(C.FCHILDSUPPLYORGID,0) HCHILDSUPPLYORGID,isnull(C.FSUPPLYORG,0) HSUPPLYORGID,isnull(C.FGROUPBYOWNERID,0) HENTRUSTPICKORGID,isnull(C.FSRCTRANSORGID,0) HSRCTRANSORGID,isnull(C.FGROUPBYOWNERID,0) HGROUPBYOWNERID,isnull(C.FOWNERID,0) HOWNERID,isnull(C.FOWNERTYPEID,'') HOWNERTYPEID
                ,q.FSELPICKEDQTY-q.FSELPRCDRETURNQTY HRelationQty,q.FSELTRANSLATEQTY HMoveStockQty,isnull(a.FAUXPROPID,0) HAuxPropID,isnull(C.FLOT_TEXT,'') HBatchNO,isnull(a.FMTONo,'') HMTONo,0 HQtyScrap,a.FID HERPInterID,a.FEntryID HERPEntryID
                ,q.FSELPICKEDQTY-q.FSELPRCDRETURNQTY HBackRelationQty
                ,isnull(a.FPROCESSID,0) HPROCESSID,isnull(a.FBASEUNITID,0) HBASEUNITID,isnull(a.FPROJECTNO,'') HPROJECTNO,isnull(a.FOPERID,0) HOPERID,isnull(a.FSEQ,0) HSEQ
                ,isnull(c.FSTOCKSTATUSID,0) HSTOCKSTATUSID,isnull(c.FRESERVETYPE,'') HRESERVETYPE
                from T_SUB_PPBOMEntry a with(nolock)
                inner join T_SUB_PPBOMENTRY_C C with(nolock) on A.FENTRYID=C.FENTRYID
                inner join  T_SUB_PPBOMENTRY_Q Q with(nolock) on A.FENTRYID=Q.FENTRYID
@@ -100,17 +100,18 @@



                select a.FID HInterID,year(a.FCREATEDate),month(a.FCREATEDate),'1604','1604',a.FCREATEDate
                ,a.FbillNo,case when isnull(a.FAPPROVERID,0)=0 then 1 else 2 end HBillStatus,a.FSUBREQID,a.FSUBREQENTRYID,isnull(a.FSUBBILLNO,''),a.FSUBREQENTRYSEQ
                ,a.FMATERIALID,a.FUNITID,a.FQTY,isnull(a.FSUPPLIERID,0),0 HDEPTID
                ,isnull(us1.FNAME,''),a.FCREATEDATE,isnull(us2.FNAME,''),a.FAPPROVEDATE,isnull(us3.FNAME,''),a.FMODIFYDATE
                ,isnull(a.FSALEORDERNO,''),isnull(a.FSALEORDERID,0),isnull(a.FSALEORDERENTRYID,0),isnull(a.FSALEORDERENTRYSEQ,0)
                ,a.FSUBORGID,a.FSUBORGID,isnull(a.FPARENTOWNERID,0),isnull(a.FPARENTOWNERTYPEID,'')
                ,a.FID,'WWPPBOM' HERPBillType,isnull(a.FSETTLEORGID,0),isnull(a.FREQSRC,'')
                select a.FID HInterID,year(a.FCREATEDate) HYear,month(a.FCREATEDate) HPeriod,'1604' HBillType,'1604' HBillSubType,a.FCREATEDate HDate
                ,a.FbillNo HBillNo,case when isnull(a.FAPPROVERID,0)=0 then 1 else 2 end HBillStatus,a.FSUBREQID HICMOInterID,a.FSUBREQENTRYID HICMOEntryID,isnull(a.FSUBBILLNO,'') HSUBBILLNO,a.FSUBREQENTRYSEQ HSUBREQENTRYSEQ
                ,a.FMATERIALID HMaterID,a.FUNITID HUnitID,a.FQTY HQty,isnull(a.FSUPPLIERID,0) HSupID,'0' HDEPTID ,isnull(a.FPurOrderNo,'') HPOOrderBillNo,isnull(a.FPurOrderEntrySeq,0) HPOOrderSeq
                ,isnull(us1.FNAME,'') HMaker,a.FCREATEDATE HMakeDate,isnull(us2.FNAME,'') HChecker,a.FAPPROVEDATE HCheckDate,isnull(us3.FNAME,'') HUpDater,a.FMODIFYDATE HUpDateDate
                ,isnull(a.FSALEORDERNO,'') HSeOrderBillNo,isnull(a.FSALEORDERID,0) HSeOrderInterID,isnull(a.FSALEORDERENTRYID,0) HSeOrderEntryID,isnull(a.FSALEORDERENTRYSEQ,0) HSeOrderSEQ
                ,a.FSUBORGID HPRDORGID,a.FSUBORGID HENTRUSTORGID,isnull(a.FPARENTOWNERID,0) HPARENTOWNERID,isnull(a.FPARENTOWNERTYPEID,'') HPARENTOWNERTYPEID
                ,a.FID HERPInterID,'WWPPBOM' HERPBillType ,isnull(a.FSETTLEORGID,0) HSETTLEORGID,isnull(a.FREQSRC,'') HREQSRC
                from  T_SUB_PPBOM a with(nolock)
                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_ORG_Organizations oo on oo.FORGID=a.FSUBORGID
                where a.FID={id} 
";
                DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);

 zymes/OperationService/zymes_RealessWW_PPBomBill.cs

@@ -55,14 +55,14 @@
                string sql = string.Empty;
                sql = $@"
                /*dialect*/
                select a.FID HInterID,a.FEntryID,a.FMATERIALID,a.FUnitID,a.FNEEDQTY,a.FNEEDQTY,isnull(C.FStockID,0),isnull(pl.FMEMO,'')
                select a.FID HInterID,a.FEntryID HEntryID,a.FMATERIALID HMaterID,a.FUnitID HUnitID,a.FNEEDQTY HQty,a.FNEEDQTY HQtyMust,isnull(C.FStockID,0) HWHID,isnull(pl.FMEMO,'') HRemark
                ,a.FSUBREQID HSourceInterID,a.FSUBREQENTRYID HSourceEntryID,isnull(a.FSUBREQBILLNO,'') HSourceBillNo,'' HSourceBillType
                ,0 HICMOInterID,0 HICMOEntryID,'' HICMOBillNo
                ,isnull(C.FCHILDSUPPLYORGID,0),isnull(C.FSUPPLYORG,0),isnull(C.FGROUPBYOWNERID,0),isnull(C.FSRCTRANSORGID,0),isnull(C.FGROUPBYOWNERID,0),isnull(C.FOWNERID,0),isnull(C.FOWNERTYPEID,'')
                ,q.FSELPICKEDQTY-q.FSELPRCDRETURNQTY,q.FSELTRANSLATEQTY,isnull(a.FAUXPROPID,0),isnull(C.FLOT_TEXT,''),isnull(a.FMTONo,''),0,a.FID,a.FEntryID
                ,q.FSELPICKEDQTY-q.FSELPRCDRETURNQTY
                ,isnull(a.FPROCESSID,0),isnull(a.FBASEUNITID,0),isnull(a.FPROJECTNO,''),isnull(a.FOPERID,0),isnull(a.FSEQ,0)
                ,isnull(c.FSTOCKSTATUSID,0),isnull(c.FRESERVETYPE,'')
                ,isnull(C.FCHILDSUPPLYORGID,0) HCHILDSUPPLYORGID,isnull(C.FSUPPLYORG,0) HSUPPLYORGID,isnull(C.FGROUPBYOWNERID,0) HENTRUSTPICKORGID,isnull(C.FSRCTRANSORGID,0) HSRCTRANSORGID,isnull(C.FGROUPBYOWNERID,0) HGROUPBYOWNERID,isnull(C.FOWNERID,0) HOWNERID,isnull(C.FOWNERTYPEID,'') HOWNERTYPEID
                ,q.FSELPICKEDQTY-q.FSELPRCDRETURNQTY HRelationQty,q.FSELTRANSLATEQTY HMoveStockQty,isnull(a.FAUXPROPID,0) HAuxPropID,isnull(C.FLOT_TEXT,'') HBatchNO,isnull(a.FMTONo,'') HMTONo,0 HQtyScrap,a.FID HERPInterID,a.FEntryID HERPEntryID
                ,q.FSELPICKEDQTY-q.FSELPRCDRETURNQTY HBackRelationQty
                ,isnull(a.FPROCESSID,0) HPROCESSID,isnull(a.FBASEUNITID,0) HBASEUNITID,isnull(a.FPROJECTNO,'') HPROJECTNO,isnull(a.FOPERID,0) HOPERID,isnull(a.FSEQ,0) HSEQ
                ,isnull(c.FSTOCKSTATUSID,0) HSTOCKSTATUSID,isnull(c.FRESERVETYPE,'') HRESERVETYPE
                from T_SUB_PPBOMEntry a with(nolock)
                inner join T_SUB_PPBOMENTRY_C C with(nolock) on A.FENTRYID=C.FENTRYID
                inner join  T_SUB_PPBOMENTRY_Q Q with(nolock) on A.FENTRYID=Q.FENTRYID
@@ -73,13 +73,13 @@



                select a.FID HInterID,year(a.FCREATEDate),month(a.FCREATEDate),'1604','1604',a.FCREATEDate
                ,a.FbillNo,case when isnull(a.FAPPROVERID,0)=0 then 1 else 2 end HBillStatus,a.FSUBREQID,a.FSUBREQENTRYID,isnull(a.FSUBBILLNO,''),a.FSUBREQENTRYSEQ
                ,a.FMATERIALID,a.FUNITID,a.FQTY,isnull(a.FSUPPLIERID,0),0 HDEPTID
                ,isnull(us1.FNAME,''),a.FCREATEDATE,isnull(us2.FNAME,''),a.FAPPROVEDATE,isnull(us3.FNAME,''),a.FMODIFYDATE
                ,isnull(a.FSALEORDERNO,''),isnull(a.FSALEORDERID,0),isnull(a.FSALEORDERENTRYID,0),isnull(a.FSALEORDERENTRYSEQ,0)
                ,a.FSUBORGID,a.FSUBORGID,isnull(a.FPARENTOWNERID,0),isnull(a.FPARENTOWNERTYPEID,'')
                ,a.FID,'WWPPBOM' HERPBillType,isnull(a.FSETTLEORGID,0),isnull(a.FREQSRC,'')
                select a.FID HInterID,year(a.FCREATEDate) HYear,month(a.FCREATEDate) HPeriod,'1604' HBillType,'1604' HBillSubType,a.FCREATEDate HDate
                ,a.FbillNo HBillNo,case when isnull(a.FAPPROVERID,0)=0 then 1 else 2 end HBillStatus,a.FSUBREQID HICMOInterID,a.FSUBREQENTRYID HICMOEntryID,isnull(a.FSUBBILLNO,'') HSUBBILLNO,a.FSUBREQENTRYSEQ HSUBREQENTRYSEQ
                ,a.FMATERIALID HMaterID,a.FUNITID HUnitID,a.FQTY HQty,isnull(a.FSUPPLIERID,0) HSupID,'0' HDEPTID ,isnull(a.FPurOrderNo,'') HPOOrderBillNo,isnull(a.FPurOrderEntrySeq,0) HPOOrderSeq
                ,isnull(us1.FNAME,'') HMaker,a.FCREATEDATE HMakeDate,isnull(us2.FNAME,'') HChecker,a.FAPPROVEDATE HCheckDate,isnull(us3.FNAME,'') HUpDater,a.FMODIFYDATE HUpDateDate
                ,isnull(a.FSALEORDERNO,'') HSeOrderBillNo,isnull(a.FSALEORDERID,0) HSeOrderInterID,isnull(a.FSALEORDERENTRYID,0) HSeOrderEntryID,isnull(a.FSALEORDERENTRYSEQ,0) HSeOrderSEQ
                ,a.FSUBORGID HPRDORGID,a.FSUBORGID HENTRUSTORGID,isnull(a.FPARENTOWNERID,0) HPARENTOWNERID,isnull(a.FPARENTOWNERTYPEID,'') HPARENTOWNERTYPEID
                ,a.FID HERPInterID,'WWPPBOM' HERPBillType ,isnull(a.FSETTLEORGID,0) HSETTLEORGID,isnull(a.FREQSRC,'') HREQSRC
                from  T_SUB_PPBOM a with(nolock)
                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

			@@ -82,14 +82,14 @@
			left join T_ORG_Organizations oo on oo.FORGID=a.FSUBORGID
			where a.FID={id}

			select a.FID HInterID,a.FEntryID,a.FMATERIALID,a.FUnitID,a.FNEEDQTY,a.FNEEDQTY,isnull(C.FStockID,0),isnull(pl.FMEMO,'')
			select a.FID HInterID,a.FEntryID HEntryID,a.FMATERIALID HMaterID,a.FUnitID HUnitID,a.FNEEDQTY HQty,a.FNEEDQTY HQtyMust,isnull(C.FStockID,0) HWHID,isnull(pl.FMEMO,'') HRemark
			,a.FSUBREQID HSourceInterID,a.FSUBREQENTRYID HSourceEntryID,isnull(a.FSUBREQBILLNO,'') HSourceBillNo,'' HSourceBillType
			,0 HICMOInterID,0 HICMOEntryID,'' HICMOBillNo
			,isnull(C.FCHILDSUPPLYORGID,0),isnull(C.FSUPPLYORG,0),isnull(C.FGROUPBYOWNERID,0),isnull(C.FSRCTRANSORGID,0),isnull(C.FGROUPBYOWNERID,0),isnull(C.FOWNERID,0),isnull(C.FOWNERTYPEID,'')
			,q.FSELPICKEDQTY-q.FSELPRCDRETURNQTY,q.FSELTRANSLATEQTY,isnull(a.FAUXPROPID,0),isnull(C.FLOT_TEXT,''),isnull(a.FMTONo,''),0,a.FID,a.FEntryID
			,q.FSELPICKEDQTY-q.FSELPRCDRETURNQTY
			,isnull(a.FPROCESSID,0),isnull(a.FBASEUNITID,0),isnull(a.FPROJECTNO,''),isnull(a.FOPERID,0),isnull(a.FSEQ,0)
			,isnull(c.FSTOCKSTATUSID,0),isnull(c.FRESERVETYPE,'')
			,isnull(C.FCHILDSUPPLYORGID,0) HCHILDSUPPLYORGID,isnull(C.FSUPPLYORG,0) HSUPPLYORGID,isnull(C.FGROUPBYOWNERID,0) HENTRUSTPICKORGID,isnull(C.FSRCTRANSORGID,0) HSRCTRANSORGID,isnull(C.FGROUPBYOWNERID,0) HGROUPBYOWNERID,isnull(C.FOWNERID,0) HOWNERID,isnull(C.FOWNERTYPEID,'') HOWNERTYPEID
			,q.FSELPICKEDQTY-q.FSELPRCDRETURNQTY HRelationQty,q.FSELTRANSLATEQTY HMoveStockQty,isnull(a.FAUXPROPID,0) HAuxPropID,isnull(C.FLOT_TEXT,'') HBatchNO,isnull(a.FMTONo,'') HMTONo,0 HQtyScrap,a.FID HERPInterID,a.FEntryID HERPEntryID
			,q.FSELPICKEDQTY-q.FSELPRCDRETURNQTY HBackRelationQty
			,isnull(a.FPROCESSID,0) HPROCESSID,isnull(a.FBASEUNITID,0) HBASEUNITID,isnull(a.FPROJECTNO,'') HPROJECTNO,isnull(a.FOPERID,0) HOPERID,isnull(a.FSEQ,0) HSEQ
			,isnull(c.FSTOCKSTATUSID,0) HSTOCKSTATUSID,isnull(c.FRESERVETYPE,'') HRESERVETYPE
			from T_SUB_PPBOMEntry a with(nolock)
			inner join T_SUB_PPBOMENTRY_C C with(nolock) on A.FENTRYID=C.FENTRYID
			inner join T_SUB_PPBOMENTRY_Q Q with(nolock) on A.FENTRYID=Q.FENTRYID
			@@ -100,17 +100,18 @@



			select a.FID HInterID,year(a.FCREATEDate),month(a.FCREATEDate),'1604','1604',a.FCREATEDate
			,a.FbillNo,case when isnull(a.FAPPROVERID,0)=0 then 1 else 2 end HBillStatus,a.FSUBREQID,a.FSUBREQENTRYID,isnull(a.FSUBBILLNO,''),a.FSUBREQENTRYSEQ
			,a.FMATERIALID,a.FUNITID,a.FQTY,isnull(a.FSUPPLIERID,0),0 HDEPTID
			,isnull(us1.FNAME,''),a.FCREATEDATE,isnull(us2.FNAME,''),a.FAPPROVEDATE,isnull(us3.FNAME,''),a.FMODIFYDATE
			,isnull(a.FSALEORDERNO,''),isnull(a.FSALEORDERID,0),isnull(a.FSALEORDERENTRYID,0),isnull(a.FSALEORDERENTRYSEQ,0)
			,a.FSUBORGID,a.FSUBORGID,isnull(a.FPARENTOWNERID,0),isnull(a.FPARENTOWNERTYPEID,'')
			,a.FID,'WWPPBOM' HERPBillType,isnull(a.FSETTLEORGID,0),isnull(a.FREQSRC,'')
			select a.FID HInterID,year(a.FCREATEDate) HYear,month(a.FCREATEDate) HPeriod,'1604' HBillType,'1604' HBillSubType,a.FCREATEDate HDate
			,a.FbillNo HBillNo,case when isnull(a.FAPPROVERID,0)=0 then 1 else 2 end HBillStatus,a.FSUBREQID HICMOInterID,a.FSUBREQENTRYID HICMOEntryID,isnull(a.FSUBBILLNO,'') HSUBBILLNO,a.FSUBREQENTRYSEQ HSUBREQENTRYSEQ
			,a.FMATERIALID HMaterID,a.FUNITID HUnitID,a.FQTY HQty,isnull(a.FSUPPLIERID,0) HSupID,'0' HDEPTID ,isnull(a.FPurOrderNo,'') HPOOrderBillNo,isnull(a.FPurOrderEntrySeq,0) HPOOrderSeq
			,isnull(us1.FNAME,'') HMaker,a.FCREATEDATE HMakeDate,isnull(us2.FNAME,'') HChecker,a.FAPPROVEDATE HCheckDate,isnull(us3.FNAME,'') HUpDater,a.FMODIFYDATE HUpDateDate
			,isnull(a.FSALEORDERNO,'') HSeOrderBillNo,isnull(a.FSALEORDERID,0) HSeOrderInterID,isnull(a.FSALEORDERENTRYID,0) HSeOrderEntryID,isnull(a.FSALEORDERENTRYSEQ,0) HSeOrderSEQ
			,a.FSUBORGID HPRDORGID,a.FSUBORGID HENTRUSTORGID,isnull(a.FPARENTOWNERID,0) HPARENTOWNERID,isnull(a.FPARENTOWNERTYPEID,'') HPARENTOWNERTYPEID
			,a.FID HERPInterID,'WWPPBOM' HERPBillType ,isnull(a.FSETTLEORGID,0) HSETTLEORGID,isnull(a.FREQSRC,'') HREQSRC
			from T_SUB_PPBOM a with(nolock)
			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_ORG_Organizations oo on oo.FORGID=a.FSUBORGID
			where a.FID={id}
			";
			DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);

			@@ -55,14 +55,14 @@
			string sql = string.Empty;
			sql = $@"
			/dialect/
			select a.FID HInterID,a.FEntryID,a.FMATERIALID,a.FUnitID,a.FNEEDQTY,a.FNEEDQTY,isnull(C.FStockID,0),isnull(pl.FMEMO,'')
			select a.FID HInterID,a.FEntryID HEntryID,a.FMATERIALID HMaterID,a.FUnitID HUnitID,a.FNEEDQTY HQty,a.FNEEDQTY HQtyMust,isnull(C.FStockID,0) HWHID,isnull(pl.FMEMO,'') HRemark
			,a.FSUBREQID HSourceInterID,a.FSUBREQENTRYID HSourceEntryID,isnull(a.FSUBREQBILLNO,'') HSourceBillNo,'' HSourceBillType
			,0 HICMOInterID,0 HICMOEntryID,'' HICMOBillNo
			,isnull(C.FCHILDSUPPLYORGID,0),isnull(C.FSUPPLYORG,0),isnull(C.FGROUPBYOWNERID,0),isnull(C.FSRCTRANSORGID,0),isnull(C.FGROUPBYOWNERID,0),isnull(C.FOWNERID,0),isnull(C.FOWNERTYPEID,'')
			,q.FSELPICKEDQTY-q.FSELPRCDRETURNQTY,q.FSELTRANSLATEQTY,isnull(a.FAUXPROPID,0),isnull(C.FLOT_TEXT,''),isnull(a.FMTONo,''),0,a.FID,a.FEntryID
			,q.FSELPICKEDQTY-q.FSELPRCDRETURNQTY
			,isnull(a.FPROCESSID,0),isnull(a.FBASEUNITID,0),isnull(a.FPROJECTNO,''),isnull(a.FOPERID,0),isnull(a.FSEQ,0)
			,isnull(c.FSTOCKSTATUSID,0),isnull(c.FRESERVETYPE,'')
			,isnull(C.FCHILDSUPPLYORGID,0) HCHILDSUPPLYORGID,isnull(C.FSUPPLYORG,0) HSUPPLYORGID,isnull(C.FGROUPBYOWNERID,0) HENTRUSTPICKORGID,isnull(C.FSRCTRANSORGID,0) HSRCTRANSORGID,isnull(C.FGROUPBYOWNERID,0) HGROUPBYOWNERID,isnull(C.FOWNERID,0) HOWNERID,isnull(C.FOWNERTYPEID,'') HOWNERTYPEID
			,q.FSELPICKEDQTY-q.FSELPRCDRETURNQTY HRelationQty,q.FSELTRANSLATEQTY HMoveStockQty,isnull(a.FAUXPROPID,0) HAuxPropID,isnull(C.FLOT_TEXT,'') HBatchNO,isnull(a.FMTONo,'') HMTONo,0 HQtyScrap,a.FID HERPInterID,a.FEntryID HERPEntryID
			,q.FSELPICKEDQTY-q.FSELPRCDRETURNQTY HBackRelationQty
			,isnull(a.FPROCESSID,0) HPROCESSID,isnull(a.FBASEUNITID,0) HBASEUNITID,isnull(a.FPROJECTNO,'') HPROJECTNO,isnull(a.FOPERID,0) HOPERID,isnull(a.FSEQ,0) HSEQ
			,isnull(c.FSTOCKSTATUSID,0) HSTOCKSTATUSID,isnull(c.FRESERVETYPE,'') HRESERVETYPE
			from T_SUB_PPBOMEntry a with(nolock)
			inner join T_SUB_PPBOMENTRY_C C with(nolock) on A.FENTRYID=C.FENTRYID
			inner join T_SUB_PPBOMENTRY_Q Q with(nolock) on A.FENTRYID=Q.FENTRYID
			@@ -73,13 +73,13 @@



			select a.FID HInterID,year(a.FCREATEDate),month(a.FCREATEDate),'1604','1604',a.FCREATEDate
			,a.FbillNo,case when isnull(a.FAPPROVERID,0)=0 then 1 else 2 end HBillStatus,a.FSUBREQID,a.FSUBREQENTRYID,isnull(a.FSUBBILLNO,''),a.FSUBREQENTRYSEQ
			,a.FMATERIALID,a.FUNITID,a.FQTY,isnull(a.FSUPPLIERID,0),0 HDEPTID
			,isnull(us1.FNAME,''),a.FCREATEDATE,isnull(us2.FNAME,''),a.FAPPROVEDATE,isnull(us3.FNAME,''),a.FMODIFYDATE
			,isnull(a.FSALEORDERNO,''),isnull(a.FSALEORDERID,0),isnull(a.FSALEORDERENTRYID,0),isnull(a.FSALEORDERENTRYSEQ,0)
			,a.FSUBORGID,a.FSUBORGID,isnull(a.FPARENTOWNERID,0),isnull(a.FPARENTOWNERTYPEID,'')
			,a.FID,'WWPPBOM' HERPBillType,isnull(a.FSETTLEORGID,0),isnull(a.FREQSRC,'')
			select a.FID HInterID,year(a.FCREATEDate) HYear,month(a.FCREATEDate) HPeriod,'1604' HBillType,'1604' HBillSubType,a.FCREATEDate HDate
			,a.FbillNo HBillNo,case when isnull(a.FAPPROVERID,0)=0 then 1 else 2 end HBillStatus,a.FSUBREQID HICMOInterID,a.FSUBREQENTRYID HICMOEntryID,isnull(a.FSUBBILLNO,'') HSUBBILLNO,a.FSUBREQENTRYSEQ HSUBREQENTRYSEQ
			,a.FMATERIALID HMaterID,a.FUNITID HUnitID,a.FQTY HQty,isnull(a.FSUPPLIERID,0) HSupID,'0' HDEPTID ,isnull(a.FPurOrderNo,'') HPOOrderBillNo,isnull(a.FPurOrderEntrySeq,0) HPOOrderSeq
			,isnull(us1.FNAME,'') HMaker,a.FCREATEDATE HMakeDate,isnull(us2.FNAME,'') HChecker,a.FAPPROVEDATE HCheckDate,isnull(us3.FNAME,'') HUpDater,a.FMODIFYDATE HUpDateDate
			,isnull(a.FSALEORDERNO,'') HSeOrderBillNo,isnull(a.FSALEORDERID,0) HSeOrderInterID,isnull(a.FSALEORDERENTRYID,0) HSeOrderEntryID,isnull(a.FSALEORDERENTRYSEQ,0) HSeOrderSEQ
			,a.FSUBORGID HPRDORGID,a.FSUBORGID HENTRUSTORGID,isnull(a.FPARENTOWNERID,0) HPARENTOWNERID,isnull(a.FPARENTOWNERTYPEID,'') HPARENTOWNERTYPEID
			,a.FID HERPInterID,'WWPPBOM' HERPBillType ,isnull(a.FSETTLEORGID,0) HSETTLEORGID,isnull(a.FREQSRC,'') HREQSRC
			from T_SUB_PPBOM a with(nolock)
			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