From 938f7eae03fd367906b870a82be8513366f9bbfe Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 04 十一月 2025 17:35:38 +0800
Subject: [PATCH] 专版工单    画册和书刊     默认封面  4p

---
 CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs | 1099 +++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 790 insertions(+), 309 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..5e8d7ea 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -102,6 +102,7 @@
                 string works = string.Empty;
                 int printMode = 1;
                 int gramWeight = -1;
+                string Qitazhi = string.Empty;
                 int brandId = -1;
                 int printCount = -1;
                 string singleOrdouble = string.Empty;
@@ -153,11 +154,16 @@
                 {
                     paperId = 3;
                 }
+                if (request["Qitazhi0"] != null)
+                {
+                    Qitazhi = request["Qitazhi0"];
+                }
+                
                 if (request["gramWeight0"] != null)
-                    gramWeight = request["gramWeight0"].ToString().ToInt32().Value;
+                    gramWeight = request["gramWeight0"].ToInt32().HasValue? request["gramWeight0"].ToInt32().Value:0;
                 if (request["brand0"] != null)
                 {
-                    brandId = request["brand0"].ToString().ToInt32().Value;
+                    brandId = request["brand0"].ToInt32().HasValue ?request["brand0"].ToString().ToInt32().Value : 0;
                 }
                 if (request["printCount"] != null)
                     printCount = request["printCount"].ToString().ToInt32().Value;
@@ -189,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)
@@ -239,6 +255,7 @@
                 model.PaperId = paperId;
                 model.GramWeight = gramWeight;
                 model.BrandId = brandId;
+                model.Qitazhi = Qitazhi;
                 model.PrintCount = printCount;
                 model.Unit = ysuint;
                 model.SingleOrdouble = singleOrdouble;
@@ -352,9 +369,9 @@
                         insideModel.PaperId = 3;
                         insideModel.PrintColor = "鍥涜壊鍗板埛";
                         if (request["pageNum1"] != null)
-                            insideModel.PageNum = request["pageNum1"].ToString().ToInt32().Value;
+                            insideModel.PageNum = request["pageNum1"].ToInt32().HasValue ? request["pageNum1"].ToString().ToInt32().Value : 0;
                         if (request["gramWeight1"] != null)
-                            insideModel.GramWeight = request["gramWeight1"].ToString().ToInt32().Value;
+                            insideModel.GramWeight = request["gramWeight1"].ToInt32().HasValue? request["gramWeight1"].ToString().ToInt32().Value:0;
                         model.InquiryInsideList.Add(insideModel);
                         printDemand += paperSize.Name + "锛岄獞椹";
                         printDemand += "锛屽皝闈㈣姹傦細閾滅増绾革紝" + model.GramWeight + "鍏嬶紝" + model.PrintColor + "锛�4椤�";
@@ -401,13 +418,15 @@
                                 insideModel.PaperId = request["paper" + i].ToString().ToInt32().Value;
                             }
                             if (request["brand" + i] != null)
-                                insideModel.BrandId = request["brand" + i].ToString().ToInt32().Value;
+                                insideModel.BrandId = request["brand" + i].ToInt32().HasValue ? request["brand" + i].ToString().ToInt32().Value:0;
                             if (request["gramWeight" + i] != null)
-                                insideModel.GramWeight = request["gramWeight" + i].ToString().ToInt32().Value;
+                                insideModel.GramWeight = request["gramWeight" + i].ToInt32().HasValue ? request["gramWeight" + i].ToString().ToInt32().Value:0;
+                            if (request["Qitazhi" + i] != null)
+                                insideModel.Qitazhi = request["Qitazhi" + i];
                             if (request["printColor" + i] != null)
                                 insideModel.PrintColor = request["printColor" + i].ToString();
                             if (request["pageNum" + i] != null)
-                                insideModel.PageNum = request["pageNum" + i].ToString().ToInt32().Value;
+                                insideModel.PageNum = request["pageNum" + i].ToInt32().HasValue? request["pageNum" + i].ToInt32().Value:0;
                             if (request["works" + i] != null)
                                 works = request["works" + i].ToString();
                             if (!string.IsNullOrEmpty(works))
@@ -437,14 +456,25 @@
                                 insideModel.GildingType = request["gildingType" + i].ToString();
                             model.InquiryInsideList.Add(insideModel);
                         }
-                        PaperInfoBLL _paperInfoBLL = new PaperInfoBLL();
-                        SysInquiry_PaperInfo paperInfo = _paperInfoBLL.GetPaperModel(model.PaperId);
+
+
                         AfterParameterInfoBLL _afterParameterInfoBLL = new AfterParameterInfoBLL();
                         SysInquiry_AfterParameterInfo bindingModeObj = _afterParameterInfoBLL.GetModel(model.BindingMode);
                         printDemand += model.PrintSizeName + "锛�" + bindingModeObj.ParameterName;
-                        printDemand += "锛屽皝闈㈣姹傦細" + paperInfo.PaperName + "";
+                        PaperInfoBLL _paperInfoBLL = new PaperInfoBLL();
+                        SysInquiry_PaperInfo paperInfo = null;
+                        if (model.PaperId >= 0)
+                        {
+                            paperInfo = _paperInfoBLL.GetPaperModel(model.PaperId);
+                            printDemand += "锛屽皝闈㈣姹傦細" + paperInfo.PaperName + "";
+                        }
+                        else
+                        {
+                            printDemand += "锛屽皝闈㈣姹傦細" + model.Qitazhi + "";
+                        }
+                        
                         BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
-                        if (model.PaperId != 0)
+                        if (model.PaperId > 0)
                         {
                             SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                             printDemand += "(" + brandInfo.BrandName + ")";
@@ -455,16 +485,24 @@
                         foreach (InquiryInsideModel insideModelObj in model.InquiryInsideList)
                         {
                             printDemand += "鍐呴〉" + insideModelObj.InsideIndex.ToString() + "锛�";
-                            paperInfo = _paperInfoBLL.GetPaperModel(insideModelObj.PaperId);
-                            printDemand += paperInfo.PaperName;
-                            if (insideModelObj.PaperId != 0)
+                            if(insideModelObj.PaperId >= 0)
+                            {
+                                paperInfo = _paperInfoBLL.GetPaperModel(insideModelObj.PaperId);
+                                printDemand += paperInfo.PaperName;
+                            }
+                            else
+                            {
+                                printDemand += insideModelObj.Qitazhi;
+                            }
+                           
+                            if (insideModelObj.PaperId > 0)
                             {
                                 SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(insideModelObj.BrandId);
                                 printDemand += "(" + brandInfo.BrandName + ")";
                                 printDemand += "锛�" + insideModelObj.GramWeight + "鍏�";
                             }
                             printDemand += "锛�" + insideModelObj.PrintColor + "锛�" + insideModelObj.PageNum.ToString();
-                            if (paperInfo.PaperName == "纭吀绾�")
+                            if (insideModelObj.PaperId >= 0 && paperInfo.PaperName == "纭吀绾�")
                             {
                                 printDemand += "寮�";
                             }
@@ -527,13 +565,15 @@
                             insideModel.PaperId = request["paper" + i].ToString().ToInt32().Value;
                         }
                         if (request["brand" + i] != null)
-                            insideModel.BrandId = request["brand" + i].ToString().ToInt32().Value;
+                            insideModel.BrandId = request["brand" + i].ToInt32().HasValue ? request["brand" + i].ToString().ToInt32().Value:0;
                         if (request["gramWeight" + i] != null)
-                            insideModel.GramWeight = request["gramWeight" + i].ToString().ToInt32().Value;
+                            insideModel.GramWeight = request["gramWeight" + i].ToInt32().HasValue? request["gramWeight" + i].ToString().ToInt32().Value:0;
+                        if (request["Qitazhi" + i] != null)
+                            insideModel.Qitazhi = request["Qitazhi" + i];
                         if (request["printColor" + i] != null)
                             insideModel.PrintColor = request["printColor" + i].ToString();
                         if (request["pageNum" + i] != null)
-                            insideModel.PageNum = request["pageNum" + i].ToString().ToInt32().Value;
+                            insideModel.PageNum = request["pageNum" + i].ToInt32().HasValue ? request["pageNum" + i].ToString().ToInt32().Value:0;
                         if (request["works" + i] != null)
                             works = request["works" + i].ToString();
                         if (!string.IsNullOrEmpty(works))
@@ -564,13 +604,21 @@
                         model.InquiryInsideList.Add(insideModel);
                     }
                     PaperInfoBLL _paperInfoBLL = new PaperInfoBLL();
-                    SysInquiry_PaperInfo paperInfo = _paperInfoBLL.GetPaperModel(model.PaperId);
+                    SysInquiry_PaperInfo paperInfo = null;
                     AfterParameterInfoBLL _afterParameterInfoBLL = new AfterParameterInfoBLL();
                     SysInquiry_AfterParameterInfo bindingModeObj = _afterParameterInfoBLL.GetModel(model.BindingMode);
                     printDemand += model.PrintSizeName + "锛�" + bindingModeObj.ParameterName;
-                    printDemand += "锛屽皝闈㈣姹傦細" + paperInfo.PaperName + "";
+                    if(model.PaperId >= 0)
+                    {
+                        paperInfo = _paperInfoBLL.GetPaperModel(model.PaperId);
+                        printDemand += "锛屽皝闈㈣姹傦細" + paperInfo.PaperName + "";
+                    }
+                    else
+                    {
+                        printDemand += "锛屽皝闈㈣姹傦細" + model.Qitazhi + "";
+                    }
                     BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
-                    if (model.PaperId != 0)
+                    if (model.PaperId > 0)
                     {
                         SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                         printDemand += "(" + brandInfo.BrandName + ")";
@@ -581,16 +629,24 @@
                     foreach (InquiryInsideModel insideModelObj in model.InquiryInsideList)
                     {
                         printDemand += "鍐呴〉" + insideModelObj.InsideIndex.ToString() + "锛�";
-                        paperInfo = _paperInfoBLL.GetPaperModel(insideModelObj.PaperId);
-                        printDemand += paperInfo.PaperName;
-                        if (insideModelObj.PaperId != 0)
+                       
+                        if (insideModelObj.PaperId >= 0)
+                        {
+                            paperInfo = _paperInfoBLL.GetPaperModel(insideModelObj.PaperId);
+                            printDemand += paperInfo.PaperName;
+                        }
+                        else
+                        {
+                            printDemand += insideModelObj.Qitazhi;
+                        }
+                        if (insideModelObj.PaperId > 0)
                         {
                             SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(insideModelObj.BrandId);
                             printDemand += "(" + brandInfo.BrandName + ")";
                             printDemand += "锛�" + insideModelObj.GramWeight + "鍏�";
                         }
                         printDemand += "锛�" + insideModelObj.PrintColor + "锛�" + insideModelObj.PageNum.ToString();
-                        if (paperInfo.PaperName == "纭吀绾�")
+                        if (insideModelObj.PaperId >= 0 && paperInfo.PaperName == "纭吀绾�")
                         {
                             printDemand += "寮�";
                         }
@@ -624,13 +680,31 @@
                     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 += "<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)
                         {
@@ -641,7 +715,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)
@@ -673,13 +748,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)
@@ -694,12 +771,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)
@@ -724,7 +802,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)
                         {
@@ -745,7 +824,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)
@@ -756,7 +836,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)
@@ -767,7 +848,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)
@@ -778,16 +860,31 @@
                             {
                                 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>";
                         }
+                        if (request["bindingMode" + (i + 1)] != null)
+                        {
+                            inquiryWorkBookModel.bindingMode = request["bindingMode" + (i + 1)].ToString();
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.bindingMode + "</td>";
+                        }
+                        else
+                        {
+                            inquiryWorkBookModel.bindingMode = "";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\"></td>";
+                        }
+                        printDemand += "</tr>";
                         model.InquiryWorkBookList.Add(inquiryWorkBookModel);
                     }
+
+                    printDemand += "</table>";
                 }
                 else if (model.PrintTypeId == 31) //骞垮憡绾告澂
                 {
@@ -800,10 +897,28 @@
                 }
                 else if (model.PrintTypeId == 38) //涔﹀垔
                 {
+                    printDemand = "<table border=\"1\" cellpadding=\"0\" cellspacing=\"0\" style=\"border-collapse: collapse;width: 100%; \">";
+                    //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 += "<td style=\"text-align:center;border: 1px solid #999999;\">瑁呰</td>";
+                    //printDemand += "</tr>";
+
+                    printDemand += "<tr>";
                     if (request["papershijuan"] != null)
                     {
                         model.papershijuan = request["papershijuan"].ToString();
-                        printDemand += "  璇曞嵎锛氱焊寮狅細" + model.papershijuan + "锛�";
+                        printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">璇曞嵎锛氱焊寮狅細" + model.papershijuan + "</td>";
+                       // printDemand += "  璇曞嵎锛氱焊寮狅細" + model.papershijuan + "锛�";
                     }
 
 
@@ -814,14 +929,16 @@
                         {
                             SysInquiry_PaperSizeDetail paperSize = _paperSizeDetailBLL.GetPaperSizeDetail(model.PrintTypeId, model.PrintSizeId);
                             model.PrintSizeName = paperSize.Name;
-                            printDemand += "鎴愬搧灏哄锛�4P " + paperSize.Name + "锛�";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鎴愬搧灏哄锛�4P " + paperSize.Name + "</td>";
+                            //printDemand += "鎴愬搧灏哄锛�4P " + paperSize.Name + "锛�";
                         }
                         else if (model.PrintSizeId == -1)
                         {
                             model.PrintSizeName = request["txtFirstSize"].ToString() + "脳" + request["txtSecondSize"].ToString();
                             model.firstSize = request["txtFirstSize"].ToString();
                             model.secondSize = request["txtSecondSize"].ToString();
-                            printDemand += "鎴愬搧灏哄锛�4P " + model.PrintSizeName + "锛�";
+                            // printDemand += "鎴愬搧灏哄锛�4P " + model.PrintSizeName + "锛�";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鎴愬搧灏哄锛�4P " + model.PrintSizeName + "</td>";
                         }
                     }
 
@@ -834,11 +951,13 @@
                             model.PrintSizeName6P = request["txtFirstSize6P"].ToString() + "脳" + request["txtSecondSize6P"].ToString();
                             model.firstSize6P = request["txtFirstSize6P"].ToString();
                             model.secondSize6P = request["txtSecondSize6P"].ToString();
-                            printDemand += "6P " + model.PrintSizeName + "锛�";
+                            //printDemand += "6P " + model.PrintSizeName + "锛�";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">6P " + model.PrintSizeName + "</td>";
                         }
                         else
                         {
-                            printDemand += "6P " + model.paperSize6P + "锛�";
+                            //printDemand += "6P " + model.paperSize6P + "锛�";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">6P " + model.paperSize6P + "</td>";
                         }
                     }
 
@@ -850,72 +969,88 @@
                             model.PrintSizeName8P = request["txtFirstSize8P"].ToString() + "脳" + request["txtSecondSize8P"].ToString();
                             model.firstSize8P = request["txtFirstSize8P"].ToString();
                             model.secondSize8P = request["txtSecondSize8P"].ToString();
-                            printDemand += "8P " + model.PrintSizeName + "锛�";
+                            //printDemand += "8P " + model.PrintSizeName + "锛�";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">8P " + model.PrintSizeName + "</td>";
                         }
                         else
                         {
-                            printDemand += "8P " + model.paperSize8P + "锛�";
+                            //printDemand += "8P " + model.paperSize8P + "锛�";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">8P " + model.paperSize8P + "</td>";
                         }
                     }
 
                     if (request["papershijuan"] != null)
                     {
                         model.printColorshijuan = request["printColorshijuan"].ToString();
-                        printDemand += "璇曞嵎琚嬬焊寮狅細" + model.printColorshijuan + "锛�";
+                        //printDemand += "璇曞嵎琚嬬焊寮狅細" + model.printColorshijuan + "锛�";
+                        printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">璇曞嵎琚嬬焊寮狅細" + model.printColorshijuan + "</td>";
                     }
-
-                    if (request["paper1"] != null)
+                    printDemand += "</tr>";
+                    printDemand += "<tr>";
+                    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 + "锛�";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">绛旈鍗★細绾稿紶锛�" + model.paper1 + "</td>";
                         }
-                        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 + "锛�";
+                                printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鎴愬搧灏哄锛欰4 " + model.PrintSizeNameA4 + "</td>";
+                            }
+                            else
+                            {
+                                //printDemand += "鎴愬搧灏哄锛欰4 " + model.paperSizeA4 + "锛�";
+                                printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鎴愬搧灏哄锛欰4 " + model.paperSizeA4 + "</td>";
+                            }
+                        }
+
+                        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 + "锛�";
+                                printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">A3 " + model.PrintSizeName + "</td>";
+                            }
+                            else
+                            {
+                                //printDemand += "A3 " + model.paperSizeA3 + "锛�";
+                                printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">A3 " + model.paperSizeA3 + "</td>";
+                            }
+                        }
+                        if (request["printColor1"] != null)
+                        {
+                            model.printColor1 = request["printColor1"].ToString();
+                            //printDemand += "鍗板埛棰滆壊锛�" + model.printColor1 + "锛�";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍗板埛棰滆壊锛�" + model.printColor1 + "</td>";
+                        }
+
+                        if (request["printColor2"] != null)
+                        {
+                            model.printColor2 = request["printColor2"].ToString();
+                            //printDemand += "绛旈鍗¤绾稿紶锛�" + model.printColor2 + "锛�";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">绛旈鍗¤绾稿紶锛�" + model.printColor2 + "</td>";
                         }
                     }
+                    printDemand += "</tr>";
 
-                    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 + "锛�";
-                    }
-
-
+                    printDemand += "</table>";
+                   
                     InquirySHiJuanModel inquirySHiJuanModel = null;
 
                     if (request["selNianji"] != null)
@@ -975,14 +1110,31 @@
                         string[] sixiangpingdedatikacheckboxinput = request["sixiangpingdedatikacheckboxinput"]?.Split(',');
                         string[] sixiangpingdedatikaselect = request["sixiangpingdedatikaselect"]?.Split(',');
 
+                        string dilidatikahebingcheckbox = request["dilidatikahebingcheckbox"]??"";
+                        string lishidatikahebingcheckbox = request["lishidatikahebingcheckbox"] ?? "";
+                        string shengwudatikahebingcheckbox = request["shengwudatikahebingcheckbox"] ?? "";
+                        string sixiangpingdedatikahebingcheckbox = request["sixiangpingdedatikahebingcheckbox"] ?? "";
+                        dilidatikahebingcheckbox = "," + dilidatikahebingcheckbox + ",";
+                        lishidatikahebingcheckbox = "," + lishidatikahebingcheckbox + ",";
+                        shengwudatikahebingcheckbox = "," + shengwudatikahebingcheckbox + ",";
+                        sixiangpingdedatikahebingcheckbox = "," + sixiangpingdedatikahebingcheckbox + ",";
                         for (int i=0;i< sss; i++)
                         {
+
+                            printDemand += "<table border=\"1\" cellpadding=\"0\" cellspacing=\"0\" style=\"border-collapse: collapse;width: 100%; \">";
+                            printDemand += "<tr>";
+
                             inquirySHiJuanModel = new InquirySHiJuanModel();
 
                             inquirySHiJuanModel.Nianji = selNianji[i];
-                            printDemand += (i+1) + "骞寸骇锛�" + inquirySHiJuanModel.Nianji + "锛�";
+                            //printDemand += (i+1) + "骞寸骇锛�" + inquirySHiJuanModel.Nianji + "锛�";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">"+(i+1) + "骞寸骇锛�" + inquirySHiJuanModel.Nianji + " </td>";
                             inquirySHiJuanModel.txtRenshu = txtRenshu[i];
-                            printDemand += "浜烘暟锛�" + inquirySHiJuanModel.txtRenshu + "锛�";
+                            //printDemand += "浜烘暟锛�" + inquirySHiJuanModel.txtRenshu + "锛�";
+                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">浜烘暟锛�" + inquirySHiJuanModel.txtRenshu + " </td>";
+
+                            printDemand += "</tr>";
+                            printDemand += "</table>";
 
                             inquirySHiJuanModel.yuwencheckboxinput = yuwencheckboxinput[i];
                           
@@ -1037,19 +1189,62 @@
                             inquirySHiJuanModel.zhengzhidatikaselect = zhengzhidatikaselect[i];
                             inquirySHiJuanModel.sixiangpingdedatikacheckboxinput = sixiangpingdedatikacheckboxinput[i];
                             inquirySHiJuanModel.sixiangpingdedatikaselect = sixiangpingdedatikaselect[i];
-                           
+
+                          
+                            var ssscishu = "," + (i + 1) + ",";
+                            if (dilidatikahebingcheckbox.IndexOf(ssscishu) >= 0)
+                            {
+                                inquirySHiJuanModel.dilidatikahebingcheckbox = ""+(i + 1);
+                            }
+                            else
+                            {
+                                inquirySHiJuanModel.dilidatikahebingcheckbox = "";
+                            }
+                            if (lishidatikahebingcheckbox.IndexOf(ssscishu) >= 0)
+                            {
+                                inquirySHiJuanModel.lishidatikahebingcheckbox = "" + (i + 1);
+                            }
+                            else
+                            {
+                                inquirySHiJuanModel.lishidatikahebingcheckbox = "";
+                            }
+                            if (shengwudatikahebingcheckbox.IndexOf(ssscishu) >= 0)
+                            {
+                                inquirySHiJuanModel.shengwudatikahebingcheckbox = "" + (i + 1);
+                            }
+                            else
+                            {
+                                inquirySHiJuanModel.shengwudatikahebingcheckbox = "";
+                            }
+                            if (sixiangpingdedatikahebingcheckbox.IndexOf(ssscishu) >= 0)
+                            {
+                                inquirySHiJuanModel.sixiangpingdedatikahebingcheckbox = "" + (i + 1);
+                            }
+                            else
+                            {
+                                inquirySHiJuanModel.sixiangpingdedatikahebingcheckbox = "";
+                            }
+
+                            printDemand += "<table border=\"1\" cellpadding=\"0\" cellspacing=\"0\" style=\"border-collapse: collapse;width: 100%; \">";
+                            printDemand += "<tr>";
+
                             if (inquirySHiJuanModel.Nianji != "楂樻牎璇曞嵎")
                             {
-                                printDemand += "璇曞嵎锛�";
+                               // printDemand += "璇曞嵎锛�";
+                                printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">璇曞嵎锛�</td>";
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.yuwencheckboxinput))
                                 {
-                                    printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwencheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.yuwenselect + "锛�";
+                                    //printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwencheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.yuwenselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">璇枃锛�" + inquirySHiJuanModel.yuwencheckboxinput + "寮狅紝"+ inquirySHiJuanModel.yuwenselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.shuxuecheckboxinput))
                                 {
-                                    printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuecheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.shuxueselect + "锛�";
+                                    //printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuecheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.shuxueselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鏁板锛�" + inquirySHiJuanModel.shuxuecheckboxinput + "寮狅紝" + inquirySHiJuanModel.shuxueselect + "</td>";
                                 }
 
                             }
@@ -1060,8 +1255,10 @@
                             {
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.pingdecheckboxinput))
                                 {
-                                    printDemand += "鍝佸痉涓庣敓娲伙細" + inquirySHiJuanModel.pingdecheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.pingdeselect + "锛�";
+                                    //printDemand += "鍝佸痉涓庣敓娲伙細" + inquirySHiJuanModel.pingdecheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.pingdeselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍝佸痉涓庣敓娲伙細" + inquirySHiJuanModel.pingdecheckboxinput + "寮狅紝" + inquirySHiJuanModel.pingdeselect + "</td>";
                                 }
                               
                             }
@@ -1069,18 +1266,24 @@
                             {
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
                                 {
-                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+                                    //printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝" + inquirySHiJuanModel.yingyuselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.kexuecheckboxinput))
                                 {
-                                    printDemand += "绉戝锛�" + inquirySHiJuanModel.kexuecheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.kexueselect + "锛�";
+                                    //printDemand += "绉戝锛�" + inquirySHiJuanModel.kexuecheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.kexueselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">绉戝锛�" + inquirySHiJuanModel.kexuecheckboxinput + "寮狅紝" + inquirySHiJuanModel.kexueselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.pingdecheckboxinput))
                                 {
-                                    printDemand += "鍝佸痉涓庣敓娲伙細" + inquirySHiJuanModel.pingdecheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.pingdeselect + "锛�";
+                                    //printDemand += "鍝佸痉涓庣敓娲伙細" + inquirySHiJuanModel.pingdecheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.pingdeselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍝佸痉涓庣敓娲伙細" + inquirySHiJuanModel.pingdecheckboxinput + "寮狅紝" + inquirySHiJuanModel.pingdeselect + "</td>";
                                 }
 
                               
@@ -1090,143 +1293,201 @@
                             {
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
                                 {
-                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+                                    //printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝" + inquirySHiJuanModel.yingyuselect + "</td>";
                                 }
+
+
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishicheckboxinput))
                                 {
-                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.lishiselect + "锛�";
+                                    //printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.lishiselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝" + inquirySHiJuanModel.lishiselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.dilicheckboxinput))
                                 {
-                                    printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilicheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.diliselect + "锛�";
+                                    //printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilicheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.diliselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍦扮悊锛�" + inquirySHiJuanModel.dilicheckboxinput + "寮狅紝" + inquirySHiJuanModel.diliselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwucheckboxinput))
                                 {
-                                    printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwucheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.shengwuselect + "锛�";
+                                    //printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwucheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.shengwuselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鐢熺墿锛�" + inquirySHiJuanModel.shengwucheckboxinput + "寮狅紝" + inquirySHiJuanModel.shengwuselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdecheckboxinput))
                                 {
-                                    printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.sixiangpingdeselect + "锛�";
+                                    //printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.sixiangpingdeselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝" + inquirySHiJuanModel.sixiangpingdeselect + "</td>";
                                 }
 
-
-
-                                printDemand += "绛旈鍗★細";
+                                printDemand += "</tr>";
+                                printDemand += "<tr>";
+                                // printDemand += "绛旈鍗★細";
+                                printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">绛旈鍗★細</td>";
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.yuwendatikacheckboxinput))
                                 {
-                                    printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.yuwendatikaselect + "锛�";
+                                    //printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.yuwendatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.yuwendatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.shuxuedatikacheckboxinput))
                                 {
-                                    printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.shuxuedatikaselect + "锛�";
+                                    //printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.shuxuedatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.shuxuedatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyudatikacheckboxinput))
                                 {
-                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.yingyudatikaselect + "锛�";
+                                    //printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.yingyudatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.yingyudatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishidatikacheckboxinput))
                                 {
-                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.lishidatikaselect + "锛�";
+                                    //printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.lishidatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.lishidatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.dilidatikacheckboxinput))
                                 {
-                                    printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilidatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.dilidatikaselect + "锛�";
+                                    //printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilidatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.dilidatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍦扮悊锛�" + inquirySHiJuanModel.dilidatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.dilidatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwudatikacheckboxinput))
                                 {
-                                    printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwudatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.shengwudatikaselect + "锛�";
+                                    //printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwudatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.shengwudatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鐢熺墿锛�" + inquirySHiJuanModel.shengwudatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.shengwudatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdedatikacheckboxinput))
                                 {
-                                    printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.sixiangpingdedatikaselect + "锛�";
+                                    //printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.sixiangpingdedatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.sixiangpingdedatikaselect + "</td>";
                                 }
                             }
                             else if (inquirySHiJuanModel.Nianji == "鍏勾绾�")
                             {
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
                                 {
-                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+                                    //printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝" + inquirySHiJuanModel.yingyuselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishicheckboxinput))
                                 {
-                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.lishiselect + "锛�";
+                                    //printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.lishiselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝" + inquirySHiJuanModel.lishiselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.dilicheckboxinput))
                                 {
-                                    printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilicheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.diliselect + "锛�";
+                                    //printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilicheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.diliselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍦扮悊锛�" + inquirySHiJuanModel.dilicheckboxinput + "寮狅紝" + inquirySHiJuanModel.diliselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwucheckboxinput))
                                 {
-                                    printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwucheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.shengwuselect + "锛�";
+                                    //printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwucheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.shengwuselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鐢熺墿锛�" + inquirySHiJuanModel.shengwucheckboxinput + "寮狅紝" + inquirySHiJuanModel.shengwuselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.wulicheckboxinput))
                                 {
-                                    printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulicheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.wuliselect + "锛�";
+                                    //printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulicheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.wuliselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鐗╃悊锛�" + inquirySHiJuanModel.wulicheckboxinput + "寮狅紝" + inquirySHiJuanModel.wuliselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdecheckboxinput))
                                 {
-                                    printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.sixiangpingdeselect + "锛�";
+                                    //printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.sixiangpingdeselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝" + inquirySHiJuanModel.sixiangpingdeselect + "</td>";
                                 }
 
-                                printDemand += "绛旈鍗★細";
+                                printDemand += "</tr>";
+                                printDemand += "<tr>";
+                                // printDemand += "绛旈鍗★細";
+                                printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">绛旈鍗★細</td>";
 
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.yuwendatikacheckboxinput))
                                 {
-                                    printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.yuwendatikaselect + "锛�";
+                                    //printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.yuwendatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.yuwendatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.shuxuedatikacheckboxinput))
                                 {
-                                    printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.shuxuedatikaselect + "锛�";
+                                    //printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.shuxuedatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.shuxuedatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyudatikacheckboxinput))
                                 {
-                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.yingyudatikaselect + "锛�";
+                                    //printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.yingyudatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.yingyudatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishidatikacheckboxinput))
                                 {
-                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.lishidatikaselect + "锛�";
+                                    //printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.lishidatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.lishidatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.dilidatikacheckboxinput))
                                 {
-                                    printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilidatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.dilidatikaselect + "锛�";
+                                    //printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilidatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.dilidatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍦扮悊锛�" + inquirySHiJuanModel.dilidatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.dilidatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwudatikacheckboxinput))
                                 {
-                                    printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwudatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.shengwudatikaselect + "锛�";
+                                    //printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwudatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.shengwudatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鐢熺墿锛�" + inquirySHiJuanModel.shengwudatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.shengwudatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.wulidatikacheckboxinput))
                                 {
-                                    printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulidatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.wulidatikaselect + "锛�";
+                                    //printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulidatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.wulidatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鐗╃悊锛�" + inquirySHiJuanModel.wulidatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.wulidatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdedatikacheckboxinput))
                                 {
-                                    printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.sixiangpingdedatikaselect + "锛�";
+                                    //printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.sixiangpingdedatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.sixiangpingdedatikaselect + "</td>";
                                 }
 
                                
@@ -1235,68 +1496,94 @@
                             {
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
                                 {
-                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+                                    //printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝" + inquirySHiJuanModel.yingyuselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishicheckboxinput))
                                 {
-                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.lishiselect + "锛�";
+                                    //printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.lishiselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝" + inquirySHiJuanModel.lishiselect + "</td>";
                                 }
                                  
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.wulicheckboxinput))
                                 {
-                                    printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulicheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.wuliselect + "锛�";
+                                    //printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulicheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.wuliselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鐗╃悊锛�" + inquirySHiJuanModel.wulicheckboxinput + "寮狅紝" + inquirySHiJuanModel.wuliselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.huaxuecheckboxinput))
                                 {
-                                    printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuecheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.huaxueselect + "锛�";
+                                    //printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuecheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.huaxueselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍖栧锛�" + inquirySHiJuanModel.huaxuecheckboxinput + "寮狅紝" + inquirySHiJuanModel.huaxueselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdecheckboxinput))
                                 {
-                                    printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.sixiangpingdeselect + "锛�";
-                                }
+                                    //printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.sixiangpingdeselect + "锛�";
 
-                                printDemand += "绛旈鍗★細";
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝" + inquirySHiJuanModel.sixiangpingdeselect + "</td>";
+                                }
+                                printDemand += "</tr>";
+                                printDemand += "<tr>";
+                                //printDemand += "绛旈鍗★細";
+                                printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">绛旈鍗★細</td>";
 
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.yuwendatikacheckboxinput))
                                 {
-                                    printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.yuwendatikaselect + "锛�";
+                                    //printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.yuwendatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.yuwendatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.shuxuedatikacheckboxinput))
                                 {
-                                    printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.shuxuedatikaselect + "锛�";
+                                    //printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.shuxuedatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.shuxuedatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyudatikacheckboxinput))
                                 {
-                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.yingyudatikaselect + "锛�";
+                                    //printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.yingyudatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.yingyudatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishidatikacheckboxinput))
                                 {
-                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.lishidatikaselect + "锛�";
+                                    //printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.lishidatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.lishidatikaselect + "</td>";
                                 }
                                 
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.wulidatikacheckboxinput))
                                 {
-                                    printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulidatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.wulidatikaselect + "锛�";
+                                    //printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulidatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.wulidatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鐗╃悊锛�" + inquirySHiJuanModel.wulidatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.wulidatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.huaxuedatikacheckboxinput))
                                 {
-                                    printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuedatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.huaxuedatikaselect + "锛�";
+                                    //printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuedatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.huaxuedatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍖栧锛�" + inquirySHiJuanModel.huaxuedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.huaxuedatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdedatikacheckboxinput))
                                 {
-                                    printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.sixiangpingdedatikaselect + "锛�";
+                                    //printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.sixiangpingdedatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.sixiangpingdedatikaselect + "</td>";
                                 }
 
                                 
@@ -1305,167 +1592,244 @@
                             {
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
                                 {
-                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+                                    //printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝" + inquirySHiJuanModel.yingyuselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishicheckboxinput))
                                 {
-                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.lishiselect + "锛�";
+                                    //printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.lishiselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝" + inquirySHiJuanModel.lishiselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.dilicheckboxinput))
                                 {
-                                    printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilicheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.diliselect + "锛�";
+                                    //printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilicheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.diliselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍦扮悊锛�" + inquirySHiJuanModel.dilicheckboxinput + "寮狅紝" + inquirySHiJuanModel.diliselect + "</td>";
                                 }
                                
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.wulicheckboxinput))
                                 {
-                                    printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulicheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.wuliselect + "锛�";
+                                    //printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulicheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.wuliselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鐗╃悊锛�" + inquirySHiJuanModel.wulicheckboxinput + "寮狅紝" + inquirySHiJuanModel.wuliselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.huaxuecheckboxinput))
                                 {
-                                    printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuecheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.huaxueselect + "锛�";
+                                    //printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuecheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.huaxueselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍖栧锛�" + inquirySHiJuanModel.huaxuecheckboxinput + "寮狅紝" + inquirySHiJuanModel.huaxueselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.zhengzhicheckboxinput))
                                 {
-                                    printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhicheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.zhengzhiselect + "锛�";
-                                }
+                                    //printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhicheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.zhengzhiselect + "锛�";
 
-                                printDemand += "绛旈鍗★細";
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鏀挎不锛�" + inquirySHiJuanModel.zhengzhicheckboxinput + "寮狅紝" + inquirySHiJuanModel.zhengzhiselect + "</td>";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwucheckboxinput))
+                                {
+                                    //printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwucheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.shengwuselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鐢熺墿锛�" + inquirySHiJuanModel.shengwucheckboxinput + "寮狅紝" + inquirySHiJuanModel.shengwuselect + "</td>";
+                                }
+                                printDemand += "</tr>";
+                                printDemand += "<tr>";
+                                //printDemand += "绛旈鍗★細";
+                                printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">绛旈鍗★細</td>";
 
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.yuwendatikacheckboxinput))
                                 {
-                                    printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.yuwendatikaselect + "锛�";
+                                    //printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.yuwendatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.yuwendatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.shuxuedatikacheckboxinput))
                                 {
-                                    printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.shuxuedatikaselect + "锛�";
+                                    //printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.shuxuedatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.shuxuedatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyudatikacheckboxinput))
                                 {
-                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.yingyudatikaselect + "锛�";
+                                    //printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.yingyudatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.yingyudatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishidatikacheckboxinput))
                                 {
-                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.lishidatikaselect + "锛�";
+                                    //printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.lishidatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.lishidatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.dilidatikacheckboxinput))
                                 {
-                                    printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilidatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.dilidatikaselect + "锛�";
+                                    //printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilidatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.dilidatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍦扮悊锛�" + inquirySHiJuanModel.dilidatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.dilidatikaselect + "</td>";
                                 }
                                 
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.wulidatikacheckboxinput))
                                 {
-                                    printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulidatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.wulidatikaselect + "锛�";
+                                    //printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulidatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.wulidatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鐗╃悊锛�" + inquirySHiJuanModel.wulidatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.wulidatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.huaxuedatikacheckboxinput))
                                 {
-                                    printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuedatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.huaxuedatikaselect + "锛�";
+                                    //printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuedatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.huaxuedatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍖栧锛�" + inquirySHiJuanModel.huaxuedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.huaxuedatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.zhengzhidatikacheckboxinput))
                                 {
-                                    printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhidatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.zhengzhidatikaselect + "锛�";
+                                    //printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhidatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.zhengzhidatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鏀挎不锛�" + inquirySHiJuanModel.zhengzhidatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.zhengzhidatikaselect + "</td>";
                                 }
- 
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwudatikacheckboxinput))
+                                {
+                                    //printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwudatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.shengwudatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鐢熺墿锛�" + inquirySHiJuanModel.shengwudatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.shengwudatikaselect + "</td>";
+                                }
                             }
                             else if (inquirySHiJuanModel.Nianji == "楂樹簩")
                             {
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
                                 {
-                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+                                    //printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝" + inquirySHiJuanModel.yingyuselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishicheckboxinput))
                                 {
-                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.lishiselect + "锛�";
+                                    //printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.lishiselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝" + inquirySHiJuanModel.lishiselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.dilicheckboxinput))
                                 {
-                                    printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilicheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.diliselect + "锛�";
+                                    //printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilicheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.diliselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍦扮悊锛�" + inquirySHiJuanModel.dilicheckboxinput + "寮狅紝" + inquirySHiJuanModel.diliselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwucheckboxinput))
                                 {
-                                    printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwucheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.shengwuselect + "锛�";
+                                    //printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwucheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.shengwuselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鐢熺墿锛�" + inquirySHiJuanModel.shengwucheckboxinput + "寮狅紝" + inquirySHiJuanModel.shengwuselect + "</td>";
                                 }
 
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.wulicheckboxinput))
                                 {
-                                    printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulicheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.wuliselect + "锛�";
+                                    //printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulicheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.wuliselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鐗╃悊锛�" + inquirySHiJuanModel.wulicheckboxinput + "寮狅紝" + inquirySHiJuanModel.wuliselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.huaxuecheckboxinput))
                                 {
-                                    printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuecheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.huaxueselect + "锛�";
+                                    //printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuecheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.huaxueselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍖栧锛�" + inquirySHiJuanModel.huaxuecheckboxinput + "寮狅紝" + inquirySHiJuanModel.huaxueselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.zhengzhicheckboxinput))
                                 {
-                                    printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhicheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.zhengzhiselect + "锛�";
-                                }
+                                    //printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhicheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.zhengzhiselect + "锛�";
 
-                                printDemand += "绛旈鍗★細";
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鏀挎不锛�" + inquirySHiJuanModel.zhengzhicheckboxinput + "寮狅紝" + inquirySHiJuanModel.zhengzhiselect + "</td>";
+                                }
+                                printDemand += "</tr>";
+                                printDemand += "<tr>";
+                                //printDemand += "绛旈鍗★細";
+                                printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">绛旈鍗★細</td>";
 
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.yuwendatikacheckboxinput))
                                 {
-                                    printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.yuwendatikaselect + "锛�";
+                                    //printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.yuwendatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.yuwendatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.shuxuedatikacheckboxinput))
                                 {
-                                    printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.shuxuedatikaselect + "锛�";
+                                    //printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.shuxuedatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.shuxuedatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyudatikacheckboxinput))
                                 {
-                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.yingyudatikaselect + "锛�";
+                                    //printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.yingyudatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.yingyudatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishidatikacheckboxinput))
                                 {
-                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.lishidatikaselect + "锛�";
+                                    //printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.lishidatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.lishidatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.dilidatikacheckboxinput))
                                 {
-                                    printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilidatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.dilidatikaselect + "锛�";
+                                    //printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilidatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.dilidatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍦扮悊锛�" + inquirySHiJuanModel.dilidatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.dilidatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwudatikacheckboxinput))
                                 {
-                                    printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwudatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.shengwudatikaselect + "锛�";
+                                    //printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwudatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.shengwudatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鐢熺墿锛�" + inquirySHiJuanModel.shengwudatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.shengwudatikaselect + "</td>";
                                 }
 
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.wulidatikacheckboxinput))
                                 {
-                                    printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulidatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.wulidatikaselect + "锛�";
+                                    //printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulidatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.wulidatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鐗╃悊锛�" + inquirySHiJuanModel.wulidatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.wulidatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.huaxuedatikacheckboxinput))
                                 {
-                                    printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuedatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.huaxuedatikaselect + "锛�";
+                                    //printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuedatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.huaxuedatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍖栧锛�" + inquirySHiJuanModel.huaxuedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.huaxuedatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.zhengzhidatikacheckboxinput))
                                 {
-                                    printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhidatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.zhengzhidatikaselect + "锛�";
+                                    //printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhidatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.zhengzhidatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鏀挎不锛�" + inquirySHiJuanModel.zhengzhidatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.zhengzhidatikaselect + "</td>";
                                 }
 
                                
@@ -1474,94 +1838,132 @@
                             {
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
                                 {
-                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+                                    //printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝" + inquirySHiJuanModel.yingyuselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishicheckboxinput))
                                 {
-                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.lishiselect + "锛�";
+                                    //printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.lishiselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝" + inquirySHiJuanModel.lishiselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.dilicheckboxinput))
                                 {
-                                    printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilicheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.diliselect + "锛�";
+                                    //printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilicheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.diliselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍦扮悊锛�" + inquirySHiJuanModel.dilicheckboxinput + "寮狅紝" + inquirySHiJuanModel.diliselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwucheckboxinput))
                                 {
-                                    printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwucheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.shengwuselect + "锛�";
+                                    //printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwucheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.shengwuselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鐢熺墿锛�" + inquirySHiJuanModel.shengwucheckboxinput + "寮狅紝" + inquirySHiJuanModel.shengwuselect + "</td>";
                                 }
 
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.wulicheckboxinput))
                                 {
-                                    printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulicheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.wuliselect + "锛�";
+                                    //printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulicheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.wuliselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鐗╃悊锛�" + inquirySHiJuanModel.wulicheckboxinput + "寮狅紝" + inquirySHiJuanModel.wuliselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.huaxuecheckboxinput))
                                 {
-                                    printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuecheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.huaxueselect + "锛�";
+                                    //printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuecheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.huaxueselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍖栧锛�" + inquirySHiJuanModel.huaxuecheckboxinput + "寮狅紝" + inquirySHiJuanModel.huaxueselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.zhengzhicheckboxinput))
                                 {
-                                    printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhicheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.zhengzhiselect + "锛�";
-                                }
+                                    //printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhicheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.zhengzhiselect + "锛�";
 
-                                printDemand += "绛旈鍗★細";
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鏀挎不锛�" + inquirySHiJuanModel.zhengzhicheckboxinput + "寮狅紝" + inquirySHiJuanModel.zhengzhiselect + "</td>";
+                                }
+                                printDemand += "</tr>";
+                                printDemand += "<tr>";
+                                //printDemand += "绛旈鍗★細";
+                                printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">绛旈鍗★細</td>";
 
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.yuwendatikacheckboxinput))
                                 {
-                                    printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.yuwendatikaselect + "锛�";
+                                    //printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.yuwendatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.yuwendatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.shuxuedatikacheckboxinput))
                                 {
-                                    printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.shuxuedatikaselect + "锛�";
+                                    //printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.shuxuedatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.shuxuedatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyudatikacheckboxinput))
                                 {
-                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.yingyudatikaselect + "锛�";
+                                    //printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.yingyudatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.yingyudatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishidatikacheckboxinput))
                                 {
-                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.lishidatikaselect + "锛�";
+                                    //printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.lishidatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.lishidatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.dilidatikacheckboxinput))
                                 {
-                                    printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilidatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.dilidatikaselect + "锛�";
+                                    //printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilidatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.dilidatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍦扮悊锛�" + inquirySHiJuanModel.dilidatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.dilidatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwudatikacheckboxinput))
                                 {
-                                    printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwudatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.shengwudatikaselect + "锛�";
+                                    //printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwudatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.shengwudatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鐢熺墿锛�" + inquirySHiJuanModel.shengwudatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.shengwudatikaselect + "</td>";
                                 }
 
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.wulidatikacheckboxinput))
                                 {
-                                    printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulidatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.wulidatikaselect + "锛�";
+                                    //printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulidatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.wulidatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鐗╃悊锛�" + inquirySHiJuanModel.wulidatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.wulidatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.huaxuedatikacheckboxinput))
                                 {
-                                    printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuedatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.huaxuedatikaselect + "锛�";
+                                    //printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuedatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.huaxuedatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍖栧锛�" + inquirySHiJuanModel.huaxuedatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.huaxuedatikaselect + "</td>";
                                 }
                                 if (!string.IsNullOrEmpty(inquirySHiJuanModel.zhengzhidatikacheckboxinput))
                                 {
-                                    printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhidatikacheckboxinput + "寮狅紝";
-                                    printDemand += inquirySHiJuanModel.zhengzhidatikaselect + "锛�";
+                                    //printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhidatikacheckboxinput + "寮狅紝";
+                                    //printDemand += inquirySHiJuanModel.zhengzhidatikaselect + "锛�";
+
+                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鏀挎不锛�" + inquirySHiJuanModel.zhengzhidatikacheckboxinput + "寮狅紝" + inquirySHiJuanModel.zhengzhidatikaselect + "</td>";
                                 }
 
                             }else if (inquirySHiJuanModel.Nianji == "楂樻牎璇曞嵎")
                             {
 
                             }
+
+
+                            printDemand += "</tr>";
+                            printDemand += "</table>";
                             model.InquirySHiJuanList.Add(inquirySHiJuanModel);
                         }
                     }
@@ -1630,6 +2032,10 @@
                         printDemand += "锛�" + model.GramWeight + "鍏�";
                     }
                     printDemand += "锛�" + model.SingleOrdouble + "锛�" + model.PrintColor;
+                    if (request["jtWZ"] != null)
+                        model.JTWZ = request["jtWZ"].ToString();
+                    if (request["jtWZFM"] != null)
+                        model.jtWZFM = request["jtWZFM"].ToString();
                 }
                 else if (model.PrintTypeId == 39) //鍏枃绾�
                 {
@@ -1869,6 +2275,8 @@
                     }
                     if (request["jtWZ"] != null)
                         model.JTWZ = request["jtWZ"].ToString();
+                    if (request["jtWZFM"] != null)
+                        model.jtWZFM = request["jtWZFM"].ToString();
                     if (request["frontType"] != null)
                         model.FrontType = request["frontType"].ToString();
                     if (request["pDemand"] != null)
@@ -1882,7 +2290,7 @@
                     if (model.PrintMode == 1)
                     {
                         printDemand += model.PaperMP + "锛�";
-
+                        printDemand += model.RLNum + "锛�";
                     }
                     else
                     {
@@ -1890,7 +2298,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);
@@ -1898,14 +2306,50 @@
                             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 + "锛�";
-                    printDemand += "灏侀潰瑕佹眰锛�";
-                    printDemand += model.FrontType;
+                    
+                    printDemand += model.PrintColor + "";
+                  
 
                     if (model.FrontType != "鏃犲皝闈�")
                     {
+                        printDemand += "锛屽皝闈㈣姹傦細";
+                        printDemand += model.FrontType;
                         printDemand += "锛�" + model.pDemand;
                     }
 
@@ -2158,11 +2602,11 @@
                                 insideModel.PaperId = request["paper" + i].ToString().ToInt32().Value;
                             }
                             if (request["gramWeight" + i] != null)
-                                insideModel.GramWeight = request["gramWeight" + i].ToString().ToInt32().Value;
+                                insideModel.GramWeight = request["gramWeight" + i].ToInt32().HasValue? request["gramWeight" + i].ToString().ToInt32().Value:0;
                             if (request["printColor" + i] != null)
                                 insideModel.PrintColor = request["printColor" + i].ToString();
                             if (request["pageNum" + i] != null)
-                                insideModel.PageNum = request["pageNum" + i].ToString().ToInt32().Value;
+                                insideModel.PageNum = request["pageNum" + i].ToInt32().HasValue ? request["pageNum" + i].ToString().ToInt32().Value : 0; ;
                             if (request["works" + i] != null)
                                 works = request["works" + i].ToString();
                             if (!string.IsNullOrEmpty(works))
@@ -2429,7 +2873,7 @@
                      if (afterInfo.ParameterName == "鑳跺ご")
                      {
                          if(model.PrintTypeId!=27)
-                         afterInfo.ParameterName = "鑳跺ご(姣忔湰" + model.PageNum.ToString() + "椤�)";
+                         afterInfo.ParameterName = "鑳跺ご(姣忔湰" + model.PageNum.ToString() + "寮�)";
 
                         if (model.PrintTypeId == 39)
                         {
@@ -2439,7 +2883,7 @@
                     if (afterInfo.ParameterName == "鑳跺乏")
                     {
                         if (model.PrintTypeId == 29)
-                            afterInfo.ParameterName = "鑳跺乏(姣忔湰" + model.PaperMP.ToString() + "椤�)";
+                            afterInfo.ParameterName = "鑳跺乏(姣忔湰" + model.PaperMP.ToString() + "寮�)";
                     }
                     afterWorkStr += afterInfo.ParameterName + "锛�";
                  }
@@ -2455,13 +2899,50 @@
                  }
 
              }
-             //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 (model.JTWZ != "鑳跺ご" && model.JTWZ != "鑳跺乏" && model.JTWZ != "鍏朵粬")
+                    {
+                        afterWorkStr   += "锛屽皝闈㈠嵃鍒疯姹傦細" + model.jtWZFM;
+                    }
+                }
+               
+                if(!string.IsNullOrEmpty(model.ThStart) || !string.IsNullOrEmpty(model.ThEnd))
+                {
+                    afterWorkStr += "锛屽鍙峰彿娈�(" + model.ThStart + "-" + model.ThEnd + ")";
+                    //afterWorkStr += "锛�" + model.JTWZ;
+                } 
+            }
+
+            if (model.PrintTypeId == 29)
+            {
+                if (!string.IsNullOrEmpty(model.JTWZ))
+                {
+                    if (!string.IsNullOrEmpty(afterWorkStr))
+                    {
+                        afterWorkStr += "锛�";
+                    }
+                    afterWorkStr += /*"瑁呰锛�" +*/ model.JTWZ;
+                    if (model.JTWZ != "鑳跺ご" && model.JTWZ != "鑳跺乏" && model.JTWZ != "鍏朵粬" && model.JTWZ != "鏁ｉ〉")
+                    {
+                        if (!string.IsNullOrEmpty(model.jtWZFM))
+                            afterWorkStr += "锛屽皝闈㈠嵃鍒疯姹傦細" + model.jtWZFM;
+                    }
+                    if ( model.JTWZ != "鏁ｉ〉" && model.PageNum > 0)
+                        afterWorkStr += "(姣忔湰" + model.PageNum.ToString() + "寮�)";
+                }
+
+                //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