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/RequestReplyAdd.aspx.cs | 149 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 146 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
index 1b4bc8d..1f835e2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
@@ -26,6 +26,11 @@
OA_FukuanshenqingBLL _oA_FukuanshenqingBLL = null;
EC_MemberBasicBLL _eC_MemberBasicBLL = null;
public string planDataType = "";
+ OA_WorkPlan_attachmentBLL oA_WorkPlan_AttachmentBLL = null;
+ OA_StaffBLL oA_StaffBLL = null;
+ OA_ShebeiWeixiuBLL oA_ShebeiWeixiuBLL = null;
+ OA_WageAwardPunishBLL bll_OA_WageAwardPunishBLL = null;
+ public string DindanId = "";
public RequestReplyAdd()
{
oA_WorkReminderBll = new OA_WorkPlanBll();
@@ -33,6 +38,10 @@
_eC_OrderBLL = new EC_OrderBLL();
_oA_FukuanshenqingBLL = new OA_FukuanshenqingBLL();
_eC_MemberBasicBLL = new EC_MemberBasicBLL();
+ oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
+ oA_StaffBLL = new OA_StaffBLL();
+ oA_ShebeiWeixiuBLL = new OA_ShebeiWeixiuBLL();
+ bll_OA_WageAwardPunishBLL = new OA_WageAwardPunishBLL();
}
//椤甸潰鍔犺浇
@@ -64,6 +73,39 @@
this.spanPlanTitle.InnerText = m_OA_WorkPlan.PlanTitle.ToString();
this.spanPlanContent.InnerText = m_OA_WorkPlan.PlanContent.ToString();
this.spanShoukuandanwei.InnerText = m_OA_WorkPlan.PlanComplany;
+
+ if (m_OA_WorkPlan.PlanDataType == 14)
+ {
+ this.RepClientList.DataSource = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(Request["keyid"].ToInt32().Value, 14);
+ this.RepClientList.DataBind();
+ var fukuanshenqing = _oA_FukuanshenqingBLL.GetModelByKeyid(m_OA_WorkPlan.PlanComplany.ToInt32().Value);
+ if (fukuanshenqing != null)
+ {
+ DindanId = fukuanshenqing.DindanId;
+ }
+ }
+ else if (m_OA_WorkPlan.PlanDataType == 15)
+ {
+ this.RepClientList.DataSource = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(Request["keyid"].ToInt32().Value, 15);
+ this.RepClientList.DataBind();
+ }
+ else if(m_OA_WorkPlan.PlanDataType == 18)
+ {
+ if (string.IsNullOrEmpty(m_OA_WorkPlan.PlanComplany))
+ {
+ this.spanShifoushenqingfukuan.InnerText = "鍚�";
+ }
+ else
+ {
+ this.spanShifoushenqingfukuan.InnerText = "鏄�";
+ }
+ this.selZerenren.DataSource = oA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null);
+ this.selZerenren.DataTextField = "Name";
+ this.selZerenren.DataValueField = "Keyid";
+ this.selZerenren.DataBind();
+ this.selZerenren.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selZerenren.Value = "";
+ }
}
}
@@ -103,11 +145,109 @@
}
- if (m_OA_WorkPlan.ApprovalStatus == 1 && m_OA_WorkPlan.PlanDataType == 14)
+ if (m_OA_WorkPlan.ApprovalStatus == 1 && (m_OA_WorkPlan.PlanDataType == 14 || m_OA_WorkPlan.PlanDataType == 16))
{//鎵瑰噯鍙嶅啓
var fukuanshenqing = _oA_FukuanshenqingBLL.GetModelByKeyid(m_OA_WorkPlan.PlanComplany.ToInt32().Value);
fukuanshenqing.ApprovalStatus = 1;
_oA_FukuanshenqingBLL.UpdateModel(fukuanshenqing);
+ }
+
+
+ if (m_OA_WorkPlan.ApprovalStatus == 1 && (m_OA_WorkPlan.PlanDataType == 18 || m_OA_WorkPlan.PlanDataType == 19))
+ {//鎵瑰噯鍙嶅啓
+ if (!string.IsNullOrEmpty(m_OA_WorkPlan.PlanComplany))
+ {
+ var fukuanshenqing = _oA_FukuanshenqingBLL.GetModelByKeyid(m_OA_WorkPlan.PlanComplany.ToInt32().Value);
+ fukuanshenqing.ApprovalStatus = 1;
+ _oA_FukuanshenqingBLL.UpdateModel(fukuanshenqing);
+ }
+
+
+ if(m_OA_WorkPlan.PlanDataType == 18)
+ {
+ m_OA_WorkPlan.RewardContent = this.txtDanzePrice.Value;
+
+ var oA_ShebeiWeixiu = oA_ShebeiWeixiuBLL.GetModelBytiaojian(m_OA_WorkPlan.Keyid, null, null);
+ if (!string.IsNullOrEmpty(this.selZerenren.Value))
+ {
+ var staff = oA_StaffBLL.GetModelByKeyid(this.selZerenren.Value.ToInt32());
+ if (staff != null)
+ {
+ m_OA_WorkPlan.RewardResult = staff.Name;
+ oA_ShebeiWeixiu.ZerenrenName = staff.Name;
+ }
+
+
+ if (!string.IsNullOrEmpty(this.selZerenren.Value) && !string.IsNullOrEmpty(this.txtDanzePrice.Value))
+ {
+ DateTime? RewardTime = nowTime;
+ OA_WageAwardPunish m_OA_WageAwardPunish = new OA_WageAwardPunish();
+
+ m_OA_WageAwardPunish.FirmId = CurrentUser.MemberId;
+ m_OA_WageAwardPunish.RecTitle = m_OA_WorkPlan.PlanTitle;
+ m_OA_WageAwardPunish.RecTime = nowTime;
+ m_OA_WageAwardPunish.RecType = 2;
+ m_OA_WageAwardPunish.RecContent = m_OA_WorkPlan.PlanContent;
+ m_OA_WageAwardPunish.RecMoney = this.txtDanzePrice.Value.ToDecimal2();
+ m_OA_WageAwardPunish.PlanId = 0;
+ m_OA_WageAwardPunish.LastUpdateTime = nowTime;
+ m_OA_WageAwardPunish.Operator = CurrentUser.ShortName;
+ m_OA_WageAwardPunish.MemberId = staff.MemberId;
+ m_OA_WageAwardPunish.PlanId = m_OA_WorkPlan.Keyid;
+ bll_OA_WageAwardPunishBLL.InsertModel(m_OA_WageAwardPunish);
+ }
+ }
+
+
+ if (oA_ShebeiWeixiu != null)
+ {
+ oA_ShebeiWeixiu.Zerenren = this.selZerenren.Value.ToInt32();
+ oA_ShebeiWeixiu.ApprovalStatus = 1;
+ oA_ShebeiWeixiu.DanzePrice = this.txtDanzePrice.Value.ToDecimal2();
+ oA_ShebeiWeixiuBLL.UpdateModel(oA_ShebeiWeixiu);
+ }
+
+
+
+
+
+
+ }
+
+
+ }
+
+ if (m_OA_WorkPlan.ApprovalStatus == 2 && (m_OA_WorkPlan.PlanDataType == 18))
+ {
+ var oA_ShebeiWeixiu = oA_ShebeiWeixiuBLL.GetModelBytiaojian(m_OA_WorkPlan.Keyid, null, null);
+ if (oA_ShebeiWeixiu != null)
+ {
+ oA_ShebeiWeixiu.ApprovalStatus = m_OA_WorkPlan.ApprovalStatus;
+ oA_ShebeiWeixiuBLL.UpdateModel(oA_ShebeiWeixiu);
+ }
+ }
+ if (m_OA_WorkPlan.ApprovalStatus == 2 && (m_OA_WorkPlan.PlanDataType == 19))
+ {
+ var oA_ShebeiWeixiu = oA_ShebeiWeixiuBLL.GetModelBytiaojian(null, m_OA_WorkPlan.Keyid, null);
+ if (oA_ShebeiWeixiu != null)
+ {
+ oA_ShebeiWeixiu.ApprovalStatus = m_OA_WorkPlan.ApprovalStatus;
+ oA_ShebeiWeixiuBLL.UpdateModel(oA_ShebeiWeixiu);
+ }
+ }
+
+
+ if (m_OA_WorkPlan.ApprovalStatus == 1 && m_OA_WorkPlan.PlanDataType == 20)
+ {
+ var oA_WageAward = bll_OA_WageAwardPunishBLL.GetModelByKeyid(m_OA_WorkPlan.PlanComplany.ToInt32().Value);
+ oA_WageAward.Shifoushensu = 2;
+ bll_OA_WageAwardPunishBLL.DeleteModel(oA_WageAward);
+ }
+ if (m_OA_WorkPlan.ApprovalStatus == 2 && m_OA_WorkPlan.PlanDataType == 20)
+ {
+ var oA_WageAward = bll_OA_WageAwardPunishBLL.GetModelByKeyid(m_OA_WorkPlan.PlanComplany.ToInt32().Value);
+ oA_WageAward.Shifoushensu = 3;
+ bll_OA_WageAwardPunishBLL.UpdateShifoushensu(oA_WageAward);
}
@@ -137,8 +277,8 @@
var eC_MemberBasic = _eC_MemberBasicBLL.GetMemberByMemberId(m_OA_WorkPlan.SentStaffId);
if (eC_MemberBasic != null)
{
- oA_Fukuanshenqing.Creater = CurrentUser.ShortName;
- oA_Fukuanshenqing.Updater = CurrentUser.ShortName;
+ oA_Fukuanshenqing.Creater = eC_MemberBasic.Name;
+ oA_Fukuanshenqing.Updater = eC_MemberBasic.Name;
}
else
{
@@ -152,6 +292,9 @@
oA_Fukuanshenqing.LastUpdateTime = DateTime.Now;
var id = _oA_FukuanshenqingBLL.InsertModel(oA_Fukuanshenqing);
+
+ //鍏朵粬浠樻id瀛樺湪RewardType杩欎釜瀛楁
+ m_OA_WorkPlan.RewardType = id;
}
if (Request["keyid"].ToInt32() > 0)
--
Gitblit v1.9.1