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/work/BaoxiaoReplyAdd.aspx.cs | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.cs
index 16f5a04..8a26484 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.cs
@@ -33,6 +33,7 @@
OA_DepartmentBll oA_DepartmentBll = null;
public string planDataType = "";
OA_SubjectSetBLL _OA_SubjectSetBLL = null;
+ OA_ShebeiWeixiuBLL oA_ShebeiWeixiuBLL = null;
public BaoxiaoReplyAdd()
{
oA_WorkReminderBll = new OA_WorkPlanBll();
@@ -45,6 +46,7 @@
oA_StaffBLL = new OA_StaffBLL();
oA_DepartmentBll = new OA_DepartmentBll();
_OA_SubjectSetBLL = new OA_SubjectSetBLL();
+ oA_ShebeiWeixiuBLL = new OA_ShebeiWeixiuBLL();
}
//椤甸潰鍔犺浇
@@ -169,10 +171,6 @@
string Messagejingli = null;
if (oA_Staff.BF_Isbaoxiaojingli)
{
- if (oA_WorkPlan_Shenpis.Count > 2)
- {
- Messagejingli = "璇ユ祦绋嬪凡缁忓鎵瑰畬鎴愶紒";
- }
if (oA_WorkPlan_Shenpis.Count < 2)
{
Messagejingli = "娌″埌缁忕悊瀹℃壒姝ラ锛�";
@@ -219,7 +217,7 @@
oA_WorkPlan_Shenpi.ApprovalContent = this.txtApprovalContent.Value.Trim();
oA_WorkPlan_Shenpi.CreateTime = nowTime;
oA_WorkPlan_Shenpi.Operator = CurrentUser.TrueName;
- if (oA_WorkPlan_Shenpis.Count == 2)
+ if (oA_WorkPlan_Shenpis.Count >= 2 && oA_Staff.BF_Isbaoxiaojingli)
{
oA_WorkPlan_Shenpi.Buzhou = 2;
}
@@ -230,7 +228,7 @@
res = oA_WorkPlan_ShenpiBLL.InsertModel(oA_WorkPlan_Shenpi);
- if (oA_WorkPlan_Shenpis.Count == 2 || this.selApprovalStatus.Value == "2")
+ if ((oA_WorkPlan_Shenpis.Count >= 2 && oA_Staff.BF_Isbaoxiaojingli ) || this.selApprovalStatus.Value == "2")
{
m_OA_WorkPlan.ApprovalContent = this.txtApprovalContent.Value.Trim();
@@ -242,6 +240,15 @@
m_OA_WorkPlan.Operator = CurrentUser.ShortName;
m_OA_WorkPlan.LastUpdateTime = nowTime;
res = oA_WorkReminderBll.UpdateModel(m_OA_WorkPlan);
+
+ var oA_ShebeiWeixiu = oA_ShebeiWeixiuBLL.GetModelBytiaojian(null, m_OA_WorkPlan.Keyid, null);
+ if (oA_ShebeiWeixiu != null)
+ {
+ //oA_ShebeiWeixiu.Zerenren = this.selZerenren.Value.ToInt32();
+ oA_ShebeiWeixiu.ApprovalStatus = this.selApprovalStatus.Value.ToInt32();
+ //oA_ShebeiWeixiu.DanzePrice = this.txtDanzePrice.Value.ToDecimal2();
+ oA_ShebeiWeixiuBLL.UpdateModel(oA_ShebeiWeixiu);
+ }
}
else
{
--
Gitblit v1.9.1