From 099c199d96f2d92dfcda50e763528a3d161fd5cf Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 15 九月 2025 08:45:34 +0800
Subject: [PATCH] 设计人员查询的时候，也过滤设计提成里边的设计人员 增加结算状态。 批量结算按钮完成
---
CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs
index 07e8583..6fd403e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs
@@ -207,8 +207,12 @@
oA_Fukuanshenqing.SupplierId = this.selSuppliersss.Value;
oA_Fukuanshenqing.Fukuanshenqingstatus = 0;
oA_Fukuanshenqing.ApprovalStatus = 0;
- oA_Fukuanshenqing.Fukuanmoney = this.txtZengjianmoney.Value.ToDecimal2();
-
+ oA_Fukuanshenqing.Molingmoney = this.txtmolingmoney.Value.ToDecimal2();
+ if (!oA_Fukuanshenqing.Molingmoney.HasValue)
+ {
+ oA_Fukuanshenqing.Molingmoney = 0;
+ }
+ oA_Fukuanshenqing.Fukuanmoney = this.txtZengjianmoney.Value.ToDecimal2() - oA_Fukuanshenqing.Molingmoney;
oA_Fukuanshenqing.Bank = this.txtBank.Value;
oA_Fukuanshenqing.Huming = this.txtHuming.Value;
oA_Fukuanshenqing.AccountID = this.txtAccountID.Value;
@@ -273,9 +277,10 @@
m_OA_WorkPlan.Operator = CurrentUser.ShortName;
m_OA_WorkPlan.PlanComplany = id.ToString();
- m_OA_WorkPlan.PlanContent = orderNoStr + " 閲囪喘浠樻鐢宠銆傝鍗曢噾棰濓細"+ this.ordernjine.InnerText + ", 鏀舵鍗曚綅锛�"+ _SupplierName + ", 鎴峰悕锛�" + oA_Fukuanshenqing.Huming;
+ m_OA_WorkPlan.PlanContent = orderNoStr + " 閲囪喘浠樻鐢宠銆傝鍗曢噾棰濓細"+ this.ordernjine.InnerText + ",鎶归浂閲戦锛�" + this.txtmolingmoney.Value + ", 鏀舵鍗曚綅锛�" + _SupplierName + ", 鎴峰悕锛�" + oA_Fukuanshenqing.Huming;
m_OA_WorkPlan.PlanDataType = 16;
m_OA_WorkPlan.PlanMoney = oA_Fukuanshenqing.Fukuanmoney;
+ m_OA_WorkPlan.RewardMoney = oA_Fukuanshenqing.Molingmoney;
m_OA_WorkPlan.PlanRemark = oA_Fukuanshenqing.remark;
m_OA_WorkPlan.PlanRunTime = DateTime.Now;
m_OA_WorkPlan.PlanTitle = this.txtPlanTitle.Value.Trim();
--
Gitblit v1.9.1