From 389b4da5feedfc0b49d7c6540bc836267d7bbee0 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 23 九月 2025 08:46:15 +0800
Subject: [PATCH] 作业本送货 加上客户单位 完成 订单状态默认未送货 完成
---
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