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

Merge branch 'main' of http://8.130.121.29:3000/TianHua/Piolot_Order_TH

Browse Source 
# Conflicts:
#	GZ_LTHPilot_ORDER.csproj
#	SAL_DELIVERYNOTICE/PushCeLue.cs
#	SAL_ORDER/SaveWL.cs
#	SQL/SqlManage.cs
#	bin/Debug/GZ_LTHPilot_ORDER.dll
#	bin/Debug/GZ_LTHPilot_ORDER.pdb
This commit is contained in:
李狗蛋
2025-07-04 18:01:07 +08:00
parent 95a74dc4f5 569ca39775
commit 38fe912549
5 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
SQL/SqlManage.cs
View File

@@ -338,11 +338,19 @@ namespace GZ_LTHPilot_ORDER.SqlManage
return DBServiceHelper.ExecuteDynamicObject(ctx, getSql.ToString(), null, null, CommandType.Text, null);
}
//根据获取的销售订单FID和FentryId，更新开票数量和开票金额
<<<<<<< HEAD
public static void UpSal_OrderKPJEAndKPSL(Context ctx, string FID, string FENTRYID, string KPZZ,string F_INVOICEQTY, string F_F_INVOICEAMOUNT)
{
string sql = string.Format(@"/*dialect*/
EXEC TrueUpdateSal_OrderF_INVOICEQTYAndF_F_INVOICEAMOUNTAndF_invoiceAmount_TH '{0}','{1}','{2}','{3}','{4}'
", FID, FENTRYID, KPZZ, F_INVOICEQTY, F_F_INVOICEAMOUNT);
=======
public static void UpSal_OrderKPJEAndKPSL(Context ctx, string FID, string FENTRYID, string F_INVOICEQTY, string F_F_INVOICEAMOUNT)
{
string sql = string.Format(@"/*dialect*/
EXEC TrueUpdateSal_OrderF_INVOICEQTYAndF_F_INVOICEAMOUNTAndF_invoiceAmount_TH '{0}','{1}','{2}','{3}'
", FID, FENTRYID, F_INVOICEQTY, F_F_INVOICEAMOUNT);
>>>>>>> 569ca39775cea8d77f2c873e1bc5556b7aa583c2
DBServiceHelper.ExecuteDynamicObject(ctx, sql.ToString(), null, null, CommandType.Text, null);
}
//根据获取的销售订单FID和FentryId，更新开票数量和开票金额(当销售订单的累计核销金额>价税合计本位币后)
@@ -402,6 +410,7 @@ namespace GZ_LTHPilot_ORDER.SqlManage
return DBServiceHelper.ExecuteDynamicObject(ctx, getSql.ToString(), null, null, CommandType.Text, null);
}
<<<<<<< HEAD
//根据项目预算利润表FID，更新财务信息字段
public static void GZTH_XMYSBSave(Context ctx,string FID)
{
@@ -411,5 +420,7 @@ namespace GZ_LTHPilot_ORDER.SqlManage
DBServiceHelper.ExecuteDynamicObject(ctx, sql.ToString(), null, null, CommandType.Text, null);
}
=======
>>>>>>> 569ca39775cea8d77f2c873e1bc5556b7aa583c2
}
}