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_WageAwardPunish.cs |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 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..a19159f 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_WageAwardPunish.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_WageAwardPunish.cs
@@ -28,6 +28,39 @@
         private string _operator;
 
         /// <summary>
+        /// 缂栧彿   0 鏈敵璇�  1 宸茬敵璇�  2 鐢宠瘔鎴愬姛   3 鐢宠瘔澶辫触
+        /// </summary>	
+        public int? Shifoushensu { 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 +377,11 @@
                 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;
+            }
             return theValue;
         }
 

--
Gitblit v1.9.1