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 | 87 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 85 insertions(+), 2 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
index a6797ee..865d732 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
@@ -23,6 +23,9 @@
OA_FirmAccount firmAccount = null;
OA_FukuanshenqingBLL _fukuanshenqingBLL = null;
OA_SuppliersBLL oA_SuppliersBLL = null;
+ OA_StaffBLL staffBLL = null;
+ OA_BaozhengjinBLL oA_BaozhengjinBLL = null;
+ OA_ShebeiWeixiuBLL oA_ShebeiWeixiuBLL = null;
public WaixieExpenses()
{
@@ -34,6 +37,9 @@
firmAccountRecord = new OA_FirmAccountRecord();
_fukuanshenqingBLL = new OA_FukuanshenqingBLL();
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)
@@ -118,10 +124,11 @@
{
var id = this.Keyid.Value.ToInt32().Value;
var money = this.txtMoney.Value.ToDecimal2().Value;
+ var molingmoney = this.txtMolingMoney.Value.ToDecimal2();
var Youwufapiao = Request["rdoReceiveQuannbu"];
var fukuanshenqing = _fukuanshenqingBLL.GetModelByKeyid(id);
- if (fukuanshenqing.FukuanStatus == 2 && money>0)
+ if (fukuanshenqing.FukuanStatus == 2 && money > 0)
{
JavaScript.MessageBox("璇ョ敵璇峰凡缁忎粯娆剧粨鏉燂紒", this);
return;
@@ -131,6 +138,16 @@
{
JavaScript.MessageBox("鎿嶄綔閲戦澶т簬鍓╀綑搴斾粯閲戦锛�", this);
return;
+ }
+
+
+ if (molingmoney.HasValue && molingmoney.Value > 0)
+ {
+ if((money + molingmoney.Value ) != (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ {
+ JavaScript.MessageBox("鎿嶄綔閲戦鍔犳姽闆堕噾棰濆繀椤荤瓑浜庡墿浣欏簲浠橀噾棰濓紒", this);
+ return;
+ }
}
if (fukuanshenqing.Youwufapiao == 2 && Youwufapiao == "1")
@@ -151,11 +168,33 @@
try
{
var yishoumoney = fukuanshenqing.Yishoumoney.HasValue ? fukuanshenqing.Yishoumoney.Value : 0;
- fukuanshenqing.Yishoumoney = yishoumoney + money;
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)
+ {
+ 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);
+ }
+ }
+ }
+
+ fukuanshenqing.Yishoumoney = yishoumoney + money;
fukuanshenqing.Updater = CurrentUser.ShortName;
fukuanshenqing.LastUpdateTime = DateTime.Now;
fukuanshenqing.Youwufapiao = Youwufapiao.ToInt32();
@@ -181,12 +220,56 @@
firmAccount.AllExpenses = this.txtMoney.Value.ToDecimal2() + firmAccount.AllExpenses;
firmAccount.Balance = firmAccount.Balance - this.txtMoney.Value.ToDecimal2();
sddd = _OA_FirmAccountRecordBLL.AddModel(firmAccountRecord, firmAccount);
+
+ if (!string.IsNullOrEmpty(this.selSubject.Value))
+ {
+ var oA_SubjectSet = _OA_SubjectSetBLL.getSingleSubject(firmAccountRecord.SubjectId);
+ if (fukuanshenqing.Fukuanyongtu == "鍏朵粬浠樻" && (oA_SubjectSet.SubjectName.IndexOf("鎶曟爣淇濊瘉閲�") >= 0 || oA_SubjectSet.SubjectName.IndexOf("灞ョ害淇濊瘉閲�") >= 0))
+ {
+ //濡傛灉閫夋嫨绉戠洰鏄繚璇侀噾锛屾彃鍏ヤ互鏉′繚璇侀噾鏁版嵁
+ OA_Baozhengjin oA_Baozhengjin = new OA_Baozhengjin();
+ oA_Baozhengjin.FirmId = CurrentUser.MemberId;
+ oA_Baozhengjin.FukuanTime = DateTime.Now;
+
+ oA_Baozhengjin.Zhanghuleixing = this.selAcoountType.Value;
+
+ var ss = _Sys_DictionaryBLL.GetDataByType("璐︽埛绫诲瀷").FirstOrDefault(x => x.Name == oA_Baozhengjin.Zhanghuleixing);
+ if (ss != null)
+ {
+ oA_Baozhengjin.ReceiveWay = ss.Keyid;
+ }
+
+ oA_Baozhengjin.Account = Request["selAccountName"].ToInt32();
+ oA_Baozhengjin.Fukuanzhanghu = firmAccount.AccountName + "-" + firmAccount.UserName;
+ oA_Baozhengjin.Subject = firmAccountRecord.SubjectId;
+ oA_Baozhengjin.Fukuankemu = oA_SubjectSet.SubjectName;
+ oA_Baozhengjin.Fukuanmoney = firmAccountRecord.Money;
+ oA_Baozhengjin.Shoukuandanwei = firmAccountRecord.PaymentUnit;
+ oA_Baozhengjin.remark = firmAccountRecord.OperationalMatters;
+ oA_Baozhengjin.TuikuanTime = null;
+
+ oA_Baozhengjin.TuikuanStatus = 1;
+ oA_Baozhengjin.Creater = CurrentUser.ShortName;
+ oA_Baozhengjin.CreateTime = oA_Baozhengjin.FukuanTime;
+ oA_Baozhengjin.Updater = CurrentUser.ShortName;
+ oA_Baozhengjin.LastUpdateTime = oA_Baozhengjin.FukuanTime;
+ oA_Baozhengjin.MemberName = fukuanshenqing.Creater;
+
+ var oA_Staff = staffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.Name == oA_Baozhengjin.MemberName).FirstOrDefault();
+ oA_Baozhengjin.MemberId = oA_Staff.Keyid;
+
+ var sss = oA_BaozhengjinBLL.InsertModel(oA_Baozhengjin);
+
+ }
+ }
}
if (sddd)
{
+
+
scope.Complete();
JavaScript.MessageBox("浠樻鎴愬姛", this, true, true);
}
--
Gitblit v1.9.1