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/business/DeliverPlanYijiao.aspx.cs | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs
index ab0bd5e..b31018f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs
@@ -30,7 +30,7 @@
public partial class DeliverPlanYijiao : BasePage
{
- OA_DeliverPlanBLL _OA_DeliverPlanBLL = null;
+ OA_DeliverPlanPaicheBLL _OA_DeliverPlanBLL = null;
OA_StaffBLL bll_OA_StaffBLL = null;
OA_CarManageBll _OA_CarManageBll = null;
@@ -39,7 +39,7 @@
public DeliverPlanYijiao()
{
- _OA_DeliverPlanBLL = new OA_DeliverPlanBLL();
+ _OA_DeliverPlanBLL = new OA_DeliverPlanPaicheBLL();
bll_OA_StaffBLL = new OA_StaffBLL();
_OA_CarManageBll = new OA_CarManageBll();
@@ -92,16 +92,39 @@
{
- this.IsBusinessManager.Items.Add(new ListItem("涓氬姟缁忕悊", "1"));
- this.IsBusinessManager.Items.Add(new ListItem("宸ュ巶鐗╂祦閮�", "2"));
+
- this.IsBusinessManager.SelectedValue = "1";
+
- string keyid = Request["keyid"];
+ string ids = Request["ids"];
+ var deliverPlan = _OA_DeliverPlanBLL.GetModelByKeyid(ids.ToGuid2(), null, null);
+ if (deliverPlan.Transferstatus.HasValue && deliverPlan.Transferstatus != 0)
+ {
+ if(deliverPlan.TransferType.Value == 1)
+ {
+ this.IsBusinessManager.Items.Add(new ListItem(deliverPlan.TransferName, "1"));
+ this.IsBusinessManager.Items.Add(new ListItem("宸ュ巶鐗╂祦閮�", "2"));
+ this.IsBusinessManager.SelectedValue = deliverPlan.Transferstatus.Value.ToString();
+ }
+ else
+ {
+ this.IsBusinessManager.Items.Add(new ListItem("涓氬姟缁忕悊", "1"));
+ this.IsBusinessManager.Items.Add(new ListItem("宸ュ巶鐗╂祦閮�", "2"));
+ this.IsBusinessManager.SelectedValue = "1";
+ }
+
+
+ }
+ else
+ {
+ this.IsBusinessManager.Items.Add(new ListItem("涓氬姟缁忕悊", "1"));
+ this.IsBusinessManager.Items.Add(new ListItem("宸ュ巶鐗╂祦閮�", "2"));
+ this.IsBusinessManager.SelectedValue = "1";
+ }
@@ -210,11 +233,11 @@
}
- var carManage = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId).Where(x => x.StaffID == deliverPlan.DriverId).FirstOrDefault();
- if (carManage != null)
- {
- deliverPlan.CarId = carManage.Keyid ?? 0;
- }
+ //var carManage = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId).Where(x => x.StaffID == deliverPlan.DriverId).FirstOrDefault();
+ //if (carManage != null)
+ //{
+ // deliverPlan.CarId = carManage.Keyid ?? 0;
+ //}
isWin = _OA_DeliverPlanBLL.UpdateModel(deliverPlan);
}
--
Gitblit v1.9.1