Develop/GZ_KD_Parino
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://8.130.121.29:3000/Develop/GZ_KD_Parino

Browse Source
This commit is contained in:
余宇波 2025-08-02 18:43:33 +08:00
commit 152b005a4d
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
GZ_KD_Parino/Sal_Order/Save.cs
View File

@ -51,10 +51,11 @@ namespace GZ_KD_Parino.Sal_Order
foreach (var rows in e.SelectedRows) foreach (var rows in e.SelectedRows)
{ {
var Billobj = rows.DataEntity; var Billobj = rows.DataEntity;
//更新纸质合同号 // 更新纸质合同号
var result = SqlManage.UpdateFlexNumber(this.Context, Convert.ToString(Billobj["Id"])); var result = SqlManage.UpdateFlexNumber(this.Context, Convert.ToString(Billobj["Id"]));
//获取商机名称 // 获取商机名称
var F_BON = Billobj["F_BON"] as DynamicObject; var F_BON = Billobj["F_BON"] as DynamicObject;
//
//获取销售组织 //获取销售组织
var SalZZFid = Billobj["SaleOrgId_Id"].ToString(); var SalZZFid = Billobj["SaleOrgId_Id"].ToString();

24
GZ_KD_Parino/Services/SaleOrderService.cs
View File

@ -28,23 +28,41 @@ namespace GZ_KD_Parino.Services
/// <returns></returns> /// <returns></returns>
public DynamicObject GetHistoryOrder(string orgId, string custId, string bonId, string materialId, DateTime createDate) public DynamicObject GetHistoryOrder(string orgId, string custId, string bonId, string materialId, DateTime createDate)
{ {
var sql = $@"/*dialect*/SELECT var sql = $@"/*dialect*/WITH
SJname AS (
SELECT
t1_l.FNAME
FROM
T_BAS_PREBDTHREE t1
INNER JOIN T_BAS_PREBDTHREE_L t1_l ON t1.FID = t1_l.FID
AND t1_l.FLocaleID = 2052
WHERE
t1.FID = '{bonId}'
)
SELECT
TOP 1 t1e_f.* TOP 1 t1e_f.*
FROM FROM
T_SAL_ORDER t1 T_SAL_ORDER t1
INNER JOIN T_SAL_ORDERENTRY t1e ON t1.FID = t1e.FID INNER JOIN T_SAL_ORDERENTRY t1e ON t1.FID = t1e.FID
INNER JOIN T_SAL_ORDERENTRY_F t1e_f ON t1e.FENTRYID = t1e_f.FENTRYID INNER JOIN T_SAL_ORDERENTRY_F t1e_f ON t1e.FENTRYID = t1e_f.FENTRYID
INNER JOIN T_BAS_PREBDONE_L t2_L ON t1.F_PROJECTNAME = t2_L.FID
AND t2_L.FLocaleID = 2052
WHERE WHERE
1 = 1 1 = 1
AND t1.FDOCUMENTSTATUS = 'C' -- 已审核 AND t1.FDOCUMENTSTATUS = 'C' -- 已审核
AND t1.FCANCELSTATUS = 'A' -- 未作废 AND t1.FCANCELSTATUS = 'A' -- 未作废
AND t2_L.FNAME IN (
SELECT
FNAME
FROM
SJname
)
AND t1.FAPPROVEDATE < '{createDate.ToString("yyyy-MM-dd HH:mm:ss")}' AND t1.FAPPROVEDATE < '{createDate.ToString("yyyy-MM-dd HH:mm:ss")}'
AND t1.FSALEORGID = '{orgId}' AND t1.FSALEORGID = '{orgId}'
AND t1.FCUSTID = '{custId}' AND t1.FCUSTID = '{custId}'
AND t1.F_BON = '{bonId}'
AND t1e.FMATERIALID = '{materialId}' AND t1e.FMATERIALID = '{materialId}'
ORDER BY ORDER BY
t1.FCREATEDATE DESC t1.FDATE DESC
"; ";
var result = DBServiceHelper.ExecuteDynamicObject(this.ctx, sql); var result = DBServiceHelper.ExecuteDynamicObject(this.ctx, sql);
if (result.Count == 0) if (result.Count == 0)