From a737eb14fe1b705b07f017e0edc002fae6f857c3 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 03 四月 2026 12:59:20 +0800
Subject: [PATCH] 发版套数再增加自定义填写数字 补单的生产施工单不要默认开料规格的数据 "付款未开票”列表中的金额合计放在“金额”格子下面,既要单页合计,又要每页的全部合计 生产要求跟“数量:    ”的宽度一样 印刷数量的填写格子跟后道工序一样长

---
 CY_ECommercePlatform/CY.Model/OA/OA_WageAwardPunish.cs |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 58 insertions(+), 0 deletions(-)

diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_WageAwardPunish.cs b/CY_ECommercePlatform/CY.Model/OA/OA_WageAwardPunish.cs
index 474638b..37363f2 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_WageAwardPunish.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_WageAwardPunish.cs
@@ -28,6 +28,48 @@
         private string _operator;
 
         /// <summary>
+        /// 缂栧彿   0 鏈敵璇�  1 宸茬敵璇�  2 鐢宠瘔鎴愬姛   3 鐢宠瘔澶辫触
+        /// </summary>	
+        public int? Shifoushensu { get; set; }
+
+
+        /// <summary>
+        /// 鏉ユ簮绫诲瀷   0 宸ヤ綔workplan  1  闂鍙嶉
+        /// </summary>	
+        public int? LaiyuanType { get; set; }
+
+
+        public Guid? WentiId { get; set; }
+
+        public string ShifoushensuName
+        {
+            get
+            {
+                if(!Shifoushensu.HasValue || Shifoushensu.Value == 0)
+                {
+                    return "鏈敵璇�";
+                }
+                else if ( Shifoushensu.Value == 1)
+                {
+                    return "宸茬敵璇�";
+                }
+                else if (Shifoushensu.Value == 2)
+                {
+                    return "鐢宠瘔鎴愬姛";
+                }
+                else if (Shifoushensu.Value == 3)
+                {
+                    return "鐢宠瘔澶辫触";
+                }
+                else  
+                {
+                    return "鏈敵璇�";
+                }
+
+            }
+        }
+
+        /// <summary>
         /// 缂栧彿
         /// </summary>		
         public int? Keyid
@@ -344,6 +386,22 @@
                 this.PushMoney = isChange ? MyConvert.ConvertToDecimal(value) : PushMoney;
                 theValue = this.PushMoney;
             }
+            else if ("Shifoushensu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 19)
+            {
+                this.Shifoushensu = isChange ? MyConvert.ConvertToInt32(value) : Shifoushensu;
+                theValue = this.Shifoushensu;
+            }
+            else if ("LaiyuanType".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 20)
+            {
+                this.LaiyuanType = isChange ? MyConvert.ConvertToInt32(value) : LaiyuanType;
+                theValue = this.LaiyuanType;
+            }
+            else if ("WentiId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 21)
+            {
+                this.WentiId = isChange ? MyConvert.ConvertToGuid(value) : WentiId;
+                theValue = this.WentiId;
+            }
+            
             return theValue;
         }
 

--
Gitblit v1.9.1