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/MyBaoxiaoList.aspx.cs | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.cs
index 0847367..6549a32 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.cs
@@ -40,14 +40,15 @@
}
if (Request["delete"] != null)
{
- var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(Request["delete"].ToInt32().Value).ToList();
- if (oA_WorkPlan_Shenpis.Count > 0 )
+ //var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(Request["delete"].ToInt32().Value).ToList();
+ OA_WorkPlan model = bll_OA_WorkPlanBll.GetModelByKeyid(Request["delete"].ToInt32());
+ if (!string.IsNullOrEmpty(model.EvaluationContent) )
{
- JavaScript.MessageBox("宸叉湁瀹℃壒淇℃伅锛屼笉鑳藉垹闄�", this);
+ JavaScript.MessageBox("宸叉彁浜や俊鎭紝涓嶈兘鍒犻櫎", this);
return;
}
- OA_WorkPlan model = bll_OA_WorkPlanBll.GetModelByKeyid(Request["delete"].ToInt32());
+
if (model != null && model.Keyid != null)
{
bll_OA_WorkPlanBll.DeleteModel(model, CurrentUser.TrueName);
@@ -110,7 +111,7 @@
DateTime? endTime = null;
pa.PageSize = UCPager1.AspNetPager.PageSize;
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
- var oA_WorkPlans = bll_OA_WorkPlanBll.SelectModelPage(pa, CurrentUser.MemberId, Guid.Empty, CurrentUser.TrueMemberId, 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), "", -1, this.selApprovalStatus.Value.ToInt32(), null, null,this.TxtRewardContent.Value.Trim(), this.txtPlanContent.Value.Trim());
+ var oA_WorkPlans = bll_OA_WorkPlanBll.SelectModelPage(pa, CurrentUser.MemberId, Guid.Empty, CurrentUser.TrueMemberId, 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), "", -1, this.selApprovalStatus.Value.ToInt32(), this.selEvaluationStatus.Value.ToInt32(), null,this.TxtRewardContent.Value.Trim(), this.txtPlanContent.Value.Trim());
foreach (var oA_WorkPlan in oA_WorkPlans)
{
var sss = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoId(oA_WorkPlan.Keyid.Value);
@@ -146,23 +147,23 @@
{
oA_WorkPlan.Nengfoushenpi = 1;
}
- if( oA_WorkPlan.ApprovalStatus == 1 && oA_WorkPlan.HoubufapiaoStatus != 2)
+ if((oA_WorkPlan.ApprovalStatus == 0 || oA_WorkPlan.ApprovalStatus == 1) && oA_WorkPlan.HoubufapiaoStatus != 2)
{
oA_WorkPlan.Nengfoushenpi = 1;
}
- var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(oA_WorkPlan.Keyid.Value).ToList();
- if (oA_WorkPlan_Shenpis.Count> 0 && oA_WorkPlan.HoubufapiaoStatus != 2)
- {
- oA_WorkPlan.Nengfoushenpi = 1;
- }
- if (oA_WorkPlan.ApprovalStatus == 2 || oA_WorkPlan.ApprovalStatus == 1)
- {
- oA_WorkPlan.Nengfoushanchu = 1;
- }
- if (oA_WorkPlan_Shenpis.Count > 0 )
- {
- oA_WorkPlan.Nengfoushanchu = 1;
- }
+ //var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(oA_WorkPlan.Keyid.Value).ToList();
+ //if (oA_WorkPlan_Shenpis.Count> 0 && oA_WorkPlan.HoubufapiaoStatus != 2)
+ //{
+ // oA_WorkPlan.Nengfoushenpi = 1;
+ //}
+ //if (oA_WorkPlan.ApprovalStatus == 2 || oA_WorkPlan.ApprovalStatus == 1)
+ //{
+ // oA_WorkPlan.Nengfoushanchu = 1;
+ //}
+ //if (oA_WorkPlan_Shenpis.Count > 0 )
+ //{
+ // oA_WorkPlan.Nengfoushanchu = 1;
+ //}
--
Gitblit v1.9.1