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.WebForm/Pages/business/XiaoshoujixiaoList.aspx.cs |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx.cs
index 10b0bf7..16c14df 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx.cs
@@ -134,7 +134,21 @@
             xiadanjineheji = pa.heji2.Value.ToString("0.00"); ;
             weixiadanjineheji = pa.heji3.Value.ToString("0.00"); ;
             huikuanjineheji = pa.heji4.Value.ToString("0.00"); ;
-            weishoukuanjineheji = pa.heji5.Value.ToString("0.00"); ;
+            weishoukuanjineheji = (pa.heji5.HasValue ? pa.heji5.Value.ToString("0.00"):"0.00"); 
+
+
+            foreach ( var  oA_DeliverPlan in oA_DeliverPlans)
+            {
+                if(oA_DeliverPlan.ExpiretypeName == "鏃ユ湡")
+                {
+                    oA_DeliverPlan.ExpiretypeName = oA_DeliverPlan.ExpireTime.HasValue ? oA_DeliverPlan.ExpireTime.Value.ToString("yyyy-MM-dd") : "";
+                }
+
+                if(oA_DeliverPlan.ContracttypeName == "閲戦")
+                {
+                    oA_DeliverPlan.ContracttypeName = oA_DeliverPlan.Contractmoney.HasValue ? oA_DeliverPlan.Contractmoney.Value.ToString("F2") : "0.00";
+                }
+            }
 
 
             this.RepClientList.DataSource = oA_DeliverPlans;

--
Gitblit v1.9.1