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/Waixiefukuanfukuan.aspx.cs | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs
index f95e59f..81de6eb 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs
@@ -39,6 +39,7 @@
LF_OrderFileBLL _lF_OrderFileBLL = null;
EC_OrderBLL _eC_OrderBLL = null;
OA_FukuanshenqingBLL oA_FukuanshenqingBLL = null;
+ OA_WorkPlanBll _WorkPlanBll = null;
/// <summary>
/// 鍒濆鍖栨瀯閫�
@@ -50,6 +51,7 @@
_lF_OrderFileBLL = new LF_OrderFileBLL();
_eC_OrderBLL = new EC_OrderBLL();
oA_FukuanshenqingBLL = new OA_FukuanshenqingBLL();
+ _WorkPlanBll = new OA_WorkPlanBll();
}
/// <summary>
@@ -461,8 +463,8 @@
- this.txtSQBeginDate.Value = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
- this.txtSQEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
+ //this.txtSQBeginDate.Value = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
+ //this.txtSQEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
this.selPayStates.Value = "1";
//鍒濇鏁版嵁鍔犺浇
btn_Search_Click(btn_Search, new EventArgs());
@@ -557,7 +559,31 @@
PageSize = UCPager1.AspNetPager.PageSize,
PageIndex = UCPager1.AspNetPager.CurrentPageIndex
};
- IEnumerable<OA_Fukuanshenqing> result = oA_FukuanshenqingBLL.SelectModelPage(pagination, CurrentUser.MemberId, this.txtSQBeginDate.Value, this.txtSQEndDate.Value, this.txtCreatorName.Value, this.txtCustormerName.Value,this.selPayStates.Value);
+ IEnumerable<OA_Fukuanshenqing> result = oA_FukuanshenqingBLL.SelectModelPage(pagination, CurrentUser.MemberId, this.txtSQBeginDate.Value, this.txtSQEndDate.Value, this.txtCreatorName.Value, this.txtCustormerName.Value,this.selPayStates.Value, this.selFukuanyongtu.Value);
+ foreach(var oA_Fukuanshenqing in result)
+ {
+ if(oA_Fukuanshenqing.Fukuanyongtu == "澶栧崗鍔犲伐璐�" || oA_Fukuanshenqing.Fukuanyongtu == "閲囪喘浠樻" || oA_Fukuanshenqing.Fukuanyongtu == "璁惧缁翠慨璐�")
+ {
+ var workPlan = _WorkPlanBll.GetModelByFukuanshenqid(oA_Fukuanshenqing.Keyid.ToString(),"");
+ if (workPlan != null)
+ {
+ oA_Fukuanshenqing.WorkPlanId = workPlan.Keyid.ToString();
+ }
+ }
+ else if (oA_Fukuanshenqing.Fukuanyongtu == "鍏朵粬浠樻" )
+ {
+ var workPlan = _WorkPlanBll.GetModelByFukuanshenqid( "", oA_Fukuanshenqing.Keyid.ToString());
+ if (workPlan != null)
+ {
+ oA_Fukuanshenqing.WorkPlanId = workPlan.Keyid.ToString();
+ }
+ }
+ else
+ {
+ oA_Fukuanshenqing.WorkPlanId = "";
+ }
+ }
+
rptData.DataSource = result;
rptData.DataBind();
--
Gitblit v1.9.1