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/BaoxiaoFukuanPiliang.aspx.cs |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanPiliang.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanPiliang.aspx.cs
index 7483b37..5291709 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanPiliang.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanPiliang.aspx.cs
@@ -25,6 +25,7 @@
         OA_StaffBLL staffBLL = null;
         OA_WorkPlanBll bll_OA_WorkPlanBll = null;
         OA_DepartmentBll oA_DepartmentBll = null;
+        OA_ShebeiWeixiuBLL oA_ShebeiWeixiuBLL = null;
         public BaoxiaoFukuanPiliang()
         {
             firmAccount = new OA_FirmAccount();
@@ -37,6 +38,7 @@
             staffBLL = new OA_StaffBLL();
             bll_OA_WorkPlanBll = new OA_WorkPlanBll();
             oA_DepartmentBll = new OA_DepartmentBll();
+            oA_ShebeiWeixiuBLL = new OA_ShebeiWeixiuBLL();
         }
 
         protected void Page_Load(object sender, EventArgs e)
@@ -141,13 +143,13 @@
                         firmAccountRecord.RecordTypeId = 2;//鏀嚭
                         firmAccountRecord.Remark = this.txtRemark.Value;
                         firmAccountRecord.SubjectId = oA_WorkPlan.RewardResult.ToInt32(); //this.selSubject.Value.ToInt32();
-                        firmAccountRecord.ResidualAmount = firmAccount.Balance - this.txtMoney.Value.ToDecimal2();
+                        firmAccountRecord.ResidualAmount = firmAccount.Balance - oA_WorkPlan.PlanMoney; //this.txtMoney.Value.ToDecimal2();
                         var oA_Department = oA_DepartmentBll.GetModelByKeyid(oA_WorkPlan.DepartId);
                         if (oA_Department != null)
                             firmAccountRecord.Department = oA_Department.Name; //this.txtDepartment.Value;
 
-                        firmAccount.AllExpenses = this.txtMoney.Value.ToDecimal2() + firmAccount.AllExpenses;
-                        firmAccount.Balance = firmAccount.Balance - this.txtMoney.Value.ToDecimal2();
+                        firmAccount.AllExpenses = oA_WorkPlan.PlanMoney/*this.txtMoney.Value.ToDecimal2()*/ + firmAccount.AllExpenses;
+                        firmAccount.Balance = firmAccount.Balance - oA_WorkPlan.PlanMoney;// this.txtMoney.Value.ToDecimal2();
 
                         if (_OA_FirmAccountRecordBLL.AddModel(firmAccountRecord, firmAccount))
                         {
@@ -160,6 +162,13 @@
                                 oA_WorkPlan.Operator = CurrentUser.ShortName;
                                 oA_WorkPlan.LastUpdateTime = DateTime.Now;
                                 var res = bll_OA_WorkPlanBll.UpdateModel(oA_WorkPlan);
+
+                                var shebeiWeixiu = oA_ShebeiWeixiuBLL.GetModelBytiaojian(null, oA_WorkPlan.Keyid, null);
+                                if (shebeiWeixiu != null)
+                                {
+                                    shebeiWeixiu.Shifoufufei = 1;
+                                    oA_ShebeiWeixiuBLL.UpdateModel(shebeiWeixiu);
+                                }
                             }
                         }
 

--
Gitblit v1.9.1