20240729

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))