chuanyin-group-project.git

			@@ -195,6 +195,16 @@
			remarks = request["remarks"].ToString();
			if (request["pNameMP"] != null)
			paperMP = request["pNameMP"].ToString();
			if (request["shanglian"] != null)
			model.shanglian = request["shanglian"].ToString();
			if (request["zhonglianlian1"] != null)
			model.zhonglianlian1 = request["zhonglianlian1"].ToString();
			if (request["zhonglianlian2"] != null)
			model.zhonglianlian2 = request["zhonglianlian2"].ToString();
			if (request["zhonglianlian3"] != null)
			model.zhonglianlian3 = request["zhonglianlian3"].ToString();
			if (request["xialian"] != null)
			model.xialian = request["xialian"].ToString();
			if (request["pageNumsbs"] != null)
			pageNumsbs = request["pageNumsbs"].ToString();
			if (request["printBoxNumber"] != null)
			@@ -670,13 +680,30 @@
			var fengmianyaoqiu = _sys_DictionaryBLL.GetDataByType("作业本封面印刷要求");
			var neixingzhizhang = _sys_DictionaryBLL.GetDataByType("作业本内芯纸张");
			var neixingyaoqiu = _sys_DictionaryBLL.GetDataByType("作业本内芯印刷要求");
			printDemand = "<table border=\"1\" cellpadding=\"0\" cellspacing=\"0\" style=\"border-collapse: collapse;width: 650px; \">";
			printDemand += "<tr>";
			printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">序号</td>";
			printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">品名</td>";
			printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">开本</td>";
			printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">数量</td>";
			printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">单价</td>";
			printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">金额</td>";
			printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">封面纸张</td>";
			printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">印刷要求</td>";
			printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">内芯纸张</td>";
			printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">印刷要求</td>";
			printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">页码</td>";
			printDemand += "</tr>";
			for (int i = 0; i < hidWorkBookPageNum; i++)
			{
			if ( i != 0 )
			{
			printDemand += "， ";
			}
			printDemand += "作业本" + +(i + 1);
			printDemand += "<tr><td style=\"text-align:center;border: 1px solid #999999;\">" + (i + 1) + "</td>";


			//if ( i != 0 )
			//{
			// printDemand += "， ";
			//}
			//printDemand += "作业本" + +(i + 1);
			inquiryWorkBookModel = new InquiryWorkBookModel();
			if (request["WorkBookNamea" + (i + 1)] != null)
			{
			@@ -687,7 +714,8 @@
			{
			inquiryWorkBookModel.WorkBookNameTxt = workBookType.PaperTypeName;
			}
			printDemand += "，品名：" + inquiryWorkBookModel.WorkBookNameTxt + "";
			// printDemand += "，品名：" + inquiryWorkBookModel.WorkBookNameTxt + "";
			printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookNameTxt + "</td>";
			}

			if (request["WorkBookSizea" + (i + 1)] != null)
			@@ -719,13 +747,15 @@
			model.PrintSizeName = inquiryWorkBookModel.WorkBookSizeTxt;
			model.PrintSizeId = int.Parse(inquiryWorkBookModel.WorkBookSize);
			}
			printDemand += "，开本：" + inquiryWorkBookModel.WorkBookSizeTxt + "";
			//printDemand += "，开本：" + inquiryWorkBookModel.WorkBookSizeTxt + "";
			printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookSizeTxt + "</td>";
			}

			if (request["WorkBookCounta" + (i + 1)] != null)
			{
			inquiryWorkBookModel.WorkBookCount = request["WorkBookCounta" + (i + 1)].ToString();
			printDemand += "，数量：" + inquiryWorkBookModel.WorkBookCount + "";
			// printDemand += "，数量：" + inquiryWorkBookModel.WorkBookCount + "";
			printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookCount + "</td>";
			}

			if (request["ysUnita" + (i + 1)] != null)
			@@ -740,12 +770,13 @@
			{
			model.Unit = int.Parse(inquiryWorkBookModel.ysUnit);
			}
			printDemand += "，单位：" + inquiryWorkBookModel.ysUnitTxt + "";
			// printDemand += "，单位：" + inquiryWorkBookModel.ysUnitTxt + "";
			}
			if (request["WorkBookPricea" + (i + 1)] != null)
			{
			inquiryWorkBookModel.WorkBookPrice = request["WorkBookPricea" + (i + 1)].ToString();
			printDemand += "，单价：" + inquiryWorkBookModel.WorkBookPrice + "";
			//printDemand += "，单价：" + inquiryWorkBookModel.WorkBookPrice + "";
			printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookPrice + "</td>";
			}

			if (request["hidefengmiana" + (i + 1)] != null)
			@@ -770,7 +801,8 @@
			if (request["WorkBookMoneya" + (i + 1)] != null)
			{
			inquiryWorkBookModel.WorkBookMoney = request["WorkBookMoneya" + (i + 1)].ToString();
			printDemand += "，金额：" + inquiryWorkBookModel.WorkBookMoney + "";
			// printDemand += "，金额：" + inquiryWorkBookModel.WorkBookMoney + "";
			printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookMoney + "</td>";
			}
			if (request["WorkBookFengMiana" + (i + 1)] != null)
			{
			@@ -791,7 +823,8 @@
			inquiryWorkBookModel.WorkBookFengMianTxt = WorkBookFengMian.Name;
			}
			}
			printDemand += "，封面纸张：" + inquiryWorkBookModel.WorkBookFengMianTxt + "";
			//printDemand += "，封面纸张：" + inquiryWorkBookModel.WorkBookFengMianTxt + "";
			printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookFengMianTxt + "</td>";
			}

			if (request["FengMianYaoqiua" + (i + 1)] != null)
			@@ -802,7 +835,8 @@
			{
			inquiryWorkBookModel.FengMianYaoqiuTxt = FengMianYaoqiu.Name;
			}
			printDemand += "，印刷要求：" + inquiryWorkBookModel.FengMianYaoqiuTxt + "";
			//printDemand += "，印刷要求：" + inquiryWorkBookModel.FengMianYaoqiuTxt + "";
			printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.FengMianYaoqiuTxt + "</td>";
			}

			if (request["WorkBookNeiXinga" + (i + 1)] != null)
			@@ -813,7 +847,8 @@
			{
			inquiryWorkBookModel.WorkBookNeiXingTxt = WorkBookNeiXing.Name;
			}
			printDemand += "，内芯纸张：" + inquiryWorkBookModel.WorkBookNeiXingTxt + "";
			//printDemand += "，内芯纸张：" + inquiryWorkBookModel.WorkBookNeiXingTxt + "";
			printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookNeiXingTxt + "</td>";
			}

			if (request["NeiXingYaoqiua" + (i + 1)] != null)
			@@ -824,16 +859,21 @@
			{
			inquiryWorkBookModel.NeiXingYaoqiuTxt = NeiXingYaoqiu.Name;
			}
			printDemand += "，印刷要求：" + inquiryWorkBookModel.NeiXingYaoqiuTxt + "";
			//printDemand += "，印刷要求：" + inquiryWorkBookModel.NeiXingYaoqiuTxt + "";
			printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.NeiXingYaoqiuTxt + "</td>";
			}

			if (request["WorkBookpageNuma" + (i + 1)] != null)
			{
			inquiryWorkBookModel.WorkBookpageNum = request["WorkBookpageNuma" + (i + 1)].ToString();
			printDemand += "，页数：" + inquiryWorkBookModel.WorkBookpageNum + "";
			//printDemand += "，页数：" + inquiryWorkBookModel.WorkBookpageNum + "";
			printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookpageNum + "</td>";
			}
			printDemand += "</tr>";
			model.InquiryWorkBookList.Add(inquiryWorkBookModel);
			}

			printDemand += "</table>";
			}
			else if (model.PrintTypeId == 31) //广告纸杯
			{
			@@ -910,56 +950,61 @@
			printDemand += "试卷袋纸张：" + model.printColorshijuan + "，";
			}

			if (request["paper1"] != null)
			if(request["paper1"] != null && !string.IsNullOrEmpty(request["paper1"].ToString()))
			{
			model.paper1 = request["paper1"].ToString();
			printDemand += "答题卡：纸张：" + model.paper1 + "，";
			}



			if (request["paperSizeA4"] != null)
			{
			model.paperSizeA4 = request["paperSizeA4"].ToString();
			if (model.paperSizeA4 == "-1")
			if (request["paper1"] != null)
			{
			model.PrintSizeNameA4 = request["txtFirstSizeA4"].ToString() + "×" + request["txtSecondSizeA4"].ToString();
			model.firstSizeA4 = request["txtFirstSizeA4"].ToString();
			model.secondSizeA4 = request["txtSecondSizeA4"].ToString();
			printDemand += "成品尺寸：A4 " + model.PrintSizeNameA4 + "，";
			model.paper1 = request["paper1"].ToString();
			printDemand += "答题卡：纸张：" + model.paper1 + "，";
			}
			else



			if (request["paperSizeA4"] != null)
			{
			printDemand += "成品尺寸：A4 " + 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 += "成品尺寸：A4 " + model.PrintSizeNameA4 + "，";
			}
			else
			{
			printDemand += "成品尺寸：A4 " + model.paperSizeA4 + "，";
			}
			}

			if (request["paperSizeA3"] != null)
			{
			model.paperSizeA3 = request["paperSizeA3"].ToString();
			if (model.paperSizeA3 == "-1")
			{
			model.PrintSizeNameA3 = request["txtFirstSizeA3"].ToString() + "×" + request["txtSecondSizeA3"].ToString();
			model.firstSizeA3 = request["txtFirstSizeA3"].ToString();
			model.secondSizeA3 = request["txtSecondSizeA3"].ToString();
			printDemand += "A3 " + model.PrintSizeName + "，";
			}
			else
			{
			printDemand += "A3 " + model.paperSizeA3 + "，";
			}
			}
			if (request["printColor1"] != null)
			{
			model.printColor1 = request["printColor1"].ToString();
			printDemand += "印刷颜色：" + model.printColor1 + "，";
			}

			if (request["printColor2"] != null)
			{
			model.printColor2 = request["printColor2"].ToString();
			printDemand += "答题卡袋纸张：" + model.printColor2 + "，";
			}
			}

			if (request["paperSizeA3"] != null)
			{
			model.paperSizeA3 = request["paperSizeA3"].ToString();
			if (model.paperSizeA3 == "-1")
			{
			model.PrintSizeNameA3 = request["txtFirstSizeA3"].ToString() + "×" + request["txtSecondSizeA3"].ToString();
			model.firstSizeA3 = request["txtFirstSizeA3"].ToString();
			model.secondSizeA3 = request["txtSecondSizeA3"].ToString();
			printDemand += "A3 " + model.PrintSizeName + "，";
			}
			else
			{
			printDemand += "A3 " + model.paperSizeA3 + "，";
			}
			}
			if (request["printColor1"] != null)
			{
			model.printColor1 = request["printColor1"].ToString();
			printDemand += "印刷颜色：" + model.printColor1 + "，";
			}

			if (request["printColor2"] != null)
			{
			model.printColor2 = request["printColor2"].ToString();
			printDemand += "答题卡袋纸张：" + model.printColor2 + "，";
			}



			InquirySHiJuanModel inquirySHiJuanModel = null;
			@@ -1380,6 +1425,11 @@
			printDemand += "政治：" + inquirySHiJuanModel.zhengzhicheckboxinput + "张，";
			printDemand += inquirySHiJuanModel.zhengzhiselect + "，";
			}
			if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwucheckboxinput))
			{
			printDemand += "生物：" + inquirySHiJuanModel.shengwucheckboxinput + "张，";
			printDemand += inquirySHiJuanModel.shengwuselect + "，";
			}

			printDemand += "答题卡：";

			@@ -1424,7 +1474,11 @@
			printDemand += "政治：" + inquirySHiJuanModel.zhengzhidatikacheckboxinput + "张，";
			printDemand += inquirySHiJuanModel.zhengzhidatikaselect + "，";
			}

			if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwudatikacheckboxinput))
			{
			printDemand += "生物：" + inquirySHiJuanModel.shengwudatikacheckboxinput + "张，";
			printDemand += inquirySHiJuanModel.shengwudatikaselect + "，";
			}
			}
			else if (inquirySHiJuanModel.Nianji == "高二")
			{
			@@ -1934,7 +1988,7 @@
			if (model.PrintMode == 1)
			{
			printDemand += model.PaperMP + "，";

			printDemand += model.RLNum + "，";
			}
			else
			{
			@@ -1942,7 +1996,7 @@
			PaperInfoBLL _paperInfoBLL = new PaperInfoBLL();
			SysInquiry_PaperInfo paperInfo = _paperInfoBLL.GetPaperModel(model.PaperMP.ToInt32().Value);
			printDemand += paperInfo.PaperName;
			if (model.PaperId != 0)
			if (model.PaperId != 0 && paperInfo.PaperName != "无碳复写纸")
			{
			BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
			SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
			@@ -1950,8 +2004,43 @@
			printDemand += "，" + model.GramWeight + "克";
			}
			printDemand += "，每本" + model.PageNum + "份，";
			printDemand += model.RLNum + "，";
			if (paperInfo.PaperName == "无碳复写纸")
			{
			if(model.RLNum == "两联")
			{
			printDemand += model.shanglian + "，";
			printDemand += model.xialian + "，";
			}
			else if (model.RLNum == "三联")
			{
			printDemand += model.shanglian + "，";
			printDemand += model.zhonglianlian1 + "，";
			printDemand += model.xialian + "，";
			}
			else if (model.RLNum == "四联")
			{
			printDemand += model.shanglian + "，";
			printDemand += model.zhonglianlian1 + "，";
			printDemand += model.zhonglianlian2 + "，";
			printDemand += model.xialian + "，";
			}
			else if (model.RLNum == "五联")
			{
			printDemand += model.shanglian + "，";
			printDemand += model.zhonglianlian1 + "，";
			printDemand += model.zhonglianlian2 + "，";
			printDemand += model.zhonglianlian3 + "，";
			printDemand += model.xialian + "，";
			}

			}




			}
			printDemand += model.RLNum + "，";

			printDemand += model.PrintColor + "";


			@@ -2540,7 +2629,7 @@
			if (!string.IsNullOrEmpty(model.jtWZFM))
			afterWorkStr += "，封面印刷要求：" + model.jtWZFM;
			}
			if ( model.PageNum > 0)
			if ( model.JTWZ != "散页" && model.PageNum > 0)
			afterWorkStr += "(每本" + model.PageNum.ToString() + "张)";
			}