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_Procurement.cs |   62 +++++++++++++++++++++++++++++++
 1 files changed, 62 insertions(+), 0 deletions(-)

diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Procurement.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Procurement.cs
index e028959..06d8ea9 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Procurement.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Procurement.cs
@@ -49,6 +49,9 @@
         private string _BrandName;
         private decimal? _tanPrice;
 
+
+        public string WarehouseName { get; set; }
+
         /// <summary>
         /// 绾稿紶鍚ㄤ环
         /// </summary>
@@ -413,6 +416,39 @@
                 return _commodityid;
             }
         }
+
+        /// <summary>
+        /// 璁㈠崟id
+        /// </summary>
+        public int? orderId
+        {
+            get;set;
+        }
+
+        /// <summary>
+        /// 鍗颁欢鍚嶇О
+        /// </summary>
+        public  string DocumentName
+        {
+            get; set;
+        }
+
+        /// <summary>
+        /// 閲囪喘浜�
+        /// </summary>
+        public int? CaigourenId
+        {
+            get; set;
+        }
+
+        /// <summary>
+        /// 閲囪喘浜�
+        /// </summary>
+        public string Caigouren
+        {
+            get; set;
+        }
+
         #endregion Model
 
         #region Visiter
@@ -560,6 +596,32 @@
                 this.Commodityid = isChange ? MyConvert.ConvertToInt32(value) : Commodityid;
                 theValue = this.Commodityid;
             }
+            else if ("orderId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 26)
+            {
+                this.orderId = isChange ? MyConvert.ConvertToInt32(value) : orderId;
+                theValue = this.orderId;
+            }
+            else if ("DocumentName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 26)
+            {
+                this.DocumentName = isChange ? MyConvert.ConvertToString(value) : DocumentName;
+                theValue = this.DocumentName;
+            }
+            else if ("WarehouseName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 27)
+            {
+                this.WarehouseName = isChange ? MyConvert.ConvertToString(value) : WarehouseName;
+                theValue = this.WarehouseName;
+            }
+            else if ("Caigouren".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 28)
+            {
+                this.Caigouren = isChange ? MyConvert.ConvertToString(value) : Caigouren;
+                theValue = this.Caigouren;
+            }
+            else if ("CaigourenId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 28)
+            {
+                this.CaigourenId = isChange ? MyConvert.ConvertToInt32(value) : CaigourenId;
+                theValue = this.CaigourenId;
+            }
+
             return theValue;
         }
         #endregion

--
Gitblit v1.9.1