From ffaad850fd7ecd29ec004bcf4a90e1b0f5be8605 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 25 七月 2025 09:20:13 +0800
Subject: [PATCH] 试卷下单修改

---
 CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs |  102 +++++++++++++++++++++++++++++----------------------
 1 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index 6be0cf7..167b482 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -950,56 +950,61 @@
                         printDemand += "璇曞嵎琚嬬焊寮狅細" + model.printColorshijuan + "锛�";
                     }
 
-                    if (request["paper1"] != null)
+                    if(request["paper1"] != null && !string.IsNullOrEmpty(request["paper1"].ToString()))
                     {
-                        model.paper1 = request["paper1"].ToString();
-                        printDemand += "绛旈鍗★細绾稿紶锛�" + model.paper1 + "锛�";
-                    }
-
-
-
-                    if (request["paperSizeA4"] != null)
-                    {
-                        model.paperSizeA4 = request["paperSizeA4"].ToString();
-                        if (model.paperSizeA4 == "-1")
+                        if (request["paper1"] != null)
                         {
-                            model.PrintSizeNameA4 = request["txtFirstSizeA4"].ToString() + "脳" + request["txtSecondSizeA4"].ToString();
-                            model.firstSizeA4 = request["txtFirstSizeA4"].ToString();
-                            model.secondSizeA4 = request["txtSecondSizeA4"].ToString();
-                            printDemand += "鎴愬搧灏哄锛欰4 " + model.PrintSizeNameA4 + "锛�";
+                            model.paper1 = request["paper1"].ToString();
+                            printDemand += "绛旈鍗★細绾稿紶锛�" + model.paper1 + "锛�";
                         }
-                        else
+
+
+
+                        if (request["paperSizeA4"] != null)
                         {
-                            printDemand += "鎴愬搧灏哄锛欰4 " + model.paperSizeA4 + "锛�";
+                            model.paperSizeA4 = request["paperSizeA4"].ToString();
+                            if (model.paperSizeA4 == "-1")
+                            {
+                                model.PrintSizeNameA4 = request["txtFirstSizeA4"].ToString() + "脳" + request["txtSecondSizeA4"].ToString();
+                                model.firstSizeA4 = request["txtFirstSizeA4"].ToString();
+                                model.secondSizeA4 = request["txtSecondSizeA4"].ToString();
+                                printDemand += "鎴愬搧灏哄锛欰4 " + model.PrintSizeNameA4 + "锛�";
+                            }
+                            else
+                            {
+                                printDemand += "鎴愬搧灏哄锛欰4 " + model.paperSizeA4 + "锛�";
+                            }
+                        }
+
+                        if (request["paperSizeA3"] != null)
+                        {
+                            model.paperSizeA3 = request["paperSizeA3"].ToString();
+                            if (model.paperSizeA3 == "-1")
+                            {
+                                model.PrintSizeNameA3 = request["txtFirstSizeA3"].ToString() + "脳" + request["txtSecondSizeA3"].ToString();
+                                model.firstSizeA3 = request["txtFirstSizeA3"].ToString();
+                                model.secondSizeA3 = request["txtSecondSizeA3"].ToString();
+                                printDemand += "A3 " + model.PrintSizeName + "锛�";
+                            }
+                            else
+                            {
+                                printDemand += "A3 " + model.paperSizeA3 + "锛�";
+                            }
+                        }
+                        if (request["printColor1"] != null)
+                        {
+                            model.printColor1 = request["printColor1"].ToString();
+                            printDemand += "鍗板埛棰滆壊锛�" + model.printColor1 + "锛�";
+                        }
+
+                        if (request["printColor2"] != null)
+                        {
+                            model.printColor2 = request["printColor2"].ToString();
+                            printDemand += "绛旈鍗¤绾稿紶锛�" + model.printColor2 + "锛�";
                         }
                     }
 
-                    if (request["paperSizeA3"] != null)
-                    {
-                        model.paperSizeA3 = request["paperSizeA3"].ToString();
-                        if (model.paperSizeA3 == "-1")
-                        {
-                            model.PrintSizeNameA3 = request["txtFirstSizeA3"].ToString() + "脳" + request["txtSecondSizeA3"].ToString();
-                            model.firstSizeA3 = request["txtFirstSizeA3"].ToString();
-                            model.secondSizeA3 = request["txtSecondSizeA3"].ToString();
-                            printDemand += "A3 " + model.PrintSizeName + "锛�";
-                        }
-                        else
-                        {
-                            printDemand += "A3 " + model.paperSizeA3 + "锛�";
-                        }
-                    }
-                    if (request["printColor1"] != null)
-                    {
-                        model.printColor1 = request["printColor1"].ToString();
-                        printDemand += "鍗板埛棰滆壊锛�" + model.printColor1 + "锛�";
-                    }
-
-                    if (request["printColor2"] != null)
-                    {
-                        model.printColor2 = request["printColor2"].ToString();
-                        printDemand += "绛旈鍗¤绾稿紶锛�" + model.printColor2 + "锛�";
-                    }
+                   
 
 
                     InquirySHiJuanModel inquirySHiJuanModel = null;
@@ -1420,6 +1425,11 @@
                                     printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhicheckboxinput + "寮狅紝";
                                     printDemand += inquirySHiJuanModel.zhengzhiselect + "锛�";
                                 }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwucheckboxinput))
+                                {
+                                    printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwucheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.shengwuselect + "锛�";
+                                }
 
                                 printDemand += "绛旈鍗★細";
 
@@ -1464,7 +1474,11 @@
                                     printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhidatikacheckboxinput + "寮狅紝";
                                     printDemand += inquirySHiJuanModel.zhengzhidatikaselect + "锛�";
                                 }
- 
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwudatikacheckboxinput))
+                                {
+                                    printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwudatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.shengwudatikaselect + "锛�";
+                                }
                             }
                             else if (inquirySHiJuanModel.Nianji == "楂樹簩")
                             {

--
Gitblit v1.9.1