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.Model/Inquiry/InquiryCommonModel.cs |  133 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 132 insertions(+), 1 deletions(-)

diff --git a/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs b/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
index 1c3fe6c..173abbc 100644
--- a/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
+++ b/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
@@ -14,7 +14,8 @@
         private List<int> _afterWorkList;
         private List<InquiryInsideModel> _inquiryInsideList;
         private List<InquiryWorkBookModel> _inquiryWorkBookList;
-        
+        private List<InquirySHiJuanModel> _inquiryShiJuanList;
+
 
         /// <summary>
         /// 鍗板埛绫诲瀷
@@ -32,9 +33,25 @@
         public int PrintSizeId { get; set; }
 
         /// <summary>
+        /// 绾稿紶灏哄
+        /// </summary>
+        public string paperSize6P { get; set; }
+        public string paperSizeA4 { get; set; }
+        public string paperSizeA3 { get; set; }
+        /// <summary>
+        /// 绾稿紶灏哄
+        /// </summary>
+        public string paperSize8P { get; set; }
+
+        /// <summary>
         /// 绾稿紶Id
         /// </summary>
         public int PaperId { get; set; }
+
+        /// <summary>
+        /// 绾稿紶Id
+        /// </summary>
+        public string Qitazhi { get; set; }
 
         /// <summary>
         /// 鍏嬮噸
@@ -142,6 +159,36 @@
         public string PaperMP { get; set; }
 
         /// <summary>
+        /// 涓婅仈
+        /// </summary>
+        public string shanglian { get; set; }
+
+        /// <summary>
+        /// 涓仈
+        /// </summary>
+        public string zhonglianlian1 { get; set; }
+
+        /// <summary>
+        /// 涓仈
+        /// </summary>
+        public string zhonglianlian2 { get; set; }
+
+        /// <summary>
+        /// 涓仈
+        /// </summary>
+        public string zhonglianlian3 { get; set; }
+
+        /// <summary>
+        /// 涓嬭仈
+        /// </summary>
+        public string xialian { get; set; }
+
+        /// <summary>
+        /// 绾稿紶鍚嶇О
+        /// </summary>
+        public string pageNumsbs { get; set; }
+
+        /// <summary>
         /// 鍚嶇墖娆炬暟
         /// </summary>
         public int PrintBoxNumber { get; set; }
@@ -171,6 +218,24 @@
         /// </summary>
         public string PrintSizeName { get; set; }
 
+        /// <summary>
+        /// 鍗板埛灏哄
+        /// </summary>
+        public string PrintSizeName6P { get; set; }
+        public string PrintSizeName8P { get; set; }
+        public string PrintSizeNameA4 { get; set; }
+        public string PrintSizeNameA3 { get; set; }
+
+        /// <summary>
+        /// papershijuan
+        /// </summary>
+        public string papershijuan { get; set; }
+
+        public string printColorshijuan { get; set; }
+
+        public string paper1 { get; set; }
+        public string printColor1 { get; set; }
+        public string printColor2 { get; set; }
         /// <summary>
         /// 瑕嗚啘绫诲瀷
         /// </summary>
@@ -272,6 +337,11 @@
         public string JTWZ { get; set; }
 
         /// <summary>
+        /// 灏侀潰鍗板埛瑕佹眰
+        /// </summary>
+        public string jtWZFM { get; set; }
+
+        /// <summary>
         /// 灏侀潰绫诲瀷
         /// </summary>
         public string FrontType { get; set; }
@@ -295,6 +365,44 @@
         /// 鑷畾涔夊昂瀵搁暱
         /// </summary>
         public string secondSize { get; set; }
+
+
+        /// <summary>
+        /// 鑷畾涔夊昂瀵稿
+        /// </summary>
+        public string firstSize6P { get; set; }
+
+        /// <summary>
+        /// 鑷畾涔夊昂瀵搁暱
+        /// </summary>
+        public string secondSize8P { get; set; }
+
+        /// <summary>
+        /// 鑷畾涔夊昂瀵稿
+        /// </summary>
+        public string firstSize8P { get; set; }
+
+        /// <summary>
+        /// 鑷畾涔夊昂瀵搁暱
+        /// </summary>
+        public string secondSize6P { get; set; }
+
+        /// <summary>
+        /// 鑷畾涔夊昂瀵稿
+        /// </summary>
+        public string firstSizeA4 { get; set; }
+        /// <summary>
+        /// 鑷畾涔夊昂瀵搁暱
+        /// </summary>
+        public string secondSizeA3 { get; set; }
+        /// <summary>
+        /// 鑷畾涔夊昂瀵稿
+        /// </summary>
+        public string firstSizeA3 { get; set; }
+        /// <summary>
+        /// 鑷畾涔夊昂瀵搁暱
+        /// </summary>
+        public string secondSizeA4 { get; set; }
 
         /// <summary>
         /// 鍘氬害
@@ -376,8 +484,31 @@
                 _inquiryWorkBookList = value;
             }
         }
+        /// <summary>
+        /// 鐢诲唽锛屼功鍒婄殑鍐呴〉鍙傛暟鍒楄〃
+        /// </summary>
+        public List<InquirySHiJuanModel> InquirySHiJuanList
+        {
+            get
+            {
+                if (_inquiryShiJuanList == null)
+                {
+                    _inquiryShiJuanList = new List<InquirySHiJuanModel>();
+                }
+                return _inquiryShiJuanList;
+            }
+            set
+            {
+                if (_inquiryShiJuanList == null)
+                {
+                    _inquiryShiJuanList = new List<InquirySHiJuanModel>();
+                }
+                _inquiryShiJuanList = value;
+            }
+        }
         
 
+
         #region 鐢ㄤ簬鏄剧ず
 
         /// <summary>

--
Gitblit v1.9.1