From b1ac791a0e8896ee3d2016949911d44c9f0fb7a9 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 16 三月 2026 13:17:23 +0800
Subject: [PATCH] 封面的构件选项修改为“封面、封内合拼、多单合拼、内页”，默认封面 选择了封面构件后，新增的内页构件中的选项该为“内页、多单合拼”， 默认内页 专版按以上 合版的选项中增加“无”，默认无 无”打印的时候为空白，不显示“无”字
---
CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
index c069f65..040e438 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
@@ -164,9 +164,28 @@
/// <param name="pa"></param>
/// <returns></returns>
public IEnumerable<CoreDeliverOrder> SelectModelPage(Pagination pa, Guid FirmId, int? DriverId, string shipAddress,
- string BuyerName, string createTimeStart, string createTimeEnd)
+ string BuyerName, string createTimeStart, string createTimeEnd, string OrderState)
{
- string Condition = " and b.FirmId ='" + FirmId + "' and a.OrderState = 0 ";
+ string Condition = " and b.FirmId ='" + FirmId + "' and b.DeliverState != 2 ";
+
+ if (!string.IsNullOrEmpty(OrderState))
+ {
+ if (OrderState != "4")
+ {
+ Condition += " and a.OrderState = " + OrderState + " ";
+ }
+ else
+ {
+ Condition += " and a.OrderState in( 0,1 ) ";
+ }
+ }
+ else
+ {
+ Condition += " and a.OrderState in( 0,1,2 ) ";
+
+
+ }
+
if (DriverId.HasValue)
{
var oA_Staff = staffBLL.GetModelByKeyid(DriverId);
--
Gitblit v1.9.1