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.SQLDAL/EC/EC_OrderBasicDAL.cs | 193 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 190 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index be83822..f9b77bf 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -37,6 +37,8 @@
using CY.Model;
using CY.Infrastructure.Query;
using System.Transactions;
+using CY.Model.Inquiry;
+using CY.Infrastructure.Common;
namespace CY.SQLDAL
{
@@ -505,6 +507,136 @@
else
{
}
+ StringBuilder ssss = new StringBuilder();
+ if (int.Parse(searchParam[18].ToString()) > 0)
+ {
+ var oA_Staffs = _dataBase.SelectModel<OA_Staff>(" * ", " [OA_Staff] ", "[Keyid]='" + searchParam[20] + "'").FirstOrDefault();
+
+
+ if (!string.IsNullOrEmpty(oA_Staffs.ManageCountry))
+ {
+ var sys_CitySites = _dataBase.SelectModel<Sys_CitySite>(" * ", " [Sys_CitySite] ").ToList();
+
+
+
+ var ManageCity = oA_Staffs.ManageCity.Split(',').Where(x => x != "").ToArray();
+
+
+ var ManageCountry = (oA_Staffs.ManageCountry + "," + oA_Staffs.ManageCountry1).Split(',').Where(x => x != "").ToArray();
+
+ int[] intManageCity = new int[ManageCity.Length];
+ for (int i = 0; i < ManageCity.Length; i++)
+ {
+ intManageCity[i] = int.Parse(ManageCity[i]);
+ }
+
+ int[] intManageCountry = new int[ManageCountry.Length];
+ for (int i = 0; i < ManageCountry.Length; i++)
+ {
+ intManageCountry[i] = int.Parse(ManageCountry[i]);
+ }
+ var city = sys_CitySites.Where(x => intManageCity.Contains(x.Keyid)).ToList();
+ var country = sys_CitySites.Where(x => intManageCountry.Contains(x.Keyid)).ToList();
+
+ StringBuilder citystring = new StringBuilder();
+ for (int i = 0; i < city.Count; i++)
+ {
+ if (i == city.Count - 1)
+ {
+ citystring.Append("'" + city[i].Name.ToString() + "'");
+ }
+ else
+ {
+ citystring.Append("'" + city[i].Name.ToString() + "',");
+ }
+
+ }
+
+ StringBuilder countrystring = new StringBuilder();
+ for (int i = 0; i < country.Count; i++)
+ {
+ if (i == country.Count - 1)
+ {
+ countrystring.Append("'" + country[i].Name.ToString() + "'");
+ }
+ else
+ {
+ countrystring.Append("'" + country[i].Name.ToString() + "',");
+ }
+
+ }
+
+
+
+ var resultsss = _dataBase.SelectModel<OA_CorporateClients>(" axz.* ", " [OA_CorporateClients] axz join [OA_CustomerCommunications] bxz on axz.Keyid=bxz.Keyid ", " axz.FirmId ='" + searchParam[1] + "'and ( ( bxz.City in ( " + citystring.ToString() + ") and bxz.County in ( " + countrystring.ToString() + " ) )or axz.AccountManagerId='" + searchParam[20] + "' or axz.BusinessManagerId='" + searchParam[20] + "')").Select(x => x.Keyid).ToList();
+ //return null == result || result.Count < 1 ? null : result[0];
+
+
+
+ for (int i = 0; i < resultsss.Count; i++)
+ {
+ if (i == resultsss.Count - 1)
+ {
+ ssss.Append("'" + resultsss[i].ToString() + "'");
+ }
+ else
+ {
+ ssss.Append("'" + resultsss[i].ToString() + "',");
+ }
+
+ }
+ }
+ else
+ {
+ var resultsss = _dataBase.SelectModel<OA_CorporateClients>(" axz.* ", " [OA_CorporateClients] axz join [OA_CustomerCommunications] bxz on axz.Keyid=bxz.Keyid ", " axz.FirmId ='" + searchParam[1] + "'and ( axz.AccountManagerId='" + searchParam[20] + "' or axz.BusinessManagerId='" + searchParam[20] + "')").Select(x => x.Keyid).ToList();
+ //return null == result || result.Count < 1 ? null : result[0];
+
+
+
+ for (int i = 0; i < resultsss.Count; i++)
+ {
+ if (i == resultsss.Count - 1)
+ {
+ ssss.Append("'" + resultsss[i].ToString() + "'");
+ }
+ else
+ {
+ ssss.Append("'" + resultsss[i].ToString() + "',");
+ }
+
+ }
+ }
+
+ if (string.IsNullOrEmpty(ssss.ToString()))
+ {
+ ssss.Append("'4354654657568345429890'");
+ }
+
+
+ }
+ else
+ {
+ var resultsss = _dataBase.SelectModel<OA_CorporateClients>(" axz.* ", " [OA_CorporateClients] axz ", " axz.FirmId ='" + searchParam[1] + "' ").Select(x => x.Keyid).ToList();
+ //return null == result || result.Count < 1 ? null : result[0];
+
+
+
+ for (int i = 0; i < resultsss.Count; i++)
+ {
+ if (i == resultsss.Count - 1)
+ {
+ ssss.Append("'" + resultsss[i].ToString() + "'");
+ }
+ else
+ {
+ ssss.Append("'" + resultsss[i].ToString() + "',");
+ }
+
+ }
+ }
+
+
+
IList<SqlParameter> sqlParms = new List<SqlParameter>()
{
@@ -582,26 +714,48 @@
Direction = ParameterDirection.Output
});
+ sqlParms.Add(new SqlParameter()
+ {
+ ParameterName = "@CorporateClientsId",
+ SqlDbType = SqlDbType.VarChar,
+ Size=int.MaxValue,
+ Value = ssss.ToString()
+ });
+
IList<EC_OrderBasic> result = null;
//鎵ц鍒嗛〉瀛樺偍
- using (IDataReader reader = _dataBase.QueryDataReader("sp_EC_OrderBasic_Search_Seller", CommandType.StoredProcedure, sqlParms.ToArray()))
+ using (IDataReader reader = _dataBase.QueryDataReader("sp_EC_OrderBasic_Search_Seller_Ceshi", CommandType.StoredProcedure, sqlParms.ToArray()))
{
result = _dataBase.ReadDataToModel<EC_OrderBasic>(reader);
}
if (result != null && result.Count > 0)
{
+ _eC_OrderPrintParameterDAL = new EC_OrderPrintParameterDAL(_dataBase);
foreach (EC_OrderBasic ob in result)
{
if (IsComplainant(ob.Keyid.Value))
{
ob.IsComplainant = true;
}
+
+ EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterDAL.GetModel(ob.Keyid.Value);
+ InquiryCommonModel _inquiryCommonModel = null;
+ if (null == _eC_OrderPrintParameter)
+ {
+ _inquiryCommonModel = new InquiryCommonModel();
+ }
+ else
+ {
+ _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+ }
+
+ ob.PrintSizeName = _inquiryCommonModel.PrintSizeName;
}
}
/*鑾峰彇椤垫暟涓庤繑鍥炴暟鎹潯鏁�*/
- int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[30].Value);
+ int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[31].Value);
pagination.PageCount = resultValue.HasValue ? resultValue.Value : 0;
- resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[31].Value);
+ resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[32].Value);
pagination.RecordCount = resultValue.HasValue ? resultValue.Value : 0;
return result;
@@ -1322,6 +1476,19 @@
}
return null == result || result.Count == 0 ? null : result[0];
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁璁㈠崟缂栧彿鑾峰彇璁㈠崟
+ /// </summary>
+ /// <param name="orderIds">璁㈠崟缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<EC_OrderBasic> GetOrderByIds(string orderIds)
+ {
+ //return _eC_OrderBasicDAL.SelectModelById(orderId);
+ IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>(" ob.*,ts.OnlineMoney,ts.LineMoney,ts.UsedCredit,ts.PayedMoney ", "EC_OrderBasic as ob Inner Join Pay_TradingSingle as ts On ( ob.Keyid = ts.OrderId ) ", string.Format(" ob.Keyid in ({0})", orderIds));
+ return null == result || result.Count < 1 ? null : result;
}
/// <summary>
@@ -2465,6 +2632,26 @@
/// 淇敼鎵撳嵃鐘舵��
/// </summary>
/// <param name="orderId"></param>
+ public void UpdatePrintfengqianState(int orderId)
+ {
+ try
+ {
+ string sqlStr = string.Empty;
+ sqlStr = "UPDATE EC_OrderExtend SET IsPrintfengqian='true' WHERE Keyid=@orderId";
+ SqlParameter par = new SqlParameter("@orderId", orderId);
+ _dataBase.ExecuteSql(sqlStr, par);
+ }
+ catch
+ {
+
+ }
+ }
+
+
+ /// <summary>
+ /// 淇敼鎵撳嵃鐘舵��
+ /// </summary>
+ /// <param name="orderId"></param>
public void UpdatePrintBiaoqianState(int orderId)
{
try
--
Gitblit v1.9.1