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_Staff.cs | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 105 insertions(+), 1 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs
index 85f6dcb..e07e3fb 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs
@@ -74,7 +74,7 @@
private string _managecity;
private string _managecountry;
private string _managecountry1;
-
+ public string RoleName { get; set; }
/// <summary>
/// 鍛樺伐缂栧彿
/// </summary>
@@ -313,6 +313,65 @@
_isaccountmanager = value;
}
}
+
+ /// <summary>
+ /// BF_IsDriver
+ /// </summary>
+ public bool BF_IsDriver
+ {
+ get;
+
+ set;
+ }
+ /// <summary>
+ /// BF_IsDeliverManage
+ /// </summary>
+ public bool BF_IsDeliverManage
+ {
+ get;
+
+ set;
+ }
+ /// <summary>
+ /// BF_IsBaoxiaozhuguan
+ /// </summary>
+ public bool BF_IsBaoxiaozhuguan
+ {
+ get;
+
+ set;
+ }
+
+ /// <summary>
+ /// BF_Isbaoxiaojingli
+ /// </summary>
+ public bool BF_Isbaoxiaojingli
+ {
+ get;
+
+ set;
+ }
+
+ /// <summary>
+ /// BF_IsGongwen
+ /// </summary>
+ public bool? BF_IsGongwen
+ {
+ get;
+
+ set;
+ }
+
+ /// <summary>
+ /// BF_IsChangyongziliao
+ /// </summary>
+ public bool? BF_IsChangyongziliao
+ {
+ get;
+
+ set;
+ }
+
/// <summary>
/// 鎵�鍦ㄩ儴闂�
/// </summary>
@@ -555,6 +614,20 @@
_sm_contractendtime = value;
}
}
+
+
+
+ /// <summary>
+ /// 鍚堝悓鍒版湡鏃堕棿
+ /// </summary>
+ public string SM_ContractEndTimeName
+ {
+ get;
+
+ set;
+
+ }
+
/// <summary>
/// 绂昏亴瀹℃壒/鍦ㄨ亴0,鐢宠涓�1,鍚屾剰绂昏亴2,鎷掔粷鐢宠3
/// </summary>
@@ -1277,6 +1350,37 @@
this.SM_SocialSecuritySelfMoney = isChange ? MyConvert.ConvertToDecimal(value) : SM_SocialSecuritySelfMoney;
theValue = this.SM_SocialSecuritySelfMoney;
}
+ else if ("BF_IsDriver".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 65)
+ {
+ this.BF_IsDriver = isChange ? MyConvert.ConvertToBoolean(value) : BF_IsDriver;
+ theValue = this.BF_IsDriver;
+ }
+ else if ("BF_IsDeliverManage".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 66)
+ {
+ this.BF_IsDeliverManage = isChange ? MyConvert.ConvertToBoolean(value) : BF_IsDeliverManage;
+ theValue = this.BF_IsDeliverManage;
+ }
+ else if ("BF_IsBaoxiaozhuguan".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 67)
+ {
+ this.BF_IsBaoxiaozhuguan = isChange ? MyConvert.ConvertToBoolean(value) : BF_IsBaoxiaozhuguan;
+ theValue = this.BF_IsBaoxiaozhuguan;
+ }
+ else if ("BF_Isbaoxiaojingli".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 68)
+ {
+ this.BF_Isbaoxiaojingli = isChange ? MyConvert.ConvertToBoolean(value) : BF_Isbaoxiaojingli;
+ theValue = this.BF_Isbaoxiaojingli;
+ }
+ else if ("BF_IsGongwen".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 69)
+ {
+ this.BF_IsGongwen = isChange ? MyConvert.ConvertToBoolean(value) : BF_IsGongwen;
+ theValue = this.BF_IsGongwen;
+ }
+ else if ("BF_IsChangyongziliao".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 70)
+ {
+ this.BF_IsChangyongziliao = isChange ? MyConvert.ConvertToBoolean(value) : BF_IsChangyongziliao;
+ theValue = this.BF_IsChangyongziliao;
+ }
+
return theValue;
}
--
Gitblit v1.9.1