From a7e05ebe00fdcb649c012e5afc4a42a8d631e824 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 02 四月 2025 08:38:24 +0800
Subject: [PATCH] 删除客户管理查询条件中的“客户编号” 完成 新增订单---黑白印件 的后道工序最右边增加一个“口 竖式”，同前面套号、压痕一样，默认不勾选，是竖式的业务经理自己下单时勾选 完成提交外协付款申请时，增加上传审批证明的上传图片功能，可以添加多张图片；查询列表中增加“付款状态：全部、已付款、未付款”查询条件，默认全部；“完工状态”改为默认未完工 完成请示批复----付款申请 中也要向上面的需求一样，增加上传审批证明的上传图片功能，可以添加多张图片 完成在“请示批复”中进行“批复”操作的时候要能查看上传的审批图片 完成包装要求”要显示在打印的订单中 完成包装要求”要显示在打印的订单中 完成收据联单的新增订单中，纸张选无碳纸时，不显示“品牌”、“克重”，在联数的后面增加颜色选择：“颜色：上白下红”（匹配联数）订单管理中的“订单状态”删除，删除后新增两个状态：“完工状态：全部、未完工、已完工”和“送货状态：全部、已送货、未送货” 完成请示批复中默认“未批复” 完成请示批复中默认“未批复” 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs | 115 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 95 insertions(+), 20 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index bf625fc..6be0cf7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -195,6 +195,16 @@
remarks = request["remarks"].ToString();
if (request["pNameMP"] != null)
paperMP = request["pNameMP"].ToString();
+ if (request["shanglian"] != null)
+ model.shanglian = request["shanglian"].ToString();
+ if (request["zhonglianlian1"] != null)
+ model.zhonglianlian1 = request["zhonglianlian1"].ToString();
+ if (request["zhonglianlian2"] != null)
+ model.zhonglianlian2 = request["zhonglianlian2"].ToString();
+ if (request["zhonglianlian3"] != null)
+ model.zhonglianlian3 = request["zhonglianlian3"].ToString();
+ if (request["xialian"] != null)
+ model.xialian = request["xialian"].ToString();
if (request["pageNumsbs"] != null)
pageNumsbs = request["pageNumsbs"].ToString();
if (request["printBoxNumber"] != null)
@@ -670,13 +680,30 @@
var fengmianyaoqiu = _sys_DictionaryBLL.GetDataByType("浣滀笟鏈皝闈㈠嵃鍒疯姹�");
var neixingzhizhang = _sys_DictionaryBLL.GetDataByType("浣滀笟鏈唴鑺焊寮�");
var neixingyaoqiu = _sys_DictionaryBLL.GetDataByType("浣滀笟鏈唴鑺嵃鍒疯姹�");
+ printDemand = "<table border=\"1\" cellpadding=\"0\" cellspacing=\"0\" style=\"border-collapse: collapse;width: 650px; \">";
+ printDemand += "<tr>";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">搴忓彿</td>";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍝佸悕</td>";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">寮�鏈�</td>";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鏁伴噺</td>";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍗曚环</td>";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">閲戦</td>";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">灏侀潰绾稿紶</td>";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍗板埛瑕佹眰</td>";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍐呰姱绾稿紶</td>";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍗板埛瑕佹眰</td>";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">椤电爜</td>";
+ printDemand += "</tr>";
for (int i = 0; i < hidWorkBookPageNum; i++)
{
- if ( i != 0 )
- {
- printDemand += "锛� ";
- }
- printDemand += "浣滀笟鏈�" + +(i + 1);
+ printDemand += "<tr><td style=\"text-align:center;border: 1px solid #999999;\">" + (i + 1) + "</td>";
+
+
+ //if ( i != 0 )
+ //{
+ // printDemand += "锛� ";
+ //}
+ //printDemand += "浣滀笟鏈�" + +(i + 1);
inquiryWorkBookModel = new InquiryWorkBookModel();
if (request["WorkBookNamea" + (i + 1)] != null)
{
@@ -687,7 +714,8 @@
{
inquiryWorkBookModel.WorkBookNameTxt = workBookType.PaperTypeName;
}
- printDemand += "锛屽搧鍚嶏細" + inquiryWorkBookModel.WorkBookNameTxt + "";
+ // printDemand += "锛屽搧鍚嶏細" + inquiryWorkBookModel.WorkBookNameTxt + "";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookNameTxt + "</td>";
}
if (request["WorkBookSizea" + (i + 1)] != null)
@@ -719,13 +747,15 @@
model.PrintSizeName = inquiryWorkBookModel.WorkBookSizeTxt;
model.PrintSizeId = int.Parse(inquiryWorkBookModel.WorkBookSize);
}
- printDemand += "锛屽紑鏈細" + inquiryWorkBookModel.WorkBookSizeTxt + "";
+ //printDemand += "锛屽紑鏈細" + inquiryWorkBookModel.WorkBookSizeTxt + "";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookSizeTxt + "</td>";
}
if (request["WorkBookCounta" + (i + 1)] != null)
{
inquiryWorkBookModel.WorkBookCount = request["WorkBookCounta" + (i + 1)].ToString();
- printDemand += "锛屾暟閲忥細" + inquiryWorkBookModel.WorkBookCount + "";
+ // printDemand += "锛屾暟閲忥細" + inquiryWorkBookModel.WorkBookCount + "";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookCount + "</td>";
}
if (request["ysUnita" + (i + 1)] != null)
@@ -740,12 +770,13 @@
{
model.Unit = int.Parse(inquiryWorkBookModel.ysUnit);
}
- printDemand += "锛屽崟浣嶏細" + inquiryWorkBookModel.ysUnitTxt + "";
+ // printDemand += "锛屽崟浣嶏細" + inquiryWorkBookModel.ysUnitTxt + "";
}
if (request["WorkBookPricea" + (i + 1)] != null)
{
inquiryWorkBookModel.WorkBookPrice = request["WorkBookPricea" + (i + 1)].ToString();
- printDemand += "锛屽崟浠凤細" + inquiryWorkBookModel.WorkBookPrice + "";
+ //printDemand += "锛屽崟浠凤細" + inquiryWorkBookModel.WorkBookPrice + "";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookPrice + "</td>";
}
if (request["hidefengmiana" + (i + 1)] != null)
@@ -770,7 +801,8 @@
if (request["WorkBookMoneya" + (i + 1)] != null)
{
inquiryWorkBookModel.WorkBookMoney = request["WorkBookMoneya" + (i + 1)].ToString();
- printDemand += "锛岄噾棰濓細" + inquiryWorkBookModel.WorkBookMoney + "";
+ // printDemand += "锛岄噾棰濓細" + inquiryWorkBookModel.WorkBookMoney + "";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookMoney + "</td>";
}
if (request["WorkBookFengMiana" + (i + 1)] != null)
{
@@ -791,7 +823,8 @@
inquiryWorkBookModel.WorkBookFengMianTxt = WorkBookFengMian.Name;
}
}
- printDemand += "锛屽皝闈㈢焊寮狅細" + inquiryWorkBookModel.WorkBookFengMianTxt + "";
+ //printDemand += "锛屽皝闈㈢焊寮狅細" + inquiryWorkBookModel.WorkBookFengMianTxt + "";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookFengMianTxt + "</td>";
}
if (request["FengMianYaoqiua" + (i + 1)] != null)
@@ -802,7 +835,8 @@
{
inquiryWorkBookModel.FengMianYaoqiuTxt = FengMianYaoqiu.Name;
}
- printDemand += "锛屽嵃鍒疯姹傦細" + inquiryWorkBookModel.FengMianYaoqiuTxt + "";
+ //printDemand += "锛屽嵃鍒疯姹傦細" + inquiryWorkBookModel.FengMianYaoqiuTxt + "";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.FengMianYaoqiuTxt + "</td>";
}
if (request["WorkBookNeiXinga" + (i + 1)] != null)
@@ -813,7 +847,8 @@
{
inquiryWorkBookModel.WorkBookNeiXingTxt = WorkBookNeiXing.Name;
}
- printDemand += "锛屽唴鑺焊寮狅細" + inquiryWorkBookModel.WorkBookNeiXingTxt + "";
+ //printDemand += "锛屽唴鑺焊寮狅細" + inquiryWorkBookModel.WorkBookNeiXingTxt + "";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookNeiXingTxt + "</td>";
}
if (request["NeiXingYaoqiua" + (i + 1)] != null)
@@ -824,16 +859,21 @@
{
inquiryWorkBookModel.NeiXingYaoqiuTxt = NeiXingYaoqiu.Name;
}
- printDemand += "锛屽嵃鍒疯姹傦細" + inquiryWorkBookModel.NeiXingYaoqiuTxt + "";
+ //printDemand += "锛屽嵃鍒疯姹傦細" + inquiryWorkBookModel.NeiXingYaoqiuTxt + "";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.NeiXingYaoqiuTxt + "</td>";
}
if (request["WorkBookpageNuma" + (i + 1)] != null)
{
inquiryWorkBookModel.WorkBookpageNum = request["WorkBookpageNuma" + (i + 1)].ToString();
- printDemand += "锛岄〉鏁帮細" + inquiryWorkBookModel.WorkBookpageNum + "";
+ //printDemand += "锛岄〉鏁帮細" + inquiryWorkBookModel.WorkBookpageNum + "";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookpageNum + "</td>";
}
+ printDemand += "</tr>";
model.InquiryWorkBookList.Add(inquiryWorkBookModel);
}
+
+ printDemand += "</table>";
}
else if (model.PrintTypeId == 31) //骞垮憡绾告澂
{
@@ -1934,7 +1974,7 @@
if (model.PrintMode == 1)
{
printDemand += model.PaperMP + "锛�";
-
+ printDemand += model.RLNum + "锛�";
}
else
{
@@ -1942,7 +1982,7 @@
PaperInfoBLL _paperInfoBLL = new PaperInfoBLL();
SysInquiry_PaperInfo paperInfo = _paperInfoBLL.GetPaperModel(model.PaperMP.ToInt32().Value);
printDemand += paperInfo.PaperName;
- if (model.PaperId != 0)
+ if (model.PaperId != 0 && paperInfo.PaperName != "鏃犵⒊澶嶅啓绾�")
{
BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
@@ -1950,8 +1990,43 @@
printDemand += "锛�" + model.GramWeight + "鍏�";
}
printDemand += "锛屾瘡鏈�" + model.PageNum + "浠斤紝";
+ printDemand += model.RLNum + "锛�";
+ if (paperInfo.PaperName == "鏃犵⒊澶嶅啓绾�")
+ {
+ if(model.RLNum == "涓よ仈")
+ {
+ printDemand += model.shanglian + "锛�";
+ printDemand += model.xialian + "锛�";
+ }
+ else if (model.RLNum == "涓夎仈")
+ {
+ printDemand += model.shanglian + "锛�";
+ printDemand += model.zhonglianlian1 + "锛�";
+ printDemand += model.xialian + "锛�";
+ }
+ else if (model.RLNum == "鍥涜仈")
+ {
+ printDemand += model.shanglian + "锛�";
+ printDemand += model.zhonglianlian1 + "锛�";
+ printDemand += model.zhonglianlian2 + "锛�";
+ printDemand += model.xialian + "锛�";
+ }
+ else if (model.RLNum == "浜旇仈")
+ {
+ printDemand += model.shanglian + "锛�";
+ printDemand += model.zhonglianlian1 + "锛�";
+ printDemand += model.zhonglianlian2 + "锛�";
+ printDemand += model.zhonglianlian3 + "锛�";
+ printDemand += model.xialian + "锛�";
+ }
+
+ }
+
+
+
+
}
- printDemand += model.RLNum + "锛�";
+
printDemand += model.PrintColor + "";
@@ -2540,7 +2615,7 @@
if (!string.IsNullOrEmpty(model.jtWZFM))
afterWorkStr += "锛屽皝闈㈠嵃鍒疯姹傦細" + model.jtWZFM;
}
- if ( model.PageNum > 0)
+ if ( model.JTWZ != "鏁ｉ〉" && model.PageNum > 0)
afterWorkStr += "(姣忔湰" + model.PageNum.ToString() + "寮�)";
}
--
Gitblit v1.9.1