From 876602afd2ed18f139f331c55a1cbf868e606b7b Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期日, 19 十月 2025 12:59:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/simoer_jiekou
---
zymes/OperationService/zymes_RealessSalOrder.cs | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/zymes/OperationService/zymes_RealessSalOrder.cs b/zymes/OperationService/zymes_RealessSalOrder.cs
index 65798e2..4717b56 100644
--- a/zymes/OperationService/zymes_RealessSalOrder.cs
+++ b/zymes/OperationService/zymes_RealessSalOrder.cs
@@ -45,11 +45,9 @@
base.AfterExecuteOperationTransaction(e);
Entity entity = this.BusinessInfo.GetEntity("FEntity");//鑾峰彇鏄庣粏淇℃伅
foreach (var billObj in e.DataEntitys)
- {
- var forgName = Context.CurrentOrganizationInfo.Name;
- //if (!forgName.Contains("鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�"))
- // continue;
+ {
var id = billObj["Id"].ToString();
+ LogService.Write("閿�鍞鍗曞悓姝d锛�" + id);
string sql = string.Empty;
sql = $@"
/*dialect*/
@@ -81,15 +79,28 @@
left join T_SAL_ORDERFIN fin with(nolock) on a.FID=fin.FID
left join T_SAL_ORDERENTRY_LK LK with(nolock) on a.FENTRYID=LK.FENTRYID
Where a.FID={id}
- select a.FID as HInterID, 1204 as HBillType, 1204 as HBillSubType, a.FBILLNO as HBillNo
- , 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
- , 0 as HDeptID, 'CLOUD瀵煎叆' as HExplanation, a.FBILLNO as HInnerBillNo, 0 as HRedBlueFlag
- from T_PRD_PICKMTRL a with(nolock)
- inner join T_ORG_Organizations o with (nolock) on a.FSTOCKORGID = o.FORGID
- Where FID={id}
- ";
+ select
+ a.FID as HInterID,year(a.FDate) as HYear,month(a.FDate) as HPeriod,'1401' as HBillType,'1401' as HBillSubType,a.FDate as HDate,
+ a.FbillNo as HBillNo,
+ case when isnull(a.FAPPROVERID,0)=0 then 1 else 2 end as HBillStatus,a.FRECEIVEADDRESS as HAddress,0 as HSSID,
+ a.FDATE as HSSDate,a.FCUSTID as HCusID,0 as HCurID,0 as HExRate,a.FSALERID as HEmpID,0 as HManagerID,
+ isnull(a.FSALEDEPTID,0) as HDeptID,'CLOUD瀵煎叆' as HExplanation,a.FNOTE as HRemark,'' as HInnerBillNo
+ ,isnull(us1.FNAME,'') as HMaker,a.FCREATEDATE as HMakeDate,isnull(us2.FNAME,'') as HChecker,a.FAPPROVEDATE as HCheckDate,
+ isnull(us5.FNAME,'') as HCloseMan,a.FCLOSEDATE as HCloseDate,
+ case when a.FCLOSESTATUS='A' then 'false' else 'true' end as HCloseType,
+ a.FID as HERPInterID,a.FBILLTYPEID as HERPBillType,a.FSALEORGID as HSALEORGID,a.FSALEGROUPID as HSALEGROUPID,
+ a.FRECEIVEID as HRECEIVEID,a.FSETTLEID as HSETTLEID,a.FCHARGEID as HCHARGEID,
+ a.FHEADLOCID as HHEADLOCID,a.FRECCONTACTID as HRECCONTACTID,
+ isnull(a.FCORRESPONDORGID,0) as HCORRESPONDORGID,a.FBUSINESSTYPE as HBUSINESSTYPE,o.FNUMBER HOrganNumber
+ from T_SAL_ORDER 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_SEC_user us4 with(nolock) on a.FCANCELLERID=us4.FUSERID
+ left join T_SEC_user us5 with(nolock) on a.FCLOSERID=us5.FUSERID
+ left join T_ORG_Organizations o with (nolock) on a.FSALEORGID = o.FORGID
+ where FID={id}
+ ";
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
DataTable maindt = ds.Tables[1];
DataTable subdt = ds.Tables[0];
--
Gitblit v1.9.1