From dc7b6c75f98b6924b7e091ee7ac6551470652d78 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 20 一月 2025 09:07:29 +0800
Subject: [PATCH] 修改订单单位

---
 CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index b3f4ae1..a32cda7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -2429,7 +2429,7 @@
                      if (afterInfo.ParameterName == "鑳跺ご")
                      {
                          if(model.PrintTypeId!=27)
-                         afterInfo.ParameterName = "鑳跺ご(姣忔湰" + model.PageNum.ToString() + "椤�)";
+                         afterInfo.ParameterName = "鑳跺ご(姣忔湰" + model.PageNum.ToString() + "寮�)";
 
                         if (model.PrintTypeId == 39)
                         {
@@ -2439,7 +2439,7 @@
                     if (afterInfo.ParameterName == "鑳跺乏")
                     {
                         if (model.PrintTypeId == 29)
-                            afterInfo.ParameterName = "鑳跺乏(姣忔湰" + model.PaperMP.ToString() + "椤�)";
+                            afterInfo.ParameterName = "鑳跺乏(姣忔湰" + model.PaperMP.ToString() + "寮�)";
                     }
                     afterWorkStr += afterInfo.ParameterName + "锛�";
                  }
@@ -2455,13 +2455,20 @@
                  }
 
              }
-             //if (model.PrintTypeId == 27)
-             //{
-             //    afterWorkStr += "濂楀彿鍙锋(" + model.ThStart.ToString() + "-" + model.ThEnd.ToString() + ")";
-             //    afterWorkStr += "锛�" + model.JTWZ;
-             //}
-             
-             if (model.PrintTypeId == 25)
+            if (model.PrintTypeId == 27)
+            {
+                if (!string.IsNullOrEmpty(model.JTWZ))
+                {
+                    afterWorkStr = model.JTWZ  ;
+                }
+                if(!string.IsNullOrEmpty(model.ThStart) || !string.IsNullOrEmpty(model.ThEnd))
+                {
+                    afterWorkStr += "锛屽鍙峰彿娈�(" + model.ThStart + "-" + model.ThEnd + ")";
+                    //afterWorkStr += "锛�" + model.JTWZ;
+                } 
+            }
+
+            if (model.PrintTypeId == 25)
              {
                  
                  InquiryInsideModel insideModel = model.InquiryInsideList[0];

--
Gitblit v1.9.1