From 31c1cc0e839b72c26c8aaa5a9a7b61b81ecf3307 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 23 十二月 2025 12:19:51 +0800
Subject: [PATCH] 修改采购申请付款，结账的不能申请
---
CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs
index 1e4e4c7..74feec1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs
@@ -95,6 +95,18 @@
pa.PageSize = 1000;
pa.PageIndex = 1;
var models = _OA_ProcurementBLL.getModelList(pa, CurrentUser.MemberId,orderIdStr).ToList();
+
+
+ foreach (var oA_Procurement in models)
+ {
+ if(oA_Procurement.ClearingStatusId == 204)
+ {
+ JavaScript.MessageBox("鏈夐噰璐崟宸茬粡浠樻锛�", this,true,false);
+ return;
+ }
+ _oA_FukuanshenqingBLL.GetModelListByshifoushenqing(oA_Procurement.Keyid.Value);
+ }
+
if (models.Count > 0)
{
var sss = _OA_SuppliersBLL.getSingleSupplier(models[0].SuppliersId.Value.ToString());
@@ -154,6 +166,11 @@
//鎻愪氦浜嬩欢
protected void btn_Submit_form(object sender, EventArgs e)
{
+ if (string.IsNullOrEmpty(this.txtPlanTitle.Value.Trim()))
+ {
+ JavaScript.MessageBox("璇峰～鍐欒绀轰富棰橈紒", this);
+ return;
+ }
AcceptAll3();
}
@@ -202,8 +219,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;
@@ -268,12 +289,13 @@
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.PlanDataType = 16;
+ m_OA_WorkPlan.PlanContent = " 閲囪喘浠樻鐢宠銆傝鍗曢噾棰濓細"+ this.ordernjine.InnerText + ",鎶归浂閲戦锛�" + this.txtmolingmoney.Value + ", 鏀舵鍗曚綅锛�" + _SupplierName + ", 鎴峰悕锛�" + oA_Fukuanshenqing.Huming;//+ orderNoStr
+ 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 = orderNoStr + " 閲囪喘浠樻鐢宠";
+ m_OA_WorkPlan.PlanTitle = this.txtPlanTitle.Value.Trim();
m_OA_WorkPlan.PlanType = 3;
m_OA_WorkPlan.LastUpdateTime = nowTime;
result = oA_WorkReminderBll.InsertModel(m_OA_WorkPlan);
--
Gitblit v1.9.1