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 | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index 174ffde..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)
@@ -1964,7 +1974,7 @@
if (model.PrintMode == 1)
{
printDemand += model.PaperMP + "锛�";
-
+ printDemand += model.RLNum + "锛�";
}
else
{
@@ -1972,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);
@@ -1980,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 + "";
--
Gitblit v1.9.1