From a980cd04341d71216e0f59bd4b7327fe9fc50032 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 21 五月 2025 11:41:46 +0800
Subject: [PATCH] 提交
---
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs | 281 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 223 insertions(+), 58 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..6be0cf7 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,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)
{
@@ -641,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)
@@ -673,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)
@@ -694,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)
@@ -724,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)
{
@@ -745,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)
@@ -756,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)
@@ -767,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)
@@ -778,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) //骞垮憡绾告澂
{
@@ -1630,6 +1716,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 +1959,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 +1974,7 @@
if (model.PrintMode == 1)
{
printDemand += model.PaperMP + "锛�";
-
+ printDemand += model.RLNum + "锛�";
}
else
{
@@ -1890,7 +1982,7 @@
PaperInfoBLL _paperInfoBLL = new PaperInfoBLL();
SysInquiry_PaperInfo paperInfo = _paperInfoBLL.GetPaperModel(model.PaperMP.ToInt32().Value);
printDemand += paperInfo.PaperName;
- if (model.PaperId != 0)
+ if (model.PaperId != 0 && paperInfo.PaperName != "鏃犵⒊澶嶅啓绾�")
{
BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
@@ -1898,14 +1990,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 +2286,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 +2557,7 @@
if (afterInfo.ParameterName == "鑳跺ご")
{
if(model.PrintTypeId!=27)
- afterInfo.ParameterName = "鑳跺ご(姣忔湰" + model.PageNum.ToString() + "椤�)";
+ afterInfo.ParameterName = "鑳跺ご(姣忔湰" + model.PageNum.ToString() + "寮�)";
if (model.PrintTypeId == 39)
{
@@ -2439,7 +2567,7 @@
if (afterInfo.ParameterName == "鑳跺乏")
{
if (model.PrintTypeId == 29)
- afterInfo.ParameterName = "鑳跺乏(姣忔湰" + model.PaperMP.ToString() + "椤�)";
+ afterInfo.ParameterName = "鑳跺乏(姣忔湰" + model.PaperMP.ToString() + "寮�)";
}
afterWorkStr += afterInfo.ParameterName + "锛�";
}
@@ -2455,13 +2583,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