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

更改接口灭灯功能

Browse Source
This commit is contained in:
帅凯 贾
2023-09-06 12:44:42 +08:00
parent 7eff397fb5
commit cc78693b7d
7 changed files with 153 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Epost.BLL/AddressstorageBLL.cs
View File

@ -15,7 +15,7 @@ namespace Epost.BLL
{
AddressstorageDAL dal = new AddressstorageDAL();
#region 查询设备所在区
public DataTable getBlock(string address, string type, string controlip)
@ -39,7 +39,7 @@ namespace Epost.BLL
}
#endregion
#region 根据货位号查询标签地址
public DataTable getAddressList(string location)
{
@ -54,7 +54,7 @@ namespace Epost.BLL
}
#endregion
#region 根据小车编号获取控制器Ip地址
public DataTable getIP(string carid)
@ -89,17 +89,17 @@ namespace Epost.BLL
#endregion
#region 获取箱号显示标签
public DataTable GetBoxAddress(string block,string area,int type)
public DataTable GetBoxAddress(string block, string area, int type)
{
return dal.GetBoxAddress(block,area,type);
return dal.GetBoxAddress(block, area, type);
}
#endregion
#region 根据区域获取所有地址
public DataTable getAddresslist(string block, string area,string type)
public DataTable getAddresslist(string block, string area, string type)
{
return dal.getAddresslist(block, area,type);
return dal.getAddresslist(block, area, type);
}
#endregion
@ -152,7 +152,7 @@ namespace Epost.BLL
}
#endregion
#region 获取所有地址
public DataTable getAddressList()
{
@ -329,9 +329,9 @@ namespace Epost.BLL
#region 获取错误信息的state
public DataTable GetErrorState(string address,string ip)
public DataTable GetErrorState(string address, string ip)
{
return dal.getErrorState(address,ip);
return dal.getErrorState(address, ip);
}
#endregion
@ -380,6 +380,11 @@ namespace Epost.BLL
{
return dal.GetForcedendAddress(orderid);
}
public DataTable GetForcedendAddress()
{
return dal.GetForcedendAddress();
}
#endregion
}
}

4
Epost.BLL/OrderBLL.cs
View File

@ -1044,9 +1044,9 @@ namespace Epost.BLL
return dal.GetDataIfRepeat(transderMid, transderDid);
}
public DataTable GetOrdersDT(string address, string ControlIP)
public bool UpOrdersState(string orderid)
{
return dal.GetOrdersDT(address, ControlIP);
return dal.UpOrdersState(orderid);
}
#region 校验货位

9
Epost.BLL/OrderControlBLL.cs
View File

@ -595,7 +595,7 @@ namespace Epost.BLL
{
var nowmodel = nowJoblist.FirstOrDefault();
#region 点亮任务标s签
#region 点亮任务标签
foreach (JobModel item in nowJoblist.ToArray())
{
List<JobModel> isshowList = jobList.FindAll(p => p.Address == item.Address && p.ControlIP == item.ControlIP && p.State == 1);
@ -628,7 +628,12 @@ namespace Epost.BLL
lamodel.Title = item.genericname;
lamodel.Content = "" + item.Sku.Substring(item.Sku.Length - 4, 4) + " " + item.Spec + "\r" + item.GoodsName + "\r批号" + item.batchno + " " + item.manufactname.Substring(0, 4) + "";
string manufactname = string.Empty;
if (!string.IsNullOrEmpty(item.manufactname) && item.manufactname.Length > 4)
{
manufactname = item.manufactname.Substring(0, 4);
}
lamodel.Content = "" + item.Sku.Substring(item.Sku.Length - 4, 4) + "\\t" + item.Spec + "\r" + item.GoodsName + "\r批号" + item.batchno + " " + manufactname + "";
var aryloc = item.Tolocation.Split('-');
lamodel.Loc = "" + aryloc[0].ToString() + "-" + aryloc[1].ToString() + "";
lamodel.W_quantity = aryloc[2].ToString();