hanlihui520/T-DAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
jl
2025-06-30 10:14:05 +08:00
parent 722f16a77e
commit fb2aa4f239
10 changed files with 146 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Epost.BLL/OrderBLL.cs
View File

@ -611,13 +611,13 @@ namespace Epost.BLL
#region 取消订单
public bool DelOrder(string orderid)
public bool DelOrder(string strwhere)
{
//bool t = dal.DelOrder(orderid);
bool t = dal.DelOrder(strwhere);
//return t;
return true;
return t;
}
#endregion
@ -644,7 +644,7 @@ namespace Epost.BLL
#endregion
#region 获取订单信息
public List<JobModel> GetOrderList(string matchid, string block, string sku = "", string area = "", string UserCode = "")
public List<JobModel> GetOrderList(string matchid, string block, string sku = "", string area = "", string UserCode = "",string color="")
{
try
{
@ -652,25 +652,25 @@ namespace Epost.BLL
List<JobModel> list = new List<JobModel>();
DataTable OrderDt = dal.GetOrderList_Car(matchid, sku, area, block, UserCode);
bool isecho = false;
//if (OrderDt == null || OrderDt.Rows.Count == 0)//回显
//{
// OrderDt = dal.GetOrderList_echo(matchid, sku, area, block, UserCode);
// isecho = true;
//}
if (OrderDt == null || OrderDt.Rows.Count == 0)//回显
{
OrderDt = dal.GetOrderList_echo(matchid, sku, area, block, UserCode);
isecho = true;
}
if (OrderDt != null && OrderDt.Rows.Count > 0)
{
// string usercode = string.Empty;
string lightcolor = string.Empty;
//DataTable udt = dal.GetOrderUseerXCode(matchid, sku, area, block);
//if (udt != null && udt.Rows.Count > 0)
//{
// usercode = udt.Rows[0]["usercode"].ToString();
// lightcolor = udt.Rows[0]["lightcolor"].ToString();
//}
if (string.IsNullOrEmpty(lightcolor))
if (string.IsNullOrEmpty(color))
{
lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
}
foreach (DataRow item in OrderDt.Rows)
{
@ -698,7 +698,7 @@ namespace Epost.BLL
demodel.Area = item["Area"].ToString();
demodel.Address = item["address"].ToString();
demodel.UserCode = UserCode;
demodel.ColorCode = lightcolor;
demodel.ColorCode = color;
demodel.Bkaddress = "0";
demodel.Addresstype = "1";
demodel.ControlID = "";
@ -713,11 +713,11 @@ namespace Epost.BLL
demodel.TaskArea = Convert.ToInt32(item["area"].ToString());
demodel.TaskBlock = Convert.ToInt32(item["block"].ToString());
demodel.No = "01";
//if (isecho)
//{
// demodel.No = "04";
// demodel.ColorCode = EnumHelper.EMToDescriptionString(LightColor.Color.Blue);
//}
if (isecho)
{
demodel.No = "04";
demodel.ColorCode = EnumHelper.EMToDescriptionString(LightColor.Color.Pink);
}
demodel.UserCode = UserCode;
list.Add(demodel);
if (!isecho) {