CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -347,7 +347,7 @@
                        if (model.PrintMode == 0)
                        {
                            SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                            printDemand += "(" + brandInfo.BrandName + ")";
                            //printDemand += "(" + brandInfo.BrandName + ")";
                        }
                        printDemand += "," + model.GramWeight + "克";
                    }
@@ -477,7 +477,7 @@
                        if (model.PaperId > 0)
                        {
                            SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                            printDemand += "(" + brandInfo.BrandName + ")";
                           // printDemand += "(" + brandInfo.BrandName + ")";
                            printDemand += "," + model.GramWeight + "克";
                        }
                        printDemand += "," + model.SingleOrdouble + "," + model.PrintColor + ",4页";
@@ -498,7 +498,7 @@
                            if (insideModelObj.PaperId > 0)
                            {
                                SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(insideModelObj.BrandId);
                                printDemand += "(" + brandInfo.BrandName + ")";
                                //printDemand += "(" + brandInfo.BrandName + ")";
                                printDemand += "," + insideModelObj.GramWeight + "克";
                            }
                            printDemand += "," + insideModelObj.PrintColor + "," + insideModelObj.PageNum.ToString();
@@ -621,7 +621,7 @@
                    if (model.PaperId > 0)
                    {
                        SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                        printDemand += "(" + brandInfo.BrandName + ")";
                        //printDemand += "(" + brandInfo.BrandName + ")";
                        printDemand += "," + model.GramWeight + "克";
                    }
                    printDemand += "," + model.SingleOrdouble + "," + model.PrintColor + ",4页";
@@ -642,7 +642,7 @@
                        if (insideModelObj.PaperId > 0)
                        {
                            SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(insideModelObj.BrandId);
                            printDemand += "(" + brandInfo.BrandName + ")";
                           // printDemand += "(" + brandInfo.BrandName + ")";
                            printDemand += "," + insideModelObj.GramWeight + "克";
                        }
                        printDemand += "," + insideModelObj.PrintColor + "," + insideModelObj.PageNum.ToString();
@@ -1262,7 +1262,7 @@
                                }
                              
                            }
                            else if (inquirySHiJuanModel.Nianji == "三年级" || inquirySHiJuanModel.Nianji == "四年级" || inquirySHiJuanModel.Nianji == "五年级" || inquirySHiJuanModel.Nianji == "六年级")
                            else if (inquirySHiJuanModel.Nianji == "三年级" || inquirySHiJuanModel.Nianji == "四年级" || inquirySHiJuanModel.Nianji == "五年级" )
                            {
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
                                {
@@ -1288,6 +1288,74 @@
                              
                              
                            }
                            else if ( inquirySHiJuanModel.Nianji == "六年级")
                            {
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
                                {
                                    //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 += "<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 += "<td style=\"text-align:center;border: 1px solid #999999;\">品德与生活:" + inquirySHiJuanModel.pingdecheckboxinput + "张," + inquirySHiJuanModel.pingdeselect + "</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 += "<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 += "<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 += "<td style=\"text-align:center;border: 1px solid #999999;\">英语:" + inquirySHiJuanModel.yingyudatikacheckboxinput + "张," + inquirySHiJuanModel.yingyudatikaselect + "</td>";
                                }
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.kexuedatikacheckboxinput))
                                {
                                    //printDemand += "历史:" + inquirySHiJuanModel.kexuedatikacheckboxinput + "张,";
                                    //printDemand += inquirySHiJuanModel.kexuedatikaselect + ",";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">科学:" + inquirySHiJuanModel.kexuedatikacheckboxinput + "张," + inquirySHiJuanModel.kexuedatikaselect + "</td>";
                                }
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.pingdedatikacheckboxinput))
                                {
                                    //printDemand += "地理:" + inquirySHiJuanModel.pingdedatikacheckboxinput + "张,";
                                    //printDemand += inquirySHiJuanModel.pingdedatikaselect + ",";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">品德与生活:" + inquirySHiJuanModel.pingdedatikacheckboxinput + "张," + inquirySHiJuanModel.pingdedatikaselect + "</td>";
                                }
                            }
                            else if (inquirySHiJuanModel.Nianji == "七年级")
                            {
@@ -1323,10 +1391,10 @@
                                }
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdecheckboxinput))
                                {
                                    //printDemand += "思想品德:" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "张,";
                                    //printDemand += "道德与法治:" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "张,";
                                    //printDemand += inquirySHiJuanModel.sixiangpingdeselect + ",";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">思想品德:" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "张," + inquirySHiJuanModel.sixiangpingdeselect + "</td>";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">道德与法治:" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "张," + inquirySHiJuanModel.sixiangpingdeselect + "</td>";
                                }
                                printDemand += "</tr>";
@@ -1377,10 +1445,10 @@
                                }
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdedatikacheckboxinput))
                                {
                                    //printDemand += "思想品德:" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "张,";
                                    //printDemand += "道德与法治:" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "张,";
                                    //printDemand += inquirySHiJuanModel.sixiangpingdedatikaselect + ",";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">思想品德:" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "张," + inquirySHiJuanModel.sixiangpingdedatikaselect + "</td>";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">道德与法治:" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "张," + inquirySHiJuanModel.sixiangpingdedatikaselect + "</td>";
                                }
                            }
                            else if (inquirySHiJuanModel.Nianji == "八年级")
@@ -1422,10 +1490,10 @@
                                }
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdecheckboxinput))
                                {
                                    //printDemand += "思想品德:" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "张,";
                                    //printDemand += "道德与法治:" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "张,";
                                    //printDemand += inquirySHiJuanModel.sixiangpingdeselect + ",";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">思想品德:" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "张," + inquirySHiJuanModel.sixiangpingdeselect + "</td>";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">道德与法治:" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "张," + inquirySHiJuanModel.sixiangpingdeselect + "</td>";
                                }
                                printDemand += "</tr>";
@@ -1484,10 +1552,10 @@
                                }
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdedatikacheckboxinput))
                                {
                                    //printDemand += "思想品德:" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "张,";
                                    //printDemand += "道德与法治:" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "张,";
                                    //printDemand += inquirySHiJuanModel.sixiangpingdedatikaselect + ",";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">思想品德:" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "张," + inquirySHiJuanModel.sixiangpingdedatikaselect + "</td>";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">道德与法治:" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "张," + inquirySHiJuanModel.sixiangpingdedatikaselect + "</td>";
                                }
                               
@@ -1525,10 +1593,10 @@
                                }
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdecheckboxinput))
                                {
                                    //printDemand += "思想品德:" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "张,";
                                    //printDemand += "道德与法治:" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "张,";
                                    //printDemand += inquirySHiJuanModel.sixiangpingdeselect + ",";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">思想品德:" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "张," + inquirySHiJuanModel.sixiangpingdeselect + "</td>";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">道德与法治:" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "张," + inquirySHiJuanModel.sixiangpingdeselect + "</td>";
                                }
                                printDemand += "</tr>";
                                printDemand += "<tr>";
@@ -1580,10 +1648,10 @@
                                }
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdedatikacheckboxinput))
                                {
                                    //printDemand += "思想品德:" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "张,";
                                    //printDemand += "道德与法治:" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "张,";
                                    //printDemand += inquirySHiJuanModel.sixiangpingdedatikaselect + ",";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">思想品德:" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "张," + inquirySHiJuanModel.sixiangpingdedatikaselect + "</td>";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">道德与法治:" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "张," + inquirySHiJuanModel.sixiangpingdedatikaselect + "</td>";
                                }
                                
@@ -2021,13 +2089,13 @@
                        printDemand = paperSize.Name + ",";
                        model.PrintSizeName = paperSize.Name;
                    }
                    printDemand += paperInfo.PaperName + ",";
                    printDemand += paperInfo.PaperName /*+ ","*/;
                    if (model.PaperId != 0)
                    {
                        if (model.PrintMode == 0)
                        {
                            SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                            printDemand += "(" + brandInfo.BrandName + ")";
                            //printDemand += "(" + brandInfo.BrandName + ")";
                        }
                        printDemand += "," + model.GramWeight + "克";
                    }
@@ -2086,7 +2154,7 @@
                        {
                            BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
                            SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                            printDemand += "(" + brandInfo.BrandName + ")";
                           // printDemand += "(" + brandInfo.BrandName + ")";
                        }
                    }
                    if (pId != 0)
@@ -2122,7 +2190,7 @@
                        {
                            BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
                            SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                            printDemand += "(" + brandInfo.BrandName + ")";
                           // printDemand += "(" + brandInfo.BrandName + ")";
                        }
                    }
                    if (pId != 0)
@@ -2166,7 +2234,7 @@
                        {
                            BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
                            SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                            printDemand += "(" + brandInfo.BrandName + ")";
                           // printDemand += "(" + brandInfo.BrandName + ")";
                        }
                        printDemand += "," + model.GramWeight + "克";
                    }
@@ -2199,7 +2267,7 @@
                        {
                            BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
                            SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                            printDemand += "(" + brandInfo.BrandName + ")";
                           // printDemand += "(" + brandInfo.BrandName + ")";
                        }
                    }
                    if (pId != 0)
@@ -2252,12 +2320,17 @@
                        {
                            BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
                            SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                            printDemand += "(" + brandInfo.BrandName + ")";
                           // printDemand += "(" + brandInfo.BrandName + ")";
                        }
                        printDemand += "," + model.GramWeight + "克";
                    }
                    printDemand += "," + model.PageNum.ToString() + "版";
                    printDemand += "," + model.PrintColor;
                    if (request["printColor1"] != null)
                    {
                        model.printColor1 = request["printColor1"].ToString();
                        printDemand += "," + model.printColor1;
                    }
                }
                else if (model.PrintTypeId == 27) //收据联单
                {
@@ -2302,7 +2375,7 @@
                        {
                            BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
                            SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                            printDemand += "(" + brandInfo.BrandName + ")";
                           // printDemand += "(" + brandInfo.BrandName + ")";
                            printDemand += "," + model.GramWeight + "克";
                        }
                        printDemand += ",每本" + model.PageNum + "份,";
@@ -2389,7 +2462,7 @@
                    {
                        BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
                        SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                        printDemand += "(" + brandInfo.BrandName + ")";
                       // printDemand += "(" + brandInfo.BrandName + ")";
                        printDemand += "," + model.GramWeight + "克";
                    }
                    printDemand += ",每本" + model.PageNum.ToString() + "张";
@@ -2493,7 +2566,7 @@
                    {
                        BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
                        SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                        printDemand += "(" + brandInfo.BrandName + ")";
                        //printDemand += "(" + brandInfo.BrandName + ")";
                        printDemand += "," + model.GramWeight + "克";
                    }
                    printDemand += ",每本" + model.PageNum.ToString() + "张";