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_Fukuanshenqing.cs |   72 ++++++++++++++++++++++++++++++++++-
 1 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Fukuanshenqing.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Fukuanshenqing.cs
index 6d353f7..3a20c1c 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Fukuanshenqing.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Fukuanshenqing.cs
@@ -43,7 +43,8 @@
         /// <summary>
         /// 瀹㈡埛id
         /// </summary>
-        public int SupplierId { get; set; }
+        public string SupplierId { get; set; }
+
         /// <summary>
         /// 瀹㈡埛id
         /// </summary>
@@ -61,10 +62,14 @@
 
         public decimal? Fukuanmoney { get; set; }
 
+        public decimal? Molingmoney { get; set; }
+
         public decimal? Yishoumoney { get; set; }
 
 
         public string Bank { get; set; }
+
+        public string Huming { get; set; }
 
         public string AccountID { get; set; }
 
@@ -151,8 +156,41 @@
             get;
             set;
         }
+        /// <summary>
+        /// 淇敼鏃堕棿
+        /// </summary>
+        public string WorkPlanId { get; set; }
 
-        
+
+        /// <summary>
+        /// 寮�绁ㄨ鏄�
+        /// </summary>
+        public string Kaipiaoshuoming
+        {
+            get;
+            set;
+        }
+
+
+        /// <summary>
+        /// 璇存槑浜�
+        /// </summary>
+        public string Shuominger
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 璇存槑鏃堕棿
+        /// </summary>
+        public DateTime? ShuomingTime
+        {
+            get;
+            set;
+        }
+
+
 
         #endregion Model
 
@@ -183,7 +221,7 @@
             }
             else if ("SupplierId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
             {
-                this.SupplierId = isChange ? MyConvert.ConvertToInt32(value).Value : SupplierId;
+                this.SupplierId = isChange ? MyConvert.ConvertToString(value) : SupplierId;
                 theValue = this.SupplierId;
             }
             else if ("SupplierName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
@@ -245,6 +283,12 @@
                 this.Bank = isChange ? MyConvert.ConvertToString(value) : Bank;
                 theValue = this.Bank;
             }
+            else if ("Huming".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 28)
+            {
+                this.Huming = isChange ? MyConvert.ConvertToString(value) : Huming;
+                theValue = this.Huming;
+            }
+            
             else if ("AccountID".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 22)
             {
                 this.AccountID = isChange ? MyConvert.ConvertToString(value) : AccountID;
@@ -276,7 +320,29 @@
                 this.DindanId = isChange ? MyConvert.ConvertToString(value) : DindanId;
                 theValue = this.DindanId;
             }
+            else if ("Molingmoney".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 28)
+            {
+                this.Molingmoney = isChange ? MyConvert.ConvertToDecimal(value) : Molingmoney;
+                theValue = this.Molingmoney;
+            }
 
+            else if ("Kaipiaoshuoming".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 29)
+            {
+                this.Kaipiaoshuoming = isChange ? MyConvert.ConvertToString(value) : Kaipiaoshuoming;
+                theValue = this.Kaipiaoshuoming;
+            }
+
+            else if ("Shuominger".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 30)
+            {
+                this.Shuominger = isChange ? MyConvert.ConvertToString(value) : Shuominger;
+                theValue = this.Shuominger;
+            }
+
+            else if ("ShuomingTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 31)
+            {
+                this.ShuomingTime = isChange ? MyConvert.ConvertToDateTime(value) : ShuomingTime;
+                theValue = this.ShuomingTime;
+            }
 
             return theValue;
         }

--
Gitblit v1.9.1