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/workcar/CarManageAdd.aspx.cs | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageAdd.aspx.cs
index 931f764..2b7e5b1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageAdd.aspx.cs
@@ -21,11 +21,21 @@
{
Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
OA_CarManageBll oA_WorkReminderBll = null;
+ OA_StaffBLL o_StaffBLL = null;
+ OA_CarInsuranceBll bll_OA_CarInsuranceBll = null;
+ OA_CarrepairBLL bll_OA_CarrepairBLL = null;
+ OA_CarExaminedBll bll_OA_CarExaminedBll = null;
+ OA_CarMaintenanceBll bll_OA_CarMaintenanceBll = null;
public CarManageAdd()
{
bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
oA_WorkReminderBll = new OA_CarManageBll();
+ o_StaffBLL = new OA_StaffBLL();
+ bll_OA_CarInsuranceBll = new OA_CarInsuranceBll();
+ bll_OA_CarrepairBLL = new OA_CarrepairBLL();
+ bll_OA_CarExaminedBll = new OA_CarExaminedBll();
+ bll_OA_CarMaintenanceBll = new OA_CarMaintenanceBll();
}
//椤甸潰鍔犺浇
@@ -38,6 +48,12 @@
this.selCarCondition.DataValueField = "MeanValue";
this.selCarCondition.DataBind();
+ this.selStaffID.DataSource = o_StaffBLL.SelectListByFirmId(CurrentUser.MemberId,null,null).Where(x=>x.BF_IsDriver == true);
+ this.selStaffID.DataTextField = "Name";
+ this.selStaffID.DataValueField = "Keyid";
+ this.selStaffID.DataBind();
+ this.selStaffID.Items.Add(new ListItem("璇烽�夋嫨", "0"));
+ this.selStaffID.Value = "0";
InitData();
}
}
@@ -50,10 +66,34 @@
{
this.selCarType.Value = m_OA_CarManage.CarType;
this.selCarCondition.Value = m_OA_CarManage.CarCondition.ToString2();
+ this.selStaffID.Value = m_OA_CarManage.StaffID.ToString2();
this.txtCarNumber.Value = m_OA_CarManage.CarNumber;
this.txtNowMileage.Value = m_OA_CarManage.NowMileage.ToString2();
this.txtNowMileage.Attributes.Add("min", m_OA_CarManage.StartMileage.ToString2());
this.txtOrderNum.Value = m_OA_CarManage.OrderNum.ToString2();
+ this.txtInsuranceCompany.Value = m_OA_CarManage.InsuranceCompany.ToString2();
+ this.txtInsuranceEndTime.Value = m_OA_CarManage.InsuranceEndTime.ToStringForDateTime("yyyy-MM-dd");
+ this.txtMaintenanceNextTime.Value = m_OA_CarManage.MaintenanceNextTime.ToStringForDateTime("yyyy-MM-dd");
+ this.txtExaminedNextTime.Value = m_OA_CarManage.ExaminedNextTime.ToStringForDateTime("yyyy-MM-dd");
+ this.txtInsuranceContent.Value = m_OA_CarManage.InsuranceContent.ToString2();
+
+ Pagination pa = new Pagination();
+ pa.PageSize = 1;
+ pa.PageIndex = 1;
+ this.RepClientList.DataSource = bll_OA_CarInsuranceBll.SelectModelPage(pa, Request["keyid"].ToInt32(), null, null, null, null, null, null, null, null, null, null, null, null);
+ this.RepClientList.DataBind();
+
+ this.RepClientList1.DataSource = bll_OA_CarrepairBLL.SelectModelPage(pa, Request["keyid"].ToInt32(), null, null, null, null, null, null, null, null, null);
+ this.RepClientList1.DataBind();
+
+ this.RepClientList2.DataSource = bll_OA_CarExaminedBll.SelectModelPage(pa, Request["keyid"].ToInt32(), null, null, null, null, null, null, null, null, null, null, null);
+ this.RepClientList2.DataBind();
+
+ this.RepClientList3.DataSource = bll_OA_CarMaintenanceBll.SelectModelPage(pa, Request["keyid"].ToInt32(), null, null, null, null, null, null, null, null, null);
+ this.RepClientList3.DataBind();
+
+
+
}
}
@@ -75,6 +115,13 @@
m_OA_CarManage.CarType = this.selCarType.Value;
m_OA_CarManage.NowMileage = this.txtNowMileage.Value.ToInt32();
m_OA_CarManage.OrderNum = this.txtOrderNum.Value.ToInt32();
+ m_OA_CarManage.StaffID = this.selStaffID.Value.ToInt32();
+ m_OA_CarManage.InsuranceCompany = this.txtInsuranceCompany.Value;
+ m_OA_CarManage.InsuranceEndTime = this.txtInsuranceEndTime.Value.ToDateTime2();
+ m_OA_CarManage.MaintenanceNextTime = this.txtMaintenanceNextTime.Value.ToDateTime2();
+ m_OA_CarManage.ExaminedNextTime = this.txtExaminedNextTime.Value.ToDateTime2();
+ m_OA_CarManage.InsuranceContent =this.txtInsuranceContent.Value;
+
m_OA_CarManage.Operator = CurrentUser.ShortName;
m_OA_CarManage.LastUpdateTime = nowTime;
--
Gitblit v1.9.1