From 374ce108d737c1e4d6608989090195a7346d10ad Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 26 二月 2026 08:47:21 +0800
Subject: [PATCH] 优化格式美观度。 完成 （1）“印刷、打包、送货要求”放在右边的格子里面；右边格子拉通 （2）“单价”和“总价”的格子比例要调整适中 （3）把“印件名称”放在第一格 （1）操作中增加“问题处理”，进行处理操作 完成 （2）问题反馈除了生成在这个列表中，还要自动推送给对应订单的下单人或者送货安排（发起工作安排）的安排人，显示在他们的“工作提醒”中，处理完了就在列表中变成已完成问题处理，显示“√”，点“√”进去就显示谁处理的、什么时候处理的。 完成 生产施工单中，选“轮转印刷机”的，删除“纸张数量（张）”和“开料规格” 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
index 4d3c0ca..62fc632 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
@@ -152,11 +152,11 @@
return;
}
- if (money > (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
- {
- JavaScript.MessageBox("鎿嶄綔閲戦澶т簬鍓╀綑搴斾粯閲戦锛�", this);
- return;
- }
+ //if (money > (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ //{
+ // JavaScript.MessageBox("鎿嶄綔閲戦澶т簬鍓╀綑搴斾粯閲戦锛�", this);
+ // return;
+ //}
var Youwufapiao = Request["rdoReceiveQuannbu"];
if (fukuanshenqing.Youwufapiao == 2 && Youwufapiao == "1")
@@ -165,14 +165,14 @@
return;
}
- if (molingmoney.HasValue && molingmoney.Value > 0)
- {
- if ((money + molingmoney.Value) != (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
- {
- JavaScript.MessageBox("鎿嶄綔閲戦鍔犳姽闆堕噾棰濆繀椤荤瓑浜庡墿浣欏簲浠橀噾棰濓紒", this);
- return;
- }
- }
+ //if (molingmoney.HasValue && molingmoney.Value > 0)
+ //{
+ // if ((money + molingmoney.Value) != (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ // {
+ // JavaScript.MessageBox("鎿嶄綔閲戦鍔犳姽闆堕噾棰濆繀椤荤瓑浜庡墿浣欏簲浠橀噾棰濓紒", this);
+ // return;
+ // }
+ //}
string[] Keys = fukuanshenqing.DindanId.Trim(',').Split(',');
using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
@@ -185,15 +185,16 @@
{
try
{
+ var sss = fukuanshenqing.Molingmoney.HasValue ? fukuanshenqing.Molingmoney.Value : 0;
var yishoumoney = fukuanshenqing.Yishoumoney.HasValue ? fukuanshenqing.Yishoumoney.Value : 0;
- if (money >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ if (money >= (fukuanshenqing.Fukuanmoney + sss - fukuanshenqing.Yishoumoney))
{
fukuanshenqing.FukuanStatus = 2;
}
if (molingmoney.HasValue && molingmoney.Value > 0)
{
- if ((money + molingmoney.Value) >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ if ((money + molingmoney.Value) >= (fukuanshenqing.Fukuanmoney + sss - fukuanshenqing.Yishoumoney))
{
fukuanshenqing.FukuanStatus = 2;
}
@@ -244,10 +245,10 @@
firmAccountRecord.RecordTypeId = 2;//鏀嚭
firmAccountRecord.Remark = this.txtRemark.Value;
firmAccountRecord.SubjectId = this.selSubject.Value.ToInt32();
- firmAccountRecord.ResidualAmount = firmAccount.Balance - orderBasic.UnPayedMoney; ;
+ firmAccountRecord.ResidualAmount = firmAccount.Balance - firmAccountRecord.Money; ;
- firmAccount.AllExpenses = orderBasic.UnPayedMoney + firmAccount.AllExpenses;
- firmAccount.Balance = firmAccount.Balance - orderBasic.UnPayedMoney;
+ firmAccount.AllExpenses = firmAccountRecord.Money + firmAccount.AllExpenses;
+ firmAccount.Balance = firmAccount.Balance - firmAccountRecord.Money;
ssss = _OA_FirmAccountRecordBLL.AddModel(firmAccountRecord, firmAccount);
if (ssss)
{
@@ -304,7 +305,7 @@
var oA_Staff = staffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.Name == oA_Baozhengjin.MemberName).FirstOrDefault();
oA_Baozhengjin.MemberId = oA_Staff.Keyid;
- var sss = oA_BaozhengjinBLL.InsertModel(oA_Baozhengjin);
+ var aaaaa = oA_BaozhengjinBLL.InsertModel(oA_Baozhengjin);
}
}
@@ -422,6 +423,11 @@
this.hidReceiveMoney.Value = ReceiveMoney.Value.ToString();
this.txtReciveMoney.Value = ReceiveMoney.Value.ToString("0.00");
this.spanCountRe.InnerHtml = Keys.Count().ToString2() + " 鍗�";
+ this.txtMolingMoney.Value = fukuanshenqing.Molingmoney.HasValue? fukuanshenqing.Molingmoney.Value.ToString("0.00"):"0";
+ if (fukuanshenqing.Molingmoney.HasValue)
+ {
+ this.txtReciveMoney.Value = (ReceiveMoney.Value - fukuanshenqing.Molingmoney.Value).ToString("0.00");
+ }
}
--
Gitblit v1.9.1