From 259584df9c06ade70f1f351affb35d4922e1263d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 07 十一月 2025 16:23:13 +0800
Subject: [PATCH] 这个打印送货单,你们给我做两种,做一张打印没得数量的,做一张打印有数量的。送货单格式就是32开,就哎就是A4排一半。你们打了测试,注意,美观。 把那个把它做出来,下一批就用这个自动打。 不是不是打印的要数量都是有数量,要没得数量都没得数量。就是点打印的时候就两个按钮嘛,一个是有数量打印,或者或者或者空白送货单打印。 现在这个现在的送货单都是没有数量噻。现在那个要的,比如你那里再打你那个打印关闭的按钮,要把搞成两个打印嘛,就是打印空白送货单和打印送货单。 好点打印空白送货单的,就是现在这样子。点打印送货单,打印的就是那个跟有有就是有数据的送货单。作业本送货统计查询,状态查询需要修改逻辑

---
 CY_ECommercePlatform/CY.Model/OA/OA_CorporateClients.cs |   76 +++++++++++++++++++++++++++++++++++++
 1 files changed, 75 insertions(+), 1 deletions(-)

diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClients.cs b/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClients.cs
index 8657c09..19cb69e 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClients.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClients.cs
@@ -420,6 +420,8 @@
                 return _ordermoney;
             }
         }
+     
+
         /// <summary>
         /// 鏈�鍚庝笅鍗曟椂闂�
         /// </summary>
@@ -518,6 +520,17 @@
                 return _lastupdatetime;
             }
         }
+
+        /// <summary>
+        /// 鏈�鍚庝慨鏀规椂闂�
+        /// </summary>
+        public DateTime? WanjieTime
+        {
+            set;
+            get;
+            
+        }
+
         /// <summary>
         /// 鎿嶄綔浜�
         /// </summary>
@@ -592,6 +605,51 @@
         }
 
         #region 鎵╁睍瀛楁
+
+
+
+        #region 2021骞翠慨鏀规柊澧炲姞瀛楁锛屽湪鏈湴鏌ヨ涓嶅湪瀛樺偍杩囩▼涓疄鐜�
+        /// <summary>
+        ///  鏈笅鍗曢噾棰�
+        /// </summary>
+        public decimal? LessOrderMoneyProperty { get; set; }
+        /// <summary>
+        /// 搴旀敹娆捐鍗曟暟閲�
+        /// </summary>
+        public int? NoOverOderCount { get; set; }
+        /// <summary>
+        /// 鍚堝悓鏁伴噺
+        /// </summary>
+        public int? ContractCount { get; set; }
+
+        /// <summary>
+        /// 鏄惁闇�瑕佹墽琛屼簡鏃ュ父缁存姢
+        /// </summary>
+        private bool? _NeedWiHu;
+
+        public bool? NeedWiHu
+        {
+            get { return _NeedWiHu; }
+            set { _NeedWiHu = value; }
+        }
+        /// <summary>
+        /// 鏄惁闇�瑕佹墽琛岃妭鏃ョ淮鎶�
+        /// </summary>
+        private bool? _JieJiaRiWiHu;
+
+        public bool? JieJiaRiWiHu
+        {
+            get { return  _JieJiaRiWiHu; }
+            set {  _JieJiaRiWiHu = value; }
+        }
+
+        #endregion
+
+
+
+
+
+
         private string _sourcesinfoIdname;
         private string _customerindustriesidname;
         private string _customertypeidname;
@@ -1496,7 +1554,23 @@
                 this.Keyid1 = isChange ? MyConvert.ConvertToInt32(value) : Keyid1;
                 theValue = this.Keyid1;
             }
-            
+            //鏂板瀛楁NeedWiHu
+            else if ("NeedWiHu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 83)
+            {
+                this.NeedWiHu = isChange ? MyConvert.ConvertToBoolean(value) : NeedWiHu;
+                theValue = this.NeedWiHu;
+            }
+            //鏂板瀛楁JieJiaRiWiHu
+            else if ("JieJiaRiWiHu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 84)
+            {
+                this.JieJiaRiWiHu = isChange ? MyConvert.ConvertToBoolean(value) : JieJiaRiWiHu;
+                theValue = this.JieJiaRiWiHu;
+            }
+            else if ("WanjieTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 85)
+            {
+                this.WanjieTime = isChange ? MyConvert.ConvertToDateTime(value) : WanjieTime;
+                theValue = this.WanjieTime;
+            }
             return theValue;
         }
 

--
Gitblit v1.9.1