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/AgMergerOrderEdit.aspx.cs | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
index 6ae7ab1..e487dc5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
@@ -27,6 +27,7 @@
OA_InventoryBLL bll_OA_InventoryBLL = null;
OA_OutOfStorageBLL bll_OA_OutOfStorageBLL = null;
public Guid targetid = Guid.Empty;
+ public string xialapr = "";
//鍒濆鍖�
public AgMergerOrderEdit()
@@ -92,6 +93,20 @@
this.selFilmSpec.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
//this.selFilmSpec.Visible = false;
+ //this.PlateSpec.DataSource = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鐗堟潗瑙勬牸");
+ //this.PlateSpec.DataValueField = "ParName";
+ //this.PlateSpec.DataTextField = "ParName";
+ //this.PlateSpec.DataBind();
+ //this.PlateSpec.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ var sss = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鐗堟潗瑙勬牸");
+ foreach (var eC_MemberDictionary in sss)
+ {
+ xialapr += " <div class=\"xialapr\">"+ eC_MemberDictionary.ParName + "</div>";
+
+ }
+
+
+
Pagination pa = new Pagination();
pa.PageSize = 500;
pa.PageIndex = 1;
@@ -150,7 +165,16 @@
{
_inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
}
- _eC_OrderBasic.PrintDemandAfterWorksDemand = _inquiryCommonModel.PrintDemand + _inquiryCommonModel.AfterWorksDemand;
+ var ssss = /*_inquiryCommonModel.PrintDemand +*/ _inquiryCommonModel.AfterWorksDemand;
+ if(_eC_OrderBasic.PrintTypeId == -1)
+ {
+ ssss = _inquiryCommonModel.PrintDemand;
+ }
+ if (!string.IsNullOrEmpty(ssss) && ssss.Length > 500)
+ {
+ ssss.Substring(0,499);
+ }
+ _eC_OrderBasic.PrintDemandAfterWorksDemand = ssss;
string strPrintSizeName;
strPrintSizeName = _inquiryCommonModel.PrintSizeName;
@@ -327,6 +351,7 @@
RepMergerEdit.Visible = false;
this.RepClientList.DataSource = mEC_OrderBasicList;
this.RepClientList.DataBind();
+ this.selOutFirm.Value = "-1";
}
return true;
}
@@ -676,7 +701,7 @@
m_EC_OrderBasicNew.BuyerName = CurrentUser.Name;
m_EC_OrderBasicNew.Creater = CurrentUser.ShortName;
m_EC_OrderBasicNew.Operator = CurrentUser.ShortName;
- m_EC_OrderBasicNew.DeliveryTime = _eC_OrderBasic.DeliveryTime.Value.ToDateTime2();
+ m_EC_OrderBasicNew.DeliveryTime = _eC_OrderBasic.DeliveryTime.ToDateTime2();
m_EC_OrderBasicNew.DocumentName = _eC_OrderBasic.PrintType.PrintName;
m_EC_OrderBasicNew.OrderTypeId = 3;
m_EC_OrderBasicNew.PrintTypeId = _eC_OrderBasic.PrintTypeId;
--
Gitblit v1.9.1