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/BaoxiaoReplyList.aspx.cs | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs
index d266dcb..e946980 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs
@@ -22,6 +22,7 @@
OA_DepartmentBll oA_DepartmentBll = null;
OA_StaffBLL oA_StaffBLL = null;
OA_WorkPlan_shenpiBLL oA_WorkPlan_ShenpiBLL = null;
+ public string piliangpifu = null;
//鍒濆鍖�
public BaoxiaoReplyList()
{
@@ -109,7 +110,15 @@
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
var oA_WorkPlans = bll_OA_WorkPlanBll.SelectModelPage(pa, CurrentUser.MemberId, Guid.Empty, Guid.Empty, 3, 17, "", null, null, string.IsNullOrEmpty(this.txtRegTimeStart.Value) ? beginTime : Convert.ToDateTime(this.txtRegTimeStart.Value), string.IsNullOrEmpty(this.txtRegTimeEnd.Value) ? endTime : Convert.ToDateTime(this.txtRegTimeEnd.Value), this.txtPlanPeople.Value.Trim(), -1, this.selApprovalStatus.Value.ToInt32(), null, null,this.TxtRewardContent.Value.Trim(), this.txtPlanContent.Value.Trim(),"3");
var oA_Staff = oA_StaffBLL.GetModelByMemberId(CurrentUser.TrueMemberId);
-
+ if (oA_Staff.BF_Isbaoxiaojingli)
+ {
+ piliangpifu = "1";
+ }
+ else
+ {
+ piliangpifu = "0";
+ }
+
foreach (var oA_WorkPlan in oA_WorkPlans)
{
var sss = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoId(oA_WorkPlan.Keyid.Value);
@@ -173,31 +182,12 @@
}
else if (!oA_Staff.BF_IsBaoxiaozhuguan && oA_Staff.BF_Isbaoxiaojingli)
{
- if (oA_WorkPlan_Shenpis.Count > 2)
- {
- oA_WorkPlan.Nengfoushenpi = 1;
- }
if (oA_WorkPlan_Shenpis.Count < 2)
{
oA_WorkPlan.Nengfoushenpi = 1;
}
}
- else if (oA_Staff.BF_IsBaoxiaozhuguan && oA_Staff.BF_Isbaoxiaojingli)
- {
- var oA_WorkPlan_Shenpis1 = oA_WorkPlan_Shenpis.Where(x => x.Buzhou == 1).ToList();
-
-
- var shenpicount = oA_WorkPlan_Shenpis1.Count(x => x.ApprovalStaffId == CurrentUser.TrueMemberId);
-
-
-
- if(oA_WorkPlan_Shenpis.Count != 2 && ((oA_WorkPlan_Shenpis1.Count > 1) || shenpicount > 0))
- {
- oA_WorkPlan.Nengfoushenpi = 1;
- }
-
-
- }
+
}
@@ -205,8 +195,8 @@
}
+ this.AllMoney.InnerText = pa.heji1.Value.ToString("0.00");
-
this.NowMoney.InnerText = oA_WorkPlans.Sum(x => x.PlanMoney).Value.ToString("F2");
this.RepClientList.DataSource = oA_WorkPlans;
this.RepClientList.DataBind();
--
Gitblit v1.9.1