From 259584df9c06ade70f1f351affb35d4922e1263d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 07 十一月 2025 16:23:13 +0800
Subject: [PATCH] 这个打印送货单，你们给我做两种，做一张打印没得数量的，做一张打印有数量的。送货单格式就是32开，就哎就是A4排一半。你们打了测试，注意，美观。 把那个把它做出来，下一批就用这个自动打。 不是不是打印的要数量都是有数量，要没得数量都没得数量。就是点打印的时候就两个按钮嘛，一个是有数量打印，或者或者或者空白送货单打印。 现在这个现在的送货单都是没有数量噻。现在那个要的，比如你那里再打你那个打印关闭的按钮，要把搞成两个打印嘛，就是打印空白送货单和打印送货单。 好点打印空白送货单的，就是现在这样子。点打印送货单，打印的就是那个跟有有就是有数据的送货单。作业本送货统计查询，状态查询需要修改逻辑
---
CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs | 20 +++++++++++++++-----
1 files changed, 15 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..d5823cd 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs
@@ -154,6 +154,11 @@
//鎻愪氦浜嬩欢
protected void btn_Submit_form(object sender, EventArgs e)
{
+ if (string.IsNullOrEmpty(this.txtPlanTitle.Value.Trim()))
+ {
+ JavaScript.MessageBox("璇峰～鍐欒绀轰富棰橈紒", this);
+ return;
+ }
AcceptAll3();
}
@@ -202,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;
@@ -268,12 +277,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