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) {

4
Epost.BLL/OrdersQueueBLL.cs
View File

@ -64,9 +64,9 @@ namespace Epost.BLL
}
#endregion
#region 获取当前区的作业状态
public DataTable getQueuesOrderbyState(string block, string area,string state)
public DataTable getQueuesOrderbyState(string block, string area,string state,string usercode="")
{
return dal.getQueuesOrderbyState(block, area, state);
return dal.getQueuesOrderbyState(block, area, state,usercode);
}

125
Epost.BLL/Work_DisplayJobThread.cs
View File

@ -128,74 +128,74 @@ namespace Epost.BLL
//if (!isJobList.Any())
//{
model.State = 1;
orderbll.GetOrderList(queueDT.Rows[0]["matchid"].ToString(), nblock, queueDT.Rows[0]["sku"].ToString(), narea, queueDT.Rows[0]["usercode"].ToString());
orderbll.GetOrderList(queueDT.Rows[0]["matchid"].ToString(), nblock, queueDT.Rows[0]["sku"].ToString(), narea, queueDT.Rows[0]["usercode"].ToString(), queueDT.Rows[0]["lightcolor"].ToString());
List<JobModel> nowJoblist = jobList.FindAll(p => p.State == 0 && p.Block == model.Taskblock && p.Area == model.Taskarea);
if (nowJoblist.Any())
{
var nowmodel = nowJoblist.FirstOrDefault();
if (nowJoblist.Any())
{
var nowmodel = nowJoblist.FirstOrDefault();
LogHelper.WriteLogInfo("进入任务点亮=====matchid=" + nowmodel.Matchid + "===orderid===" + nowmodel.OrderID + "=====sku==" + nowmodel.Sku + "========");
LogHelper.WriteLogInfo("进入任务点亮=====matchid=" + nowmodel.Matchid + "===orderid===" + nowmodel.OrderID + "=====sku==" + nowmodel.Sku + "========");
#region 点亮任务标签
foreach (JobModel item in nowJoblist.ToArray())
{
//#region 回显设备锁定
//if (queueDT.Rows[0]["lightcolor"].ToString() == EnumHelper.EMToDescriptionString(LightColor.Color.Blue))
//{
// LabelParamModel locklamodel = new LabelParamModel();
// locklamodel.Address = item.Address.ToString();
// locklamodel.ControlIP = item.ControlIP.ToString();
// locklamodel.Command = "LOCK";
// locklamodel.Parameter = "11111000";
// locklamodel.Type = "N";
// list.Add(locklamodel);
//}
//#endregion
// else
//{
//判断设备当前有没有被点亮
List<JobModel> isshowList = jobList.FindAll(p => p.Address == item.Address && p.ControlIP == item.ControlIP && p.State == 1);
if (!isshowList.Any())
#region 回显设备锁定
if (item.ColorCode == EnumHelper.EMToDescriptionString(LightColor.Color.Pink))
{
List<JobModel> manyJoblist = nowJoblist.FindAll(m => m.Tolocation == item.Tolocation && m.Address == item.Address);
int quantity = item.Quantity;
LabelParamModel lamodel = new LabelParamModel();
lamodel.Address = item.Address.ToString();
lamodel.ControlIP = item.ControlIP.ToString();
lamodel.Command = "DISPLAY_JOB";
#region 同一个货位的数据合并显示
if (manyJoblist.Count > 1)
{
quantity = 0;
if (manyJoblist.FindAll(m => m.State == 0).Any())
{
foreach (JobModel mitem in manyJoblist)
{
quantity += mitem.Quantity;
mitem.State = 1;
mitem.ManyState = 1;
}
}
}
#endregion
lamodel.Type = "N";
lamodel.Quantity = quantity.ToString();
lamodel.Uid = "U" + item.ID;
lamodel.Mode = queueDT.Rows[0]["lightcolor"].ToString() + "0";
list.Add(lamodel);
//}
item.State = 1;
item.ColorCode = queueDT.Rows[0]["lightcolor"].ToString();
item.DisplayTime = DateTime.Now;
LabelParamModel locklamodel = new LabelParamModel();
locklamodel.Address = item.Address.ToString();
locklamodel.ControlIP = item.ControlIP.ToString();
locklamodel.Command = "LOCK";
locklamodel.Parameter = "11111000";
locklamodel.Type = "N";
locklamodel.Uid = "L" + item.Address;
list.Add(locklamodel);
}
}
#endregion
//判断设备当前有没有被点亮
List<JobModel> isshowList = jobList.FindAll(p => p.Address == item.Address && p.ControlIP == item.ControlIP && p.State == 1);
if (!isshowList.Any())
{
List<JobModel> manyJoblist = nowJoblist.FindAll(m => m.Tolocation == item.Tolocation && m.Address == item.Address);
int quantity = item.Quantity;
LabelParamModel lamodel = new LabelParamModel();
lamodel.Address = item.Address.ToString();
lamodel.ControlIP = item.ControlIP.ToString();
lamodel.Command = "DISPLAY_JOB";
#region 同一个货位的数据合并显示
if (manyJoblist.Count > 1)
{
quantity = 0;
if (manyJoblist.FindAll(m => m.State == 0).Any())
{
foreach (JobModel mitem in manyJoblist)
{
quantity += mitem.Quantity;
mitem.State = 1;
mitem.ManyState = 1;
}
}
}
#endregion
lamodel.Type = "N";
lamodel.Quantity = quantity.ToString();
lamodel.Uid = "U" + item.ID;
lamodel.Mode =item.ColorCode + "0";
list.Add(lamodel);
//}
item.State = 1;
item.DisplayTime = DateTime.Now;
}
#endregion
#region 点亮通道灯
comBLL.DISPLAY_LIGHT_BLOCK(model.Taskblock, model.Taskarea, "1");
// comBLL.DISPLAY_LIGHT_BLOCK(model.Taskblock, model.Taskarea, "1");
#endregion
if (list != null && list.Count > 0)
{
@ -203,11 +203,12 @@ namespace Epost.BLL
comBLL.DISPLAY_JOBALL(list);
}
}
else
{//无任务
LogHelper.WriteLogInfo("点亮====无任务=======================");
model.State = 3;
}
}
else
{//无任务
LogHelper.WriteLogInfo("点亮====无任务=======================");
model.State = 3;
}
#endregion
if (jobList.Any())
{

23
Epost.BLL/Work_JobDownThread.cs
View File

@ -183,28 +183,25 @@ namespace Epost.BLL
else if (data.Uid == "09" + "-" + data.Address)//完成灯拍下
{
LogHelper.WriteLogInfo(data.Address+"end拍下");
#region 修改任务队列状态
OrdersQueueModel qumodel = new OrdersQueueModel();
qumodel.State = 3;
qumodel.Taskblock = block;
qumodel.Taskarea = area;
qumodel.UserCode = data.Info;
queueBLL.UpdateQueueTaskArea_Car(qumodel);
#endregion
List<JobModel> offList = jobList.FindAll(m => m.Block == block && m.Area == area && m.Address == data.Address && m.ControlIP == data.IP && m.State == 3 );
if (offList.Any())
{
JobModel model = offList.FirstOrDefault();
#region 修改任务队列状态
OrdersQueueModel qumodel = new OrdersQueueModel();
qumodel.State = 3;
qumodel.Taskblock = block;
qumodel.Taskarea = area;
qumodel.Sku = model.Sku;
qumodel.Matchid = model.Matchid;
qumodel.UserCode = model.UserCode;
queueBLL.UpdateQueueTaskArea_Car(qumodel);
#endregion
JobModel model = offList.FirstOrDefault();
List<JobModel> AllList = jobList.FindAll(m => m.Block == block && m.Area == area && m.ControlIP == data.IP && m.State == 3&&m.UserCode== model.UserCode);
bool bo = orderbll.IsSkuFinishWork("", model.Matchid);
if (bo)
{
LogHelper.WriteLogInfo("波次拣选完成");
orderbll.DelOrder(" and matchid ='" + model.Matchid + "'");
List<UserCodeModel> ulist = UserCacheDAL.GetUserCodeList();
UserCacheDAL.UpdateUserCodeList(ulist, EUserCommend.Execute);//删除波次信息
}

30
Epost.BLL/Work_ScanThread.cs
View File

@ -383,28 +383,27 @@ namespace Epost.BLL
#region 扫描商品
List<ResultMessageModel> hangList = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Parameter == "888888");
List<ResultMessageModel> hangList = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Parameter == "888888|Y01"|| m.Parameter == "888888|Y02" || m.Parameter == "888888|Y03" || m.Parameter == "888888|Y04"|| m.Parameter == "888888|Y05" || m.Parameter == "888888|Y06" || m.Parameter == "888888|Y07" || m.Parameter == "888888|Y08");
if (hangList.Any())
{
ResultMessageModel datapar= hangList.FirstOrDefault();
string[] str= datapar.Parameter.Split('|');
#region 挂起
LogHelper.WriteLogInfo("挂起" + data.Parameter + "-------通道" + data.Block);
LogHelper.WriteLogInfo("挂起" + data.Parameter + "-------工号" + str[1]);
// LabelParamModel FORMATEModel = new LabelParamModel();
// FORMATEModel.ControlIP = data.IP;
// comBLL.FORMATE_JOB_DATA(FORMATEModel);
DataTable qdt = queueBLL.getQueuesOrderbyState(data.Block, data.Area, "1");
// comBLL.FORMATE_JOB_DATA(FORMATEModel);
DataTable qdt = queueBLL.getQueuesOrderbyState(data.Block, data.Area, "1", str[1]);
if (qdt != null && qdt.Rows.Count > 0)
{
scanStr = qdt.Rows[0]["sku"].ToString();
ShowMessageModel_M show = new ShowMessageModel_M();
show.Block = data.Block;
show.Area = data.Area;
show.Type = 8;
//ShowMessageModel_M show = new ShowMessageModel_M();
//show.Block = data.Block;
//show.Area = data.Area;
//show.Type = 8;
comBLL.RemoveBoxMessage_M(show);
//comBLL.RemoveBoxMessage_M(show);
// data.Parameter = scanStr;
Hangup_SKU(scanStr, data.Block, data.Area,matchid);
//删除sku对应缓存
@ -498,8 +497,8 @@ namespace Epost.BLL
qmodel.Matchid = umodel.Matchid;
// qmodel.Location = location;
qmodel.Shopid = echoDt.Rows[0]["GoodsName"].ToString();
qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Blue);
qmodel.State = 2;
qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Pink);
queueBLL.insertQueueOrders(qmodel);
@ -562,7 +561,7 @@ namespace Epost.BLL
{
LabelParamModel lamodel = new LabelParamModel();
lamodel.Address = item["address"].ToString(); ;
lamodel.Address = item["address"].ToString();
lamodel.ControlIP = item["ControlIP"].ToString();
lamodel.Command = "REMOVE_JOB";
lamodel.Parameter = "";
@ -575,6 +574,7 @@ namespace Epost.BLL
Unlockmodel.Command = "UNLOCK";
Unlockmodel.Type = "N";
Unlockmodel.Parameter = "11111000";
Unlockmodel.Uid = "UN"+ item["address"].ToString();
list.Add(Unlockmodel);
if (item["oprationstate"].ToString() == "1")
{