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/business/kaipiaoConfirm.aspx.cs | 91 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 86 insertions(+), 5 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs
index 5a982f0..99049fc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs
@@ -22,6 +22,8 @@
EC_OrderBLL _eC_OrderBLL = null;
OA_KaipiaoshenqingBLL _oA_KaipiaoshenqingBLL = null;
OA_CorporateClientsBLL _oA_CorporateClientsBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+ OA_WorkPlanBll oA_WorkReminderBll = null;
//鍒濆鍖�
@@ -31,6 +33,8 @@
_eC_OrderBLL = new EC_OrderBLL();
_oA_CorporateClientsBLL = new OA_CorporateClientsBLL();
_oA_KaipiaoshenqingBLL = new OA_KaipiaoshenqingBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ oA_WorkReminderBll = new OA_WorkPlanBll();
}
//椤甸潰鍔犺浇
@@ -48,6 +52,13 @@
string orderIdStr = Request["id"];
if (!string.IsNullOrEmpty(orderIdStr))
{
+ this.selBusinessManager.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, true, false);
+ this.selBusinessManager.DataTextField = "Name";
+ this.selBusinessManager.DataValueField = "Keyid";
+ this.selBusinessManager.DataBind();
+ this.selBusinessManager.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ //this.selBusinessManager.Items.Insert(1, new ListItem(CurrentUser.ShortName, CurrentUser.ShortName));
+
decimal total = 0;
string name = "";
this.txtOrderIds.Value = orderIdStr;
@@ -59,10 +70,21 @@
var models = _eC_OrderBLL.GetOrderByIds(orderIdStr).ToList();
if(models!=null&& models.Count > 0)
{
+ var model = bll_EC_OrderBasicBLL.SelectModelById(models[0].Keyid.Value);
name = models[0].BuyerName;
+ OA_CorporateClients oA_CorporateClients = _oA_CorporateClientsBLL.GetModel(models[0].BuyerId);
+ if (oA_CorporateClients != null && oA_CorporateClients.BusinessManagerId.HasValue && oA_CorporateClients.BusinessManagerId.Value>0)
+ {
+ this.selBusinessManager.Value = oA_CorporateClients.BusinessManagerId.HasValue ? oA_CorporateClients.BusinessManagerId.Value.ToString() : "";
+ }
+ else
+ {
+ JavaScript.MessageBox("璇风淮鎶ゅ鎴风殑涓氬姟缁忕悊", this);
+ }
+
}
total = models.Sum(x=>x.SumPrice)??0;
-
+ txtZengjianmoney.Value = "0";
//foreach (var item in idsArray)
@@ -77,9 +99,10 @@
// }
// }
//}
- //}
+ //}
kpmoney.InnerText = total.ToString("0.00");
khname.InnerText = name;
+ Dingdanshu.InnerText = orderIdStr.Split(',').Length +"涓�";
}
else
{
@@ -98,6 +121,12 @@
/// </summary>
public void AcceptAll3()
{
+ if (string.IsNullOrEmpty(this.selBusinessManager.Value))
+ {
+ JavaScript.MessageBox("璇烽�夋嫨涓氬姟缁忕悊", this);
+ return;
+ }
+
string ids = this.txtOrderIds.Value;
string[] idsArray = ids.Split(',');
if (idsArray != null && idsArray.Length > 0)
@@ -140,8 +169,59 @@
oA_DeliverPlan.KehuqianshouCreater = null;
oA_DeliverPlan.KaipiaoquerenTime = null;
oA_DeliverPlan.KaipiaoquerenCreater = null;
- oA_DeliverPlan.BusinessManagerId = oA_CorporateClients.BusinessManagerId ?? 0;
+ oA_DeliverPlan.BusinessManagerId = this.selBusinessManager.Value.ToInt32();
+ oA_DeliverPlan.Zengjianmoney = this.txtZengjianmoney.Value.ToDecimal2();
+ oA_DeliverPlan.kpmoney = this.kpmoney.InnerText.ToDecimal2();
+ oA_DeliverPlan.ApprovalStatus = 1;
+ oA_DeliverPlan.Dingdanshu = ids.Trim(',').Split(',').Length;
+ if (oA_DeliverPlan.Zengjianmoney < 0)
+ {
+ oA_DeliverPlan.ApprovalStatus = 0;
+ //闇�瑕佹坊鍔犲鎵逛俊鎭�
+ DateTime nowTime = DateTime.Now;
+ OA_WorkPlan m_OA_WorkPlan = new OA_WorkPlan();
+ m_OA_WorkPlan.ApprovalContent = "";
+ m_OA_WorkPlan.ApprovalStaffId = Guid.Empty;
+ m_OA_WorkPlan.ApprovalStaffName = "";
+ m_OA_WorkPlan.ApprovalStatus = 0;
+ m_OA_WorkPlan.ApprovalTime = nowTime;
+ m_OA_WorkPlan.EvaluationContent = "";
+ m_OA_WorkPlan.EvaluationStaff = "";
+ m_OA_WorkPlan.EvaluationStaffId = Guid.Empty;
+ m_OA_WorkPlan.EvaluationStatus = 0;
+ m_OA_WorkPlan.EvaluationTime = nowTime;
+ m_OA_WorkPlan.RewardContent = "";
+ m_OA_WorkPlan.RewardMoney = 0;
+ m_OA_WorkPlan.RewardResult = "";
+ m_OA_WorkPlan.RewardType = 0;
+ m_OA_WorkPlan.PlanStartTime = nowTime;
+ m_OA_WorkPlan.PlanStatus = 1;
+ m_OA_WorkPlan.SentStaffId = CurrentUser.TrueMemberId;
+ m_OA_WorkPlan.MemberId = CurrentUser.MemberId;
+
+ OA_Staff m_OA_Staff = bll_OA_StaffBLL.GetModelByMemberId(CurrentUser.TrueMemberId);
+ if (m_OA_Staff != null)
+ m_OA_WorkPlan.DepartId = m_OA_Staff.DepartmentId;
+ else
+ m_OA_WorkPlan.DepartId = 0;
+
+ m_OA_WorkPlan.PlanPeople = CurrentUser.TrueName;
+ m_OA_WorkPlan.ReciveStaffId = CurrentUser.TrueMemberId;
+
+ m_OA_WorkPlan.Operator = CurrentUser.ShortName;
+ m_OA_WorkPlan.PlanComplany = oA_DeliverPlan.Keyid.ToString();
+ m_OA_WorkPlan.PlanContent = this.khname.InnerText+" 鍑忓皯閲戦寮�绁ㄧ敵璇�";
+ m_OA_WorkPlan.PlanDataType = 13;
+ m_OA_WorkPlan.PlanMoney = oA_DeliverPlan.Zengjianmoney;
+ m_OA_WorkPlan.PlanRemark = oA_DeliverPlan.remark;
+ m_OA_WorkPlan.PlanRunTime = DateTime.Now;
+ m_OA_WorkPlan.PlanTitle = this.khname.InnerText + " 鍑忓皯閲戦寮�绁ㄧ敵璇�";
+ m_OA_WorkPlan.PlanType = 3;
+ m_OA_WorkPlan.LastUpdateTime = nowTime;
+ oA_WorkReminderBll.InsertModel(m_OA_WorkPlan);
+ }
+ oA_DeliverPlan.Shenqingleixing = "璁㈠崟寮�绁�";
oA_DeliverPlan.Creater = CurrentUser.TrueMemberId;
oA_DeliverPlan.CreateTime = DateTime.Now;
oA_DeliverPlan.Updater = CurrentUser.TrueMemberId;
@@ -179,9 +259,10 @@
scope.Dispose();
}
}
- JavaScript.MessageBox("鎻愪氦鎴愬姛", this);
+ //JavaScript.MessageBox("鎻愪氦鎴愬姛", this);
- JavaScript.RefreshDIVOpener(this);
+ //鎿嶄綔鎴愬姛
+ JavaScript.MessageBoxsssss("鎻愪氦鎴愬姛", this, true, true);
}
}
}
--
Gitblit v1.9.1