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
2024-12-21 18:38:51 +08:00
parent bad533bcc1
commit adab2c3392
5 changed files with 67 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Epost.BLL/OrderBLL.cs
View File

@ -940,9 +940,9 @@ namespace Epost.BLL
return dal.IsFinishWorkByCar(endcount, matchid, block);
}
public bool UpdateStateByCar(string matchid, string block = "", string sku = "")
public bool UpdateStateByCar(string matchid, string area,string block = "", string sku = "")
{
return dal.UpdateStateByCar(matchid, block, sku);
return dal.UpdateStateByCar(matchid,area, block, sku);
}
public bool IsFinishWork(int endcount, string block, string usercode = "", string area = "", string sku = "", string shopid = "", string matchid = "")

53
Epost.BLL/Work_JobDownThread.cs
View File

@ -289,44 +289,41 @@ namespace Epost.BLL
queueBLL.UpdateQueueTaskArea_Car(qumodel);
#endregion
#region 刷新波次信息
// showSummaryMes(model.Sku, block, area, Convert.ToInt32(block), null, model.Tolocation, model.Matchid);
#endregion
Thread.Sleep(30);
#region 整条通道当前用户所有任务分播结束
bool blockfinish = orderbll.IsFinishWorkByCar(1, model.Matchid, block);
if (blockfinish)
{
#region 点亮显示器
//bool blockfinish = orderbll.IsFinishWorkByCar(1, model.Matchid, block);
//if (blockfinish)
//{
// #region 点亮显示器
show.Title = "当前波次分播完成";
show.Contents = "拍下熄灭所有设备\r请扫描继续作业";
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Green);
show.Qty = "0";
show.Type = 8;
show.Block = block;
show.Islock = false;
show.IsTwinkle = 1;
// show.Title = "当前波次分播完成";
// show.Contents = "拍下熄灭所有设备\r请扫描继续作业";
// show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Green);
// show.Qty = "0";
// show.Type = 8;
// show.Block = block;
// show.Islock = false;
// show.IsTwinkle = 1;
comBLL.ShowBoxMessage_M(show);
#endregion
// comBLL.ShowBoxMessage_M(show);
// #endregion
bool allfinish = orderbll.IsFinishWorkByCar(1, model.Matchid);
if (allfinish)//判断整个波次是否已完成
{ //更新state状态为已完成
orderbll.UpdateStateByCar(model.Matchid);
}
//删除波次信息
List<UserCodeModel> ulist = UserCacheDAL.GetUserCodeList().FindAll(m => m.Block == block);
UserCacheDAL.UpdateUserCodeList(ulist, EUserCommend.Execute);
// bool allfinish = orderbll.IsFinishWorkByCar(1, model.Matchid);
// if (allfinish)//判断整个波次是否已完成
// { //更新state状态为已完成
// orderbll.UpdateStateByCar(model.Matchid);
// }
// //删除波次信息
// List<UserCodeModel> ulist = UserCacheDAL.GetUserCodeList().FindAll(m => m.Block == block);
// UserCacheDAL.UpdateUserCodeList(ulist, EUserCommend.Execute);
}
//}
#endregion
#region 区内sku播完回传
// orderbll.UpdateStateByCar(model.Matchid, "", model.Sku);
orderbll.UpdateStateByCar(model.Matchid,area, block, model.Sku);
#endregion
#region 清除当前区已做完的sku

10
Epost.BLL/Work_ScanThread.cs
View File

@ -510,11 +510,11 @@ namespace Epost.BLL
List<LabelParamModel> list = new List<LabelParamModel>();
//查询当前通道sku是否有任务
DataTable dt = orderbll.getOrderListBysku(block, sku,area, matchid);
if (dt == null || dt.Rows.Count == 0)
{
dt = orderbll.getOrderHisListBysku(block, sku, area, matchid);
//回显挂起
}
//if (dt == null || dt.Rows.Count == 0)
//{
// dt = orderbll.getOrderHisListBysku(block, sku, area, matchid);
// //回显挂起
//}
if (dt != null && dt.Rows.Count > 0)
{