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_WorkPlan.cs | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 107 insertions(+), 2 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs
index d6d7cb0..9cffe31 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs
@@ -43,6 +43,66 @@
private string _rewardcontent;
private string _rewardresult;
private decimal? _rewardmoney;
+ public int? HoubufapiaoStatus { get; set; }
+
+ public string Fujian { get; set; }
+ public string Fapiao { get; set; }
+ public string HoubufapiaoStatusName { get
+ {
+ if(HoubufapiaoStatus.HasValue)
+ {
+ if(HoubufapiaoStatus == 1)
+ {
+ return "鏈夊彂绁�";
+ }
+ else if (HoubufapiaoStatus == 2)
+ {
+ return "鍚庤ˉ鍙戠エ";
+ }
+ else if (HoubufapiaoStatus == 3)
+ {
+ return "鏃犲彂绁�";
+ }else
+ return "";
+ }
+ else
+ {
+ return "";
+ }
+
+ }
+ }
+
+ public string EvaluationStatusName
+ {
+ get
+ {
+ if (EvaluationStatus.HasValue)
+ {
+ if (EvaluationStatus == 1)
+ {
+ return "宸蹭粯娆�";
+ }
+ else if (EvaluationStatus == 2)
+ {
+ return "鏈粯娆�";
+ }
+
+ else
+ return "鏈粯娆�";
+ }
+ else
+ {
+ return "";
+ }
+
+ }
+ }
+
+ public int Nengfoushenpi { get; set; }
+
+ public int Nengfoushanchu { get; set; }
+ public int? WufapiaoStatus { get; set; }
/// <summary>
/// 缂栧彿
@@ -130,7 +190,7 @@
}
/// <summary>
/// <para>璁″垝鎬ц川/瀹㈡埛鎷滆1,涓氬姟璺熷崟2,琛屾斂宸ヤ綔3,鍏朵粬璁″垝4</para>
- /// <para>璇风ず绫诲埆/璇峰亣5,鍑哄樊6,鐢ㄨ溅7,閲囪喘鐢宠8,鐗╁搧棰嗙敤9,涓氬姟缁忚垂10,瀹㈡埛鑱旇皧11,鍏朵粬12</para>
+ /// <para>璇风ず绫诲埆/璇峰亣5,鍑哄樊6,鐢ㄨ溅7,閲囪喘鐢宠8,鐗╁搧棰嗙敤9,涓氬姟缁忚垂10,瀹㈡埛鑱旇皧11,鍏朵粬12,寮�绁ㄧ敵璇�13</para>
/// </summary>
public int? PlanDataType
{
@@ -297,6 +357,41 @@
_approvalstatus = value;
}
}
+
+
+ public string ApprovalStatusName
+ {
+ get
+ {
+ if (ApprovalStatus.HasValue)
+ {
+ if (ApprovalStatus == 0)
+ {
+ return "鏈鎵�";
+ }
+ else if (ApprovalStatus == 1)
+ {
+ return "鎵瑰噯";
+ }
+ else if (ApprovalStatus == 2)
+ {
+ return "涓嶆壒鍑�";
+ }
+ else if (ApprovalStatus == 3)
+ {
+ return "鏈彁浜�";
+ }
+ else
+ return "鏈鎵�";
+ }
+ else
+ {
+ return "";
+ }
+
+ }
+ }
+
/// <summary>
/// 瀹℃牳鏃堕棿
/// </summary>
@@ -410,7 +505,7 @@
}
}
/// <summary>
- /// 濂栧姳绫诲瀷/鏃�0,濂栧姳1,鎯╃綒2
+ /// 濂栧姳绫诲瀷/鏃�0,濂栧姳1,缃氭2
/// </summary>
public int? RewardType
{
@@ -747,6 +842,16 @@
this.AllFine = isChange ? MyConvert.ConvertToDecimal(value) : AllFine;
theValue = this.AllFine;
}
+ else if ("HoubufapiaoStatus".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 30)
+ {
+ this.HoubufapiaoStatus = isChange ? MyConvert.ConvertToInt32(value) : HoubufapiaoStatus;
+ theValue = this.HoubufapiaoStatus;
+ }
+ else if ("WufapiaoStatus".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 30)
+ {
+ this.WufapiaoStatus = isChange ? MyConvert.ConvertToInt32(value) : WufapiaoStatus;
+ theValue = this.WufapiaoStatus;
+ }
return theValue;
}
#endregion Visiter
--
Gitblit v1.9.1