From cf921e06fa2c02bef0c1c9ff0b0f7bea43cf0602 Mon Sep 17 00:00:00 2001
From: dengyu <ddlucky@sina.com>
Date: Mon, 29 Jul 2024 10:28:04 +0800
Subject: [PATCH] 20240729

---
 .../Controllers/MsRptNoTotalController.cs            | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsRptNoTotalController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsRptNoTotalController.cs
index 623260ff..84010fa0 100644
--- a/DSWeb/Areas/MvcShipping/Controllers/MsRptNoTotalController.cs
+++ b/DSWeb/Areas/MvcShipping/Controllers/MsRptNoTotalController.cs
@@ -875,6 +875,9 @@ namespace DSWeb.MvcShipping.Controllers
                 return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
             }
 
+            //20240726 此模块不需要在“合并更改单”的时候变更这个查询条件
+            condition = condition.Replace(" A.ACCDATE", " B.ACCDATE");
+
             var strDa = GetRangDAStr("index", Convert.ToString(Session["USERID"]).ToString().Trim(), Convert.ToString(Session["SHOWNAME"]).ToString().Trim(), Convert.ToString(Session["COMPANYID"]).ToString().Trim());
 
             if (!string.IsNullOrEmpty(strDa))
@@ -1066,6 +1069,9 @@ namespace DSWeb.MvcShipping.Controllers
                 return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
             }
 
+            //20240726 此模块不需要在“合并更改单”的时候变更这个查询条件
+            condition = condition.Replace(" A.ACCDATE", " B.ACCDATE");
+
             var strDa = GetRangDAStr("index", Convert.ToString(Session["USERID"]).ToString().Trim(), Convert.ToString(Session["SHOWNAME"]).ToString().Trim(), Convert.ToString(Session["COMPANYID"]).ToString().Trim());
 
             if (!string.IsNullOrEmpty(strDa))
@@ -1247,6 +1253,9 @@ namespace DSWeb.MvcShipping.Controllers
                 return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
             }
 
+            //20240726 此模块不需要在“合并更改单”的时候变更这个查询条件
+            condition = condition.Replace(" A.ACCDATE", " B.ACCDATE");
+
             var strDa = GetRangDAStr("index", Convert.ToString(Session["USERID"]).ToString().Trim(), Convert.ToString(Session["SHOWNAME"]).ToString().Trim(), Convert.ToString(Session["COMPANYID"]).ToString().Trim());
 
             if (!string.IsNullOrEmpty(strDa))
@@ -1429,6 +1438,9 @@ namespace DSWeb.MvcShipping.Controllers
                 return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
             }
 
+            //20240726 此模块不需要在“合并更改单”的时候变更这个查询条件
+            condition = condition.Replace(" A.ACCDATE", " B.ACCDATE");
+
             var strDa = GetRangDAStr("index", Convert.ToString(Session["USERID"]).ToString().Trim(), Convert.ToString(Session["SHOWNAME"]).ToString().Trim(), Convert.ToString(Session["COMPANYID"]).ToString().Trim());
 
             if (!string.IsNullOrEmpty(strDa))