From ad92b901b491d5921dbca2e91b0aafe8e2a0a017 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 27 九月 2024 13:30:53 +0800
Subject: [PATCH] 客户来源选择“政府采购”的才必选“机构代理”，除“政府采购”以外的客户来源，机构代码不用必填 “自联系”改为“上门送样”；“在线”改为“线上校对” 1）所有订单类型中的“印件名称”再增加几个字的长度，现在的格子有段短 （2）所有新增订单均把“客户单位”和“客户级别”这两行改到最前面，原来的“订单类型”这一行自动成为第3行 （3）“交货时间”现在默认的是第2天，全部改为默认第3天 在订单管理的列表中增加“封签”，列表中没打印显示“打印”，打印了就打“√” “订单管理”中，现在的“开票申请”栏目删除 生产安排中，生产“合版施工单”的前提必须是“订单类型”要相同，修改为不必相同。
---
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
index ff9a6b9..1feb4fb 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
@@ -117,7 +117,7 @@
if (_eC_OrderBasic.UnitPrice.HasValue)
{
- this.txtUnitPrice.Value = _eC_OrderBasic.UnitPrice.Value.ToString("0.00");
+ this.txtUnitPrice.Value = _eC_OrderBasic.UnitPrice.Value.ToString("0.0000");
}
if (_eC_OrderBasic.SumPrice.HasValue)
{
@@ -371,6 +371,7 @@
eC_OrderExtend.CustomerLevelId = MyConvert.ConvertToInt32(Request["selCustormerLevel"]);
eC_OrderExtend.Contacts = MyConvert.ConvertToString(Request["txtContact"]).Trim();
eC_OrderExtend.ContactPhone = MyConvert.ConvertToString(Request["txtPhone"]).Trim();
+ eC_OrderExtend.printunit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
eC_OrderBasic.Remark = eC_OrderExtend.Remark;
eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]).Trim();
@@ -387,7 +388,16 @@
_inquiryCommonModel = new InquiryCommonModel();
_inquiryCommonModel.PrintTypeId = -1;
_inquiryCommonModel.PrintCount = Request["printCount"].ToString().ToInt32().Value;
- _inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "锛�" + Request["txtPrintDemand"].ToString();
+ _inquiryCommonModel.Unit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
+ if (Request["txtPrintDemand"].ToString().IndexOf(Request["printSizeName"].ToString()) >= 0)
+ {
+ _inquiryCommonModel.PrintDemand = Request["txtPrintDemand"].ToString();
+ }
+ else
+ {
+ _inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "锛�" + Request["txtPrintDemand"].ToString();
+ }
+
_inquiryCommonModel.PrintSizeName = Request["printSizeName"].ToString();
}
else
@@ -549,6 +559,7 @@
eC_OrderExtend.CustomerLevelId = MyConvert.ConvertToInt32(Request["selCustormerLevel"]);
eC_OrderExtend.Contacts = MyConvert.ConvertToString(Request["txtContact"]).Trim();
eC_OrderExtend.ContactPhone = MyConvert.ConvertToString(Request["txtPhone"]).Trim();
+ eC_OrderExtend.printunit= MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
eC_OrderBasic.Remark = eC_OrderExtend.Remark;
eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]).Trim();
@@ -565,7 +576,15 @@
_inquiryCommonModel = new InquiryCommonModel();
_inquiryCommonModel.PrintTypeId = -1;
_inquiryCommonModel.PrintCount = Request["printCount"].ToString().ToInt32().Value;
- _inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "锛�" + Request["txtPrintDemand"].ToString();
+ _inquiryCommonModel.Unit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
+ if (Request["txtPrintDemand"].ToString().IndexOf(Request["printSizeName"].ToString()) >= 0)
+ {
+ _inquiryCommonModel.PrintDemand = Request["txtPrintDemand"].ToString();
+ }
+ else
+ {
+ _inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "锛�" + Request["txtPrintDemand"].ToString();
+ }
_inquiryCommonModel.PrintSizeName = Request["printSizeName"].ToString();
}
else
--
Gitblit v1.9.1