From bb8b689c2922ff7d819e512887539f1680689c11 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期六, 22 六月 2024 15:50:11 +0800
Subject: [PATCH] Merge branch 'zwc' of http://47.95.120.53:8083/r/JC23WMS-2 into zwc
---
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 86fe9e7..c4d2e1f 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -58,7 +58,7 @@
{
sqlPub += $"AND tb1.Status = '{model.Status}' ";
}
- if (!string.IsNullOrEmpty(model.Type))
+ /*if (!string.IsNullOrEmpty(model.Type))
{
if (model.Type == "3")
{
@@ -73,7 +73,7 @@
{
sqlPub += " AND tb1.Type != '3'";
- }
+ }*/
if (!string.IsNullOrEmpty(model.StartTime))
{
sqlPub += $"AND tb1.CreateTime >= '{model.StartTime}' ";
--
Gitblit v1.8.0