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_ShebeiWeixiu.cs | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_ShebeiWeixiu.cs b/CY_ECommercePlatform/CY.Model/OA/OA_ShebeiWeixiu.cs
index d6b0e63..68c23e4 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_ShebeiWeixiu.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_ShebeiWeixiu.cs
@@ -24,6 +24,7 @@
public decimal? WeixiuPrice { get; set; }
public int? Zerenren { get; set; }
public string ZerenrenName { get; set; }
+ public string ShebeiZerenrenName { get; set; }
public decimal? DanzePrice { get; set; }
public int? WeixiuShebeiId { get; set; }
@@ -32,9 +33,39 @@
public int? FukuanshenqingId { get; set; }
+
+ public string Fukuanfangshi { get; set; }
+
+ public string FukuanfangshiName { get
+ {
+ if (string.IsNullOrEmpty(this.Fukuanfangshi))
+ {
+ return "";
+ }
+ else if (this.Fukuanfangshi == "1")
+ {
+ return "瀵瑰叕杞处";
+ }
+ else if (this.Fukuanfangshi == "2")
+ {
+ return "鐜伴噾鏀粯";
+ }
+ else
+ {
+ return "";
+ }
+
+
+ }
+ }
+
//鏄惁浠樿垂 1鏄�2鍚�
public int? Shifoufufei { get; set; }
-
+
+
+ //缁翠慨瀹℃壒鏄惁閫氳繃 1鎵瑰噯2涓嶆壒鍑�
+ public int? ApprovalStatus { get; set; }
+
public DateTime? CreateTime { get; set; }
public string Creator{ get; set; }
@@ -287,7 +318,21 @@
this.CateName = isChange ? MyConvert.ConvertToString(value) : CateName;
theValue = this.CateName;
}
-
+ else if ("ShebeiZerenrenName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 22)
+ {
+ this.ShebeiZerenrenName = isChange ? MyConvert.ConvertToString(value) : ShebeiZerenrenName;
+ theValue = this.ShebeiZerenrenName;
+ }
+ else if ("ApprovalStatus".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 23)
+ {
+ this.ApprovalStatus = isChange ? MyConvert.ConvertToInt32(value) : ApprovalStatus;
+ theValue = this.ApprovalStatus;
+ }
+ else if ("Fukuanfangshi".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 24)
+ {
+ this.Fukuanfangshi = isChange ? MyConvert.ConvertToString(value) : Fukuanfangshi;
+ theValue = this.Fukuanfangshi;
+ }
return theValue;
--
Gitblit v1.9.1