From 7a2dbe48bb455bee6777e605ff6edebbe8212489 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 13 七月 2023 17:27:05 +0800
Subject: [PATCH] 发货通知单 完善同步字段
---
zymes/OperationService/zymes_RealessSalSeOutStock.cs | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/zymes/OperationService/zymes_RealessSalSeOutStock.cs b/zymes/OperationService/zymes_RealessSalSeOutStock.cs
index b0efe2e..b370b02 100644
--- a/zymes/OperationService/zymes_RealessSalSeOutStock.cs
+++ b/zymes/OperationService/zymes_RealessSalSeOutStock.cs
@@ -53,39 +53,43 @@
string sql = string.Empty;
sql = $@"
/*dialect*/
-select a.FID HInterID, a.FENTRYID HEntryID, a.FMATERIALID HMaterID, a.FUNITID HUnitID,
-a.FQTY HQty, isnull(f.FPRICE,0) HPrice, isnull(f.FAMOUNT,0) HMoney, 0 HWHID, 0 HSPID,
-a.FNOTE HRemark, 0 HSourceInterID, 0 HSourceEntryID, '' HSourceBillNo, '' HSourceBillType,
-0 HSeOrderInterID, 0 HSeOrderEntryID, '' HSeOrderBillNo, e.FOWNERID HOWNERID, e.FOWNERTYPEID HOWNERTYPEID,
-fin.FSETTLEORGID HSETTLEORGID, a.FSUMOUTQTY HMoveStockQty, a.FJOINOUTQTY HRelationQty, a.FAUXPROPID HAuxPropID,
-'' HBatchNO, a.FMTONO HMTONo, a.FID HERPInterID, a.FEntryID HERPEntryID, a.FCUSTMATID HCUSTMATID,
-a.FBASEUNITID HBASEUNITID, a.FBFLOWID HBFLOWID, a.FOUTCONTROL HOUTCONTROL, 0 HSTOCKUNITID,
-e.FROWID HROWTYPE, e.FROWID HROWID, e.FPARENTROWID HPARENTROWID, isnull(e.FPARENTMATID,0) HPARENTMATID,
+select a.FID HInterID, a.FENTRYID HEntryID, a.FMATERIALID HMaterID, a.FUnitID HUnitID,
+a.FQTY HQty, isnull(f.FPRICE,0) HPrice, 0 HMoney,isnull(a.FSHIPMENTSTOCKID,0) HWHID, isnull(a.FSHIPMENTSTOCKLOCID,0) HSPID,
+a.FNOTE HRemark,isnull(L.FSBILLID,0) HSourceInterID, isnull(L.FSID,0) HSourceEntryID,a.FSRCBILLNO HSourceBillNo,a.FSRCTYPE HSourceBillType,
+0 HSeOrderInterID,e.FSOENTRYID HSeOrderEntryID,a.FORDERNO HSeOrderBillNo, e.FOWNERID HOWNERID, e.FOWNERTYPEID HOWNERTYPEID,
+isnull(fin.FSETTLEORGID,0) HSETTLEORGID, e.FSTOCKBASETRANSQTY HMoveStockQty,e.FSTOCKBASEJOINOUTQTY HRelationQty, a.FAUXPROPID HAuxPropID,
+a.FLot_TEXT HBatchNO,isnull(a.FMTONo,'') HMTONo, a.FID HERPInterID, a.FEntryID HERPEntryID, a.FCUSTMATID HCUSTMATID,
+a.FBASEUNITID HBASEUNITID, a.FBFLOWID HBFLOWID, a.FOUTCONTROL HOUTCONTROL,e.FSTOCKUNITID HSTOCKUNITID,
+e.FROWTYPE HROWTYPE, e.FROWID HROWID, e.FPARENTROWID HPARENTROWID, isnull(e.FPARENTMATID,0) HPARENTMATID,
isnull(f.FTAXCOMBINATION,0) HTAXCOMBINATION, isnull(f.FPRICECOEFFICIENT,0) HPRICECOEFFICIENT, isnull(f.FSYSPRICE,0) HSYSPRICE,
isnull(f.FLIMITDOWNPRICE,0) HLIMITDOWNPRICE, isnull(f.FPRICEUNITID,0) HPRICEUNITID, isnull(f.FTAXPRICE,0) HTAXPRICE,
isnull(f.FTAXRATE,0) HTAXRATE, isnull(f.FTAXNETPRICE,0) HTAXNETPRICE, isnull(f.FDISCOUNTRATE,0) HDISCOUNTRATE,
isnull(f.FISFREE,0) HISFREE, isnull(fin.FLOCALCURRID,0) HLOCALCURRID, isnull(fin.FSETTLECURRID,0) HSETTLECURRID,
isnull(fin.FEXCHANGETYPEID,0) HEXCHANGETYPEID, isnull(fin.FSETTLETYPEID,0) HSETTLETYPEID, isnull(fin.FRECEIPTCONDITIONID,0) HRECEIPTCONDITIONID,
isnull(fin.FEXCHANGERATE,0) HEXCHANGERATE, isnull(fin.FISINCLUDEDTAX,0) HISINCLUDEDTAX, isnull(fin.FISPRICEEXCLUDETAX,0) HISPRICEEXCLUDETAX,
-isnull(tax.FTAXRATEID,0) HTAXRATEID, 0 HTaxRate_TAX, isnull(tax.FCOSTPERCENT,0) HCOSTPERCENT, isnull(tax.FVAT,0) HVAT,
+isnull(tax.FTAXRATEID,0) HTAXRATEID, isnull(tax.FTAXRATE,0) HTaxRate_TAX, isnull(tax.FCOSTPERCENT,0) HCOSTPERCENT, isnull(tax.FVAT,0) HVAT,
isnull(tax.FSELLERWITHHOLDING,0) HSELLERWITHHOLDING, isnull(tax.FBUYERWITHHOLDING,0) HBUYERWITHHOLDING
from T_SAL_DELIVERYNOTICEENTRY a with(nolock)
left join T_SAL_DELIVERYNOTICEENTRY_F f with(nolock) on a.FENTRYID = f.FENTRYID
left join T_SAL_DELIVERYNOTICEENTRY_E e with(nolock) on a.FENTRYID = e.FENTRYID
-left join T_SAL_DELIVERYNOTICEFIN fin with(nolock) on a.FENTRYID = fin.FENTRYID
+left join T_SAL_DELIVERYNOTICEFIN fin with(nolock) on a.FID = fin.FID
+left join T_SAL_DELIVERYNOTICEENTRY_LK L with(nolock) on a.FENTRYID=L.FENTRYID
left join T_SAL_DELIVERYNOTICEENTRYTAX tax with(nolock) on a.FENTRYID = tax.FENTRYID
Where a.FID={id}
select FID as HInterID, YEAR(FDATE) as HYear, MONTH(FDATE) as HPeriod, '1402' HBillType, '1402' HBillSubType,
-FDATE as HDate, FBILLNO as HBillNo, case when FAPPROVERID=0 then 1 else 2 end HBillStatus, FCUSTOMERID as HCusID,
-0 HManagerID, FSALEDEPTID as HDeptID, 'CLOUD瀵煎叆' as HRemark, FRECEIVEADDRESS as HAddress, 0 HSSID, 0 HCurID,
-0 HWHID, 0 HExRate, 0 HEmpID, 'CLOUD瀵煎叆' as HExplanation, FBILLNO as HInnerBillNo, FSALEORGID as HSALEORGID,
+FDATE as HDate, FBILLNO as HBillNo,case when isnull(a.FAPPROVERID,0)=0 then 1 else 2 end HBillStatus, FCUSTOMERID as HCusID,
+a.FSTOCKERID HManagerID, isnull(a.FDELIVERYDEPTID,0) as HDeptID,a.FNOTE as HRemark, FRECEIVEADDRESS as HAddress, 0 HSSID, 0 HCurID,
+0 HWHID, 1 HExRate,a.FSALESMANID HEmpID, '' as HExplanation, '' as HInnerBillNo, a.FSALEORGID as HSALEORGID,
FDELIVERYORGID as HDELIVERYORGID, FOWNERID as HOWNERID, FOWNERTYPEID as HOWNERTYPEID, FID as HERPInterID,
-FBILLTYPEID as HERPBillType, FCREATORID as HMaker, FCREATEDATE as HMakeDate, FAPPROVERID as HChecker,
-FAPPROVEDATE as HCheckDate, FCLOSERID as HCloseMan, FCLOSEDATE as HCloseDate, FSTOCKERGROUPID as HSTOCKERGROUPID,
+FBILLTYPEID as HERPBillType,isnull(us1.FNAME,'') as HMaker, a.FCREATEDATE as HMakeDate, isnull(us2.FNAME,'') as HChecker,
+a.FAPPROVEDATE as HCheckDate, isnull(us3.FNAME,'') as HCloseMan, FCLOSEDATE as HCloseDate, FSTOCKERGROUPID as HSTOCKERGROUPID,
FSALEGROUPID as HSALEGROUPID, FSALEDEPTID as HSALEDEPTID, FBUSINESSTYPE as HBUSINESSTYPE, FCARRIERID as HCARRIERID,
FRECEIVERID as HRECEIVERID, FSETTLEID as HSETTLEID, FPAYERID as HPAYERID,FHEADLOCID as HHEADLOCID, FRECCONTACTID as HRECCONTACTID,
-FRECEIPTCONDITIONID as HRECEIPTCONDITIONID, FCORRESPONDORGID as HCORRESPONDORGID, FCARRIAGENO as HCARRIAGENO
-from T_SAL_DELIVERYNOTICE with(nolock)
+FRECEIPTCONDITIONID as HRECEIPTCONDITIONID, isnull(a.FCORRESPONDORGID,0) as HCORRESPONDORGID, FCARRIAGENO as HCARRIAGENO
+from T_SAL_DELIVERYNOTICE 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.FCLOSERID=us3.FUSERID
Where FID={id}
";
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
--
Gitblit v1.9.1