From a7e05ebe00fdcb649c012e5afc4a42a8d631e824 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 02 四月 2025 08:38:24 +0800
Subject: [PATCH] 删除客户管理查询条件中的“客户编号” 完成  新增订单---黑白印件  的后道工序最右边增加一个“口 竖式”,同前面套号、压痕一样,默认不勾选,是竖式的业务经理自己下单时勾选  完成提交外协付款申请时,增加上传审批证明的上传图片功能,可以添加多张图片;查询列表中增加“付款状态:全部、已付款、未付款”查询条件,默认全部;“完工状态”改为默认未完工   完成请示批复----付款申请  中也要向上面的需求一样,增加上传审批证明的上传图片功能,可以添加多张图片   完成在“请示批复”中进行“批复”操作的时候要能查看上传的审批图片  完成包装要求”要显示在打印的订单中 完成包装要求”要显示在打印的订单中 完成收据联单的新增订单中,纸张选无碳纸时,不显示“品牌”、“克重”,在联数的后面增加颜色选择:“颜色:上白下红”(匹配联数)订单管理中的“订单状态”删除,删除后新增两个状态:“完工状态:全部、未完工、已完工”和“送货状态:全部、已送货、未送货”  完成请示批复中默认“未批复”   完成请示批复中默认“未批复”   完成

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx.cs |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx.cs
index b82e9c4..17f899b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx.cs
@@ -86,7 +86,7 @@
 
 
 
-
+            string orderids = Request["SellerOrderId"] == null ? "" : Request["SellerOrderId"]; 
 
 
 
@@ -109,7 +109,7 @@
             SetParamValue(searchParam, 14, "");
             SetParamValue(searchParam, 15, "");
             SetParamValue(searchParam, 16, "");
-            SetParamValue(searchParam, 18, (CurrentUser.StaffId > 0 ? 1 : 0));
+            SetParamValue(searchParam, 18, 0);
             SetParamValue(searchParam, 19, CurrentUser.TrueMemberId);
             SetParamValue(searchParam, 20, CurrentUser.StaffId);
             SetParamValue(searchParam, 21, CurrentUser.TrueName);
@@ -117,7 +117,18 @@
             SetParamValue(searchParam, 23, "");
             SetParamValue(searchParam, 24, "");
             SetParamValue(searchParam, 25, "");
-            SetParamValue(searchParam, 26, KaipiaoshenqingId.ToGuid2());
+            if (string.IsNullOrEmpty(KaipiaoshenqingId))
+            {
+                SetParamValue(searchParam, 26, "");
+                SetParamValue(searchParam, 29, orderids);
+               
+            }
+            else
+            {
+                SetParamValue(searchParam, 26, KaipiaoshenqingId.ToGuid2());
+                SetParamValue(searchParam, 29, "");
+            }
+          
             SearchParam = searchParam;
 
 
@@ -133,7 +144,12 @@
             rptOrder.DataSource = result;
             rptOrder.DataBind();
 
-             
+            this.Spanjineheji.InnerText = string.Format("{0:F2}", result.Sum(x => x.SumPrice));
+            this.Spanyishou.InnerText = string.Format("{0:F2}", result.Sum(x => x.TradingSingle.PayedMoney));
+            this.Spanweishou.InnerText = string.Format("{0:F2}", result.Sum(x => x.UnPayedMoney));
+
+
+
             return true;
         }
 

--
Gitblit v1.9.1