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

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
index 26592f9..865d732 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
@@ -25,6 +25,7 @@
         OA_SuppliersBLL oA_SuppliersBLL = null;
         OA_StaffBLL staffBLL = null;
         OA_BaozhengjinBLL oA_BaozhengjinBLL = null;
+        OA_ShebeiWeixiuBLL oA_ShebeiWeixiuBLL = null;
 
         public WaixieExpenses()
         {
@@ -38,6 +39,7 @@
             oA_SuppliersBLL = new OA_SuppliersBLL();
             staffBLL = new OA_StaffBLL();
             oA_BaozhengjinBLL = new OA_BaozhengjinBLL();
+            oA_ShebeiWeixiuBLL = new OA_ShebeiWeixiuBLL();
         }
 
         protected void Page_Load(object sender, EventArgs e)
@@ -169,6 +171,13 @@
                     if (money >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
                     {
                         fukuanshenqing.FukuanStatus = 2;
+                        if(fukuanshenqing.Fukuanyongtu == "璁惧缁翠慨璐�")
+                        {
+                            var shebeiWeixiu = oA_ShebeiWeixiuBLL.GetModelBytiaojian(null, null, fukuanshenqing.Keyid);
+                            shebeiWeixiu.Shifoufufei = 1;
+                            oA_ShebeiWeixiuBLL.UpdateModel(shebeiWeixiu);
+                        }
+                      
                     }
 
                     if (molingmoney.HasValue && molingmoney.Value > 0)
@@ -176,6 +185,12 @@
                         if ((money + molingmoney.Value) >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
                         {
                             fukuanshenqing.FukuanStatus = 2;
+                            if (fukuanshenqing.Fukuanyongtu == "璁惧缁翠慨璐�")
+                            {
+                                var shebeiWeixiu = oA_ShebeiWeixiuBLL.GetModelBytiaojian(null, null, fukuanshenqing.Keyid);
+                                shebeiWeixiu.Shifoufufei = 1;
+                                oA_ShebeiWeixiuBLL.UpdateModel(shebeiWeixiu);
+                            }
                         }
                     }
 
@@ -209,7 +224,7 @@
                         if (!string.IsNullOrEmpty(this.selSubject.Value))
                         {
                             var oA_SubjectSet = _OA_SubjectSetBLL.getSingleSubject(firmAccountRecord.SubjectId);
-                            if (oA_SubjectSet.SubjectName.IndexOf("鎶曟爣淇濊瘉閲�") >= 0 || oA_SubjectSet.SubjectName.IndexOf("灞ョ害淇濊瘉閲�") >= 0)
+                            if (fukuanshenqing.Fukuanyongtu == "鍏朵粬浠樻" && (oA_SubjectSet.SubjectName.IndexOf("鎶曟爣淇濊瘉閲�") >= 0 || oA_SubjectSet.SubjectName.IndexOf("灞ョ害淇濊瘉閲�") >= 0))
                             {
                                 //濡傛灉閫夋嫨绉戠洰鏄繚璇侀噾锛屾彃鍏ヤ互鏉′繚璇侀噾鏁版嵁
                                 OA_Baozhengjin oA_Baozhengjin = new OA_Baozhengjin();

--
Gitblit v1.9.1