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/financial/WaixieExpenses.aspx.cs |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
index 1ebb739..d7b231c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
@@ -81,11 +81,23 @@
             var fukuanshenqing = _fukuanshenqingBLL.GetModelByKeyid(id.ToInt32().Value);
             if (fukuanshenqing != null)
             {
-              var oA_Suppliers  =  oA_SuppliersBLL.getSingleSupplier(fukuanshenqing.SupplierId.ToString());
-                this.txtPaymentUnit.Value = oA_Suppliers.Name;
+                if (!string.IsNullOrWhiteSpace(fukuanshenqing.Huming))
+                {
+                    this.txtPaymentUnit.Value = fukuanshenqing.Huming;
+                }
+                else
+                {
+                    this.txtPaymentUnit.Value = fukuanshenqing.SupplierName;
+                    this.txtSupplierId.Value = fukuanshenqing.SupplierId.ToString();
+
+                   
+                   
+                   
+                }
+             
 
                 this.Keyid.Value = id;
-                this.txtSupplierId.Value = oA_Suppliers.Keyid.ToString();
+               
 
                 this.txtYouwufapiao.Value = fukuanshenqing.YouwufapiaoName;
 
@@ -139,11 +151,11 @@
                 try
                 {
                     var yishoumoney = fukuanshenqing.Yishoumoney.HasValue ? fukuanshenqing.Yishoumoney.Value : 0;
-                    fukuanshenqing.Yishoumoney = yishoumoney + money;
                     if (money >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
                     {
                         fukuanshenqing.FukuanStatus = 2;
                     }
+                    fukuanshenqing.Yishoumoney = yishoumoney + money;
                     fukuanshenqing.Updater = CurrentUser.ShortName;
                     fukuanshenqing.LastUpdateTime = DateTime.Now;
                     fukuanshenqing.Youwufapiao = Youwufapiao.ToInt32();

--
Gitblit v1.9.1