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
2023-09-14 10:49:07 +08:00
parent cc78693b7d
commit 29bfe4c6aa
8 changed files with 752 additions and 695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Epost.BLL/OrderBLL.cs
View File

@ -1055,5 +1055,14 @@ namespace Epost.BLL
return dal.GetlocationInfo(location); return dal.GetlocationInfo(location);
} }
#endregion #endregion
} public bool UpOrdersState(string Area,string block)
{
return dal.UpdateState(Area, block);
}
public bool IsFinishWorkArea(string block, string usercode = "", string area = "", string sku = "", string shopid = "", string orderid = "")
{
return dal.IsFinishWorkArea(block,usercode,area,sku,shopid,orderid);
}
}
} }

2
Epost.BLL/OrderControlBLL.cs
View File

@ -490,7 +490,7 @@ namespace Epost.BLL
dal.UpdateState(model.Area, model.Block); dal.UpdateState(model.Area, model.Block);
bool WorkArea = dal.IsFinishWorkArea("", "", "99", "", "", ""); bool WorkArea = dal.IsFinishWorkArea("", "", "99", "", "", "");
if (skuInish) if (WorkArea)
{ {
comBLL.DISPLAY_LIGHT_BLOCK_Out("", model.Area, "0"); comBLL.DISPLAY_LIGHT_BLOCK_Out("", model.Area, "0");
} }

4
Epost.BLL/OrdersQueueBLL.cs
View File

@ -127,9 +127,9 @@ namespace Epost.BLL
} }
#endregion #endregion
#region 修改作业全部完成 #region 修改作业全部完成
public bool updateOrderQueueState(string usercode, string block) public bool updateOrderQueueState()
{ {
return dal.updateOrderQueueState(usercode,block); return dal.updateOrderQueueState();
} }
#endregion #endregion

18
Epost.DAL/Cache/JobModelCacheDAL.cs
View File

@ -139,7 +139,14 @@ namespace Epost.DAL.Cache
} }
else if (CommendType.Equals(EcommendType.CompleteAll))
{
//删除作业任务 已完成
foreach (var planitem in PlanJobList.ToArray())
{
PlanJobList.Remove(planitem);
}
}
return true; return true;
} }
} }
@ -186,7 +193,12 @@ namespace Epost.DAL.Cache
/// 作业完成 /// 作业完成
/// </summary> /// </summary>
[Description("作业完成")] [Description("作业完成")]
Complete Complete,
/// <summary>
/// 作业完成
/// </summary>
[Description("作业完成")]
CompleteAll
} }
} }

6
Epost.DAL/OrdersQueueDAL.cs
View File

@ -191,10 +191,10 @@ namespace Epost.DAL
#endregion #endregion
#region 修改作业全部完成 #region 修改作业全部完成
public bool updateOrderQueueState(string usercode, string block) public bool updateOrderQueueState()
{ {
string sql = string.Format("update ordersqueue set state =3 where usercode='{0}' and taskblock ='{1}'", string sql = string.Format("update ordersqueue set state =3 where state<>3"
usercode, block); );
LogHelper.WriteLogInfo("修改作业全部完成" + sql); LogHelper.WriteLogInfo("修改作业全部完成" + sql);
long x = db.UpdateSql(sql); long x = db.UpdateSql(sql);
if (x > 0) if (x > 0)

4
Epost.TestToolsWeb/Epost.DPS.csproj.user
View File

@ -10,8 +10,8 @@
<WebStackScaffolding_LayoutPageFile>~/Views/Shared/_EpostLayoutPage.cshtml</WebStackScaffolding_LayoutPageFile> <WebStackScaffolding_LayoutPageFile>~/Views/Shared/_EpostLayoutPage.cshtml</WebStackScaffolding_LayoutPageFile>
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected> <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth> <WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
<NameOfLastUsedPublishProfile>D:\驿传\Epost\T_DAS_PTL\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>E:\WORK\代码管理\T系列\播种\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />
<IISExpressAnonymousAuthentication /> <IISExpressAnonymousAuthentication />

1354
Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
View File

File diff suppressed because it is too large Load Diff

48
Epost.TestToolsWeb/WebService/WebService.asmx.cs
View File

@ -83,18 +83,52 @@ namespace Epost.DPS.WebService
model.Uid = itemlist.ID.ToString(); model.Uid = itemlist.ID.ToString();
model.Type = "C"; model.Type = "C";
list.Add(model); list.Add(model);
itemlist.State = '3'; itemlist.State = 3;
List<JobModel> ExjobList = JobCache.GetPlanJobList().FindAll(p => p.Block == itemlist.Block && p.Area == itemlist.Area); List<JobModel> downlist = new List<JobModel>();
downlist.Add(itemlist);
bll.UpdateOrderState_Car(downlist, itemlist, itemlist.Quantity, 0);
List<JobModel> ExjobList = JobCache.GetPlanJobList().FindAll(p => p.Block == itemlist.Block && p.Area == itemlist.Area&&p.State!=3);
if (!ExjobList.Any()) if (!ExjobList.Any())
{ {
LogHelper.WriteLogInfo("熄灭指定订单任务-熄灭通道灯：" + itemlist.Block + "++++" + itemlist.Area + ""); LogHelper.WriteLogInfo("熄灭指定订单任务-熄灭通道灯：" + itemlist.Block + "++++" + itemlist.Area + "");
combll.DISPLAY_LIGHT_BLOCK(itemlist.Block, itemlist.Area, "0"); combll.DISPLAY_LIGHT_BLOCK(itemlist.Block, itemlist.Area, "0");
bool skuInish = bll.IsFinishWork(1, itemlist.Block, "", itemlist.Area, "", "", "");
if (skuInish)
{
LogHelper.WriteLogInfo("通道拣货完成--------------");
#region 修改任务队列状态
OrdersQueueModel qumodel = new OrdersQueueModel();
qumodel.State = 3;
qumodel.Taskblock = itemlist.Block;
qumodel.Taskarea = itemlist.Area;
queueBLL.UpdateQueueTaskArea_Car(qumodel);
#endregion
bool WorkArea = bll.IsFinishWorkArea("", "", "99", "", "", "");
if (WorkArea)
{
LogHelper.WriteLogInfo("阴凉区完成--------------");
if (WorkArea)
{
combll.DISPLAY_LIGHT_BLOCK_Out("", itemlist.Area, "0");
}
}
}
}
} }
}
dal.SendALL(list); dal.SendALL(list);
bool b = bll.UpOrdersState(item["transderMid"].ToString());
bool b = bll.UpOrdersState(item["transderMid"].ToString());
JobCache.UpdateJobModelList(jobList, EcommendType.Execute); JobCache.UpdateJobModelList(jobList, EcommendType.Execute);
flag = false; flag = false;
@ -138,7 +172,9 @@ namespace Epost.DPS.WebService
dal.SendALL(list); dal.SendALL(list);
bool b = bll.UpOrdersState(""); bool b = bll.UpOrdersState("");
JobCache.UpdateJobModelList(jobList, EcommendType.Execute); //修改队列状态
queueBLL.updateOrderQueueState();
JobCache.UpdateJobModelList(jobList, EcommendType.CompleteAll);
flag = false; flag = false;
} }