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.BLL/OA/Adm_zhanghaomimaBLL.cs | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/Adm_zhanghaomimaBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/Adm_zhanghaomimaBLL.cs
index d6d1f6a..efcb2de 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/Adm_zhanghaomimaBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/Adm_zhanghaomimaBLL.cs
@@ -104,12 +104,24 @@
return _IAdm_zhanghaomimaDAL.GetModelByformid(formid);
}
- /// <summary>
- /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
- /// </summary>
- /// <param name="Keyid">涓婚敭id</param>
- /// <returns></returns>
- public Adm_zhanghaomima GetModelByKeyid(int keyid)
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public IEnumerable<Model.Adm_zhanghaomima> GetModelByKeyids(string keyids)
+ {
+
+ return _IAdm_zhanghaomimaDAL.GetModelByKeyids(keyids);
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public Adm_zhanghaomima GetModelByKeyid(int keyid)
{
return _IAdm_zhanghaomimaDAL.GetModelByKeyid(keyid);
@@ -138,7 +150,7 @@
/// </summary>
/// <param name="pa"></param>
/// <returns></returns>
- public IEnumerable<Adm_zhanghaomima> SelectModelPage(Pagination pa, Guid FirmId, string type_id, string chanpinxiangmu)
+ public IEnumerable<Adm_zhanghaomima> SelectModelPage(Pagination pa, Guid FirmId, string type_id, string chanpinxiangmu, bool IsChangyongziliao, int? staffid, string selquanxin)
{
string Condition = " and ok.FirmId ='" + FirmId + "' and ok.rec_status = 'A' ";
@@ -148,11 +160,29 @@
Condition += " and ok.type_id = " + type_id + "";
}
+ if (!string.IsNullOrEmpty(selquanxin))
+ {
+ if (selquanxin == "1")
+ {
+ Condition += " and ( ok.[Jusequanxian] = '' or ok.[Jusequanxian] = ',,' )";
+ }
+ else if (selquanxin == "2")
+ {
+ Condition += " and (ok.[Jusequanxian] != '' and ok.[Jusequanxian] != ',,' )";
+ }
+
+ }
+
if (!string.IsNullOrEmpty(chanpinxiangmu))
{
Condition += " and ok.chanpinxiangmu like '%" + chanpinxiangmu + "%'";
}
+ if (IsChangyongziliao == false && staffid.HasValue && staffid > 0)
+ {
+ Condition += " and ok.Jusequanxian like '%," + staffid + ",%'";
+ }
+
Query query = new Query();
IList<Criterion> criterias = new List<Criterion>()
{
--
Gitblit v1.9.1