From a980cd04341d71216e0f59bd4b7327fe9fc50032 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 21 五月 2025 11:41:46 +0800
Subject: [PATCH] 提交

---
 CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs |  113 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 94 insertions(+), 19 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index ac1b301..6be0cf7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -195,6 +195,16 @@
                     remarks = request["remarks"].ToString();
                 if (request["pNameMP"] != null)
                     paperMP = request["pNameMP"].ToString();
+                if (request["shanglian"] != null)
+                    model.shanglian = request["shanglian"].ToString();
+                if (request["zhonglianlian1"] != null)
+                    model.zhonglianlian1 = request["zhonglianlian1"].ToString();
+                if (request["zhonglianlian2"] != null)
+                    model.zhonglianlian2 = request["zhonglianlian2"].ToString();
+                if (request["zhonglianlian3"] != null)
+                    model.zhonglianlian3 = request["zhonglianlian3"].ToString();
+                if (request["xialian"] != null)
+                    model.xialian = request["xialian"].ToString();
                 if (request["pageNumsbs"] != null)
                     pageNumsbs = request["pageNumsbs"].ToString();
                 if (request["printBoxNumber"] != null)
@@ -670,13 +680,30 @@
                     var fengmianyaoqiu = _sys_DictionaryBLL.GetDataByType("浣滀笟鏈皝闈㈠嵃鍒疯姹�");
                     var neixingzhizhang = _sys_DictionaryBLL.GetDataByType("浣滀笟鏈唴鑺焊寮�");
                     var neixingyaoqiu = _sys_DictionaryBLL.GetDataByType("浣滀笟鏈唴鑺嵃鍒疯姹�");
+                    printDemand = "<table border=\"1\" cellpadding=\"0\" cellspacing=\"0\" style=\"border-collapse: collapse;width: 650px; \">";
+                    printDemand += "<tr>";
+                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">搴忓彿</td>";
+                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍝佸悕</td>";
+                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">寮�鏈�</td>";
+                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鏁伴噺</td>";
+                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍗曚环</td>";
+                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">閲戦</td>";
+                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">灏侀潰绾稿紶</td>";
+                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍗板埛瑕佹眰</td>";
+                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍐呰姱绾稿紶</td>";
+                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍗板埛瑕佹眰</td>";
+                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">椤电爜</td>";
+                    printDemand += "</tr>";
                     for (int i = 0; i < hidWorkBookPageNum; i++)
                     {
-                        if ( i != 0 )
-                        {
-                            printDemand += "锛� ";
-                        }
-                        printDemand += "浣滀笟鏈�" + +(i + 1);
+                        printDemand += "<tr><td style=\"text-align:center;border: 1px solid #999999;\">" + (i + 1) + "</td>";
+                      
+
+                        //if ( i != 0 )
+                        //{
+                        //    printDemand += "锛� ";
+                        //}
+                        //printDemand += "浣滀笟鏈�" + +(i + 1);
                         inquiryWorkBookModel = new InquiryWorkBookModel();
                         if (request["WorkBookNamea" + (i + 1)] != null)
                         {
@@ -687,7 +714,8 @@
                             {
                                 inquiryWorkBookModel.WorkBookNameTxt = workBookType.PaperTypeName;
                             }
-                            printDemand += "锛屽搧鍚嶏細" + inquiryWorkBookModel.WorkBookNameTxt + "";
+                            // printDemand += "锛屽搧鍚嶏細" + inquiryWorkBookModel.WorkBookNameTxt + "";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookNameTxt + "</td>";
                         }
 
                         if (request["WorkBookSizea" + (i + 1)] != null)
@@ -719,13 +747,15 @@
                                 model.PrintSizeName = inquiryWorkBookModel.WorkBookSizeTxt;
                                 model.PrintSizeId = int.Parse(inquiryWorkBookModel.WorkBookSize);
                             }
-                            printDemand += "锛屽紑鏈細" + inquiryWorkBookModel.WorkBookSizeTxt + "";
+                            //printDemand += "锛屽紑鏈細" + inquiryWorkBookModel.WorkBookSizeTxt + "";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookSizeTxt + "</td>";
                         }
 
                         if (request["WorkBookCounta" + (i + 1)] != null)
                         {
                             inquiryWorkBookModel.WorkBookCount = request["WorkBookCounta" + (i + 1)].ToString();
-                            printDemand += "锛屾暟閲忥細" + inquiryWorkBookModel.WorkBookCount + "";
+                           // printDemand += "锛屾暟閲忥細" + inquiryWorkBookModel.WorkBookCount + "";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookCount + "</td>";
                         }
 
                         if (request["ysUnita" + (i + 1)] != null)
@@ -740,12 +770,13 @@
                             {
                                 model.Unit = int.Parse(inquiryWorkBookModel.ysUnit);
                             }
-                            printDemand += "锛屽崟浣嶏細" + inquiryWorkBookModel.ysUnitTxt + "";
+                           // printDemand += "锛屽崟浣嶏細" + inquiryWorkBookModel.ysUnitTxt + "";
                         }
                         if (request["WorkBookPricea" + (i + 1)] != null)
                         {
                             inquiryWorkBookModel.WorkBookPrice = request["WorkBookPricea" + (i + 1)].ToString();
-                            printDemand += "锛屽崟浠凤細" + inquiryWorkBookModel.WorkBookPrice + "";
+                            //printDemand += "锛屽崟浠凤細" + inquiryWorkBookModel.WorkBookPrice + "";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookPrice + "</td>";
                         }
 
                         if (request["hidefengmiana" + (i + 1)] != null)
@@ -770,7 +801,8 @@
                         if (request["WorkBookMoneya" + (i + 1)] != null)
                         {
                             inquiryWorkBookModel.WorkBookMoney = request["WorkBookMoneya" + (i + 1)].ToString();
-                            printDemand += "锛岄噾棰濓細" + inquiryWorkBookModel.WorkBookMoney + "";
+                           // printDemand += "锛岄噾棰濓細" + inquiryWorkBookModel.WorkBookMoney + "";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookMoney + "</td>";
                         }
                         if (request["WorkBookFengMiana" + (i + 1)] != null)
                         {
@@ -791,7 +823,8 @@
                                     inquiryWorkBookModel.WorkBookFengMianTxt = WorkBookFengMian.Name;
                                 }
                             }
-                            printDemand += "锛屽皝闈㈢焊寮狅細" + inquiryWorkBookModel.WorkBookFengMianTxt + "";
+                            //printDemand += "锛屽皝闈㈢焊寮狅細" + inquiryWorkBookModel.WorkBookFengMianTxt + "";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookFengMianTxt + "</td>";
                         }
 
                         if (request["FengMianYaoqiua" + (i + 1)] != null)
@@ -802,7 +835,8 @@
                             {
                                 inquiryWorkBookModel.FengMianYaoqiuTxt = FengMianYaoqiu.Name;
                             }
-                            printDemand += "锛屽嵃鍒疯姹傦細" + inquiryWorkBookModel.FengMianYaoqiuTxt + "";
+                            //printDemand += "锛屽嵃鍒疯姹傦細" + inquiryWorkBookModel.FengMianYaoqiuTxt + "";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.FengMianYaoqiuTxt + "</td>";
                         }
 
                         if (request["WorkBookNeiXinga" + (i + 1)] != null)
@@ -813,7 +847,8 @@
                             {
                                 inquiryWorkBookModel.WorkBookNeiXingTxt = WorkBookNeiXing.Name;
                             }
-                            printDemand += "锛屽唴鑺焊寮狅細" + inquiryWorkBookModel.WorkBookNeiXingTxt + "";
+                            //printDemand += "锛屽唴鑺焊寮狅細" + inquiryWorkBookModel.WorkBookNeiXingTxt + "";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookNeiXingTxt + "</td>";
                         }
 
                         if (request["NeiXingYaoqiua" + (i + 1)] != null)
@@ -824,16 +859,21 @@
                             {
                                 inquiryWorkBookModel.NeiXingYaoqiuTxt = NeiXingYaoqiu.Name;
                             }
-                            printDemand += "锛屽嵃鍒疯姹傦細" + inquiryWorkBookModel.NeiXingYaoqiuTxt + "";
+                            //printDemand += "锛屽嵃鍒疯姹傦細" + inquiryWorkBookModel.NeiXingYaoqiuTxt + "";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.NeiXingYaoqiuTxt + "</td>";
                         }
 
                         if (request["WorkBookpageNuma" + (i + 1)] != null)
                         {
                             inquiryWorkBookModel.WorkBookpageNum = request["WorkBookpageNuma" + (i + 1)].ToString();
-                            printDemand += "锛岄〉鏁帮細" + inquiryWorkBookModel.WorkBookpageNum + "";
+                            //printDemand += "锛岄〉鏁帮細" + inquiryWorkBookModel.WorkBookpageNum + "";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookpageNum + "</td>";
                         }
+                        printDemand += "</tr>";
                         model.InquiryWorkBookList.Add(inquiryWorkBookModel);
                     }
+
+                    printDemand += "</table>";
                 }
                 else if (model.PrintTypeId == 31) //骞垮憡绾告澂
                 {
@@ -1934,7 +1974,7 @@
                     if (model.PrintMode == 1)
                     {
                         printDemand += model.PaperMP + "锛�";
-
+                        printDemand += model.RLNum + "锛�";
                     }
                     else
                     {
@@ -1942,7 +1982,7 @@
                         PaperInfoBLL _paperInfoBLL = new PaperInfoBLL();
                         SysInquiry_PaperInfo paperInfo = _paperInfoBLL.GetPaperModel(model.PaperMP.ToInt32().Value);
                         printDemand += paperInfo.PaperName;
-                        if (model.PaperId != 0)
+                        if (model.PaperId != 0 && paperInfo.PaperName != "鏃犵⒊澶嶅啓绾�")
                         {
                             BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
                             SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
@@ -1950,8 +1990,43 @@
                             printDemand += "锛�" + model.GramWeight + "鍏�";
                         }
                         printDemand += "锛屾瘡鏈�" + model.PageNum + "浠斤紝";
+                        printDemand += model.RLNum + "锛�";
+                        if (paperInfo.PaperName == "鏃犵⒊澶嶅啓绾�")
+                        {
+                            if(model.RLNum == "涓よ仈")
+                            {
+                                printDemand += model.shanglian + "锛�";
+                                printDemand += model.xialian + "锛�";
+                            }
+                            else if (model.RLNum == "涓夎仈")
+                            {
+                                printDemand += model.shanglian + "锛�";
+                                printDemand += model.zhonglianlian1 + "锛�";
+                                printDemand += model.xialian + "锛�";
+                            }
+                            else if (model.RLNum == "鍥涜仈")
+                            {
+                                printDemand += model.shanglian + "锛�";
+                                printDemand += model.zhonglianlian1 + "锛�";
+                                printDemand += model.zhonglianlian2 + "锛�";
+                                printDemand += model.xialian + "锛�";
+                            }
+                            else if (model.RLNum == "浜旇仈")
+                            {
+                                printDemand += model.shanglian + "锛�";
+                                printDemand += model.zhonglianlian1 + "锛�";
+                                printDemand += model.zhonglianlian2 + "锛�";
+                                printDemand += model.zhonglianlian3 + "锛�";
+                                printDemand += model.xialian + "锛�";
+                            }
+
+                        }
+
+
+
+                       
                     }
-                    printDemand += model.RLNum + "锛�";
+                    
                     printDemand += model.PrintColor + "";
                   
 

--
Gitblit v1.9.1