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-06 14:13:52 +08:00
parent 102cc71af5
commit 122c2cb3bc
7 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Epost.BLL/OrderBLL.cs
View File

@ -917,9 +917,9 @@ namespace Epost.BLL
return dal.GetSumList_Echo(matchid, sku, block, area); return dal.GetSumList_Echo(matchid, sku, block, area);
} }
//查询sku对应的所有任务 //查询sku对应的所有任务
public DataTable getOrderListBysku(string block, string sku) public DataTable getOrderListBysku(string block, string sku,string area)
{ {
return dal.getOrderListBysku(block, sku); return dal.getOrderListBysku(block, sku,area);
} }
public bool UpOrderStateBybat(string id) public bool UpOrderStateBybat(string id)

4
Epost.BLL/OrdersQueueBLL.cs
View File

@ -204,9 +204,9 @@ namespace Epost.BLL
#endregion #endregion
#region 删除que #region 删除que
public bool DelQueueOrder(string sku,string block) public bool DelQueueOrder(string sku,string block,string area)
{ {
return dal.DelQueueOrder(sku,block); return dal.DelQueueOrder(sku,block,area);
} }
#endregion #endregion

4
Epost.BLL/Work_JobDownThread.cs
View File

@ -971,7 +971,7 @@ namespace Epost.BLL
{ {
List<LabelParamModel> list = new List<LabelParamModel>(); List<LabelParamModel> list = new List<LabelParamModel>();
//查询当前通道sku是否有任务 //查询当前通道sku是否有任务
DataTable dt = orderbll.getOrderListBysku(block, sku); DataTable dt = orderbll.getOrderListBysku(block, sku, area);
if (dt != null && dt.Rows.Count > 0) if (dt != null && dt.Rows.Count > 0)
{ {
// 将当前通道所有sku正在亮的设备熄灭 // 将当前通道所有sku正在亮的设备熄灭
@ -1005,7 +1005,7 @@ namespace Epost.BLL
model = relist.FirstOrDefault(); model = relist.FirstOrDefault();
JobCache.UpdateJobModelList(relist, EcommendType.Complete); JobCache.UpdateJobModelList(relist, EcommendType.Complete);
//删除Orderqueue中sku的记录 //删除Orderqueue中sku的记录
bool bo = queueBLL.DelQueueOrder(sku, block); bool bo = queueBLL.DelQueueOrder(sku, block, area);
LogHelper.WriteLogInfo("删除queue返回" + bo); LogHelper.WriteLogInfo("删除queue返回" + bo);
} }
else else

6
Epost.BLL/Work_ScanThread.cs
View File

@ -509,7 +509,7 @@ namespace Epost.BLL
{ {
List<LabelParamModel> list = new List<LabelParamModel>(); List<LabelParamModel> list = new List<LabelParamModel>();
//查询当前通道sku是否有任务 //查询当前通道sku是否有任务
DataTable dt = orderbll.getOrderListBysku(block, sku); DataTable dt = orderbll.getOrderListBysku(block, sku,area);
if (dt != null && dt.Rows.Count > 0) if (dt != null && dt.Rows.Count > 0)
{ {
// 将当前通道所有sku正在亮的设备熄灭 // 将当前通道所有sku正在亮的设备熄灭
@ -539,14 +539,14 @@ namespace Epost.BLL
//删除缓存中sku记录 //删除缓存中sku记录
List<JobModel> jobList = JobCache.GetPlanJobList(); List<JobModel> jobList = JobCache.GetPlanJobList();
List<JobModel> relist = jobList.FindAll(m => m.Sku == sku && m.Block == block); List<JobModel> relist = jobList.FindAll(m => m.Sku == sku && m.Block == block&&m.Area==area);
JobModel model = new JobModel(); JobModel model = new JobModel();
if (relist.Any()) if (relist.Any())
{ {
model = relist.FirstOrDefault(); model = relist.FirstOrDefault();
JobCache.UpdateJobModelList(relist, EcommendType.Complete); JobCache.UpdateJobModelList(relist, EcommendType.Complete);
//删除Orderqueue中sku的记录 //删除Orderqueue中sku的记录
bool bo = queueBLL.DelQueueOrder(sku, block); bool bo = queueBLL.DelQueueOrder(sku, block, area);
LogHelper.WriteLogInfo("删除queue返回" + bo); LogHelper.WriteLogInfo("删除queue返回" + bo);
} }
else else

6
Epost.DAL/OrdersDAL.cs
View File

@ -1245,10 +1245,10 @@ namespace Epost.DAL
#region 查询sku对应的所有任务 #region 查询sku对应的所有任务
public DataTable getOrderListBysku(string block, string sku) public DataTable getOrderListBysku(string block, string sku,string area)
{ {
string sql = string.Format("select * from v_orders where block = '{0}' and sku ='{1}' order by layer,slist ", string sql = string.Format("select * from v_orders where block = '{0}' and area='{1}' and sku ='{2}' order by layer,slist ",
block, block,area,
sku); sku);
LogHelper.WriteLogInfo("查询sku对应的所有任务:" + sql); LogHelper.WriteLogInfo("查询sku对应的所有任务:" + sql);
DataTable dt = db.GetsqlForDT(sql); DataTable dt = db.GetsqlForDT(sql);

6
Epost.DAL/OrdersQueueDAL.cs
View File

@ -354,10 +354,10 @@ namespace Epost.DAL
#region 删除queue #region 删除queue
public bool DelQueueOrder(string sku,string block) public bool DelQueueOrder(string sku,string block,string area)
{ {
string sql = string.Format("delete from OrdersQueue where sku='{0}' and taskblock='{1}' and state<>3", string sql = string.Format("delete from OrdersQueue where sku='{0}' and taskblock='{1}' and taskarea='{2}' and state<>3",
sku,block); sku,block,area);
LogHelper.WriteLogInfo("删除queue"+sql); LogHelper.WriteLogInfo("删除queue"+sql);
long x = db.DeleteSql(sql); long x = db.DeleteSql(sql);
if (x > 0) if (x > 0)

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

@ -33,19 +33,19 @@
<publishTime>04/04/2018 15:45:12</publishTime> <publishTime>04/04/2018 15:45:12</publishTime>
</File> </File>
<File Include="bin/App_global.asax.compiled"> <File Include="bin/App_global.asax.compiled">
<publishTime>12/03/2024 14:23:22</publishTime> <publishTime>12/06/2024 13:31:01</publishTime>
</File> </File>
<File Include="bin/App_global.asax.dll"> <File Include="bin/App_global.asax.dll">
<publishTime>12/03/2024 14:23:22</publishTime> <publishTime>12/06/2024 13:31:01</publishTime>
</File> </File>
<File Include="bin/BouncyCastle.Crypto.dll"> <File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>02/24/2020 15:29:24</publishTime> <publishTime>02/24/2020 15:29:24</publishTime>
</File> </File>
<File Include="bin/Common.dll"> <File Include="bin/Common.dll">
<publishTime>12/03/2024 14:23:03</publishTime> <publishTime>12/06/2024 13:29:51</publishTime>
</File> </File>
<File Include="bin/Common.pdb"> <File Include="bin/Common.pdb">
<publishTime>12/03/2024 14:23:03</publishTime> <publishTime>12/06/2024 13:29:51</publishTime>
</File> </File>
<File Include="bin/ComposerSDK.dll"> <File Include="bin/ComposerSDK.dll">
<publishTime>04/29/2020 16:50:14</publishTime> <publishTime>04/29/2020 16:50:14</publishTime>
@ -63,31 +63,31 @@
<publishTime>10/23/2017 13:15:20</publishTime> <publishTime>10/23/2017 13:15:20</publishTime>
</File> </File>
<File Include="bin/Epost.BLL.dll"> <File Include="bin/Epost.BLL.dll">
<publishTime>12/03/2024 14:23:04</publishTime> <publishTime>12/06/2024 13:30:43</publishTime>
</File> </File>
<File Include="bin/Epost.BLL.pdb"> <File Include="bin/Epost.BLL.pdb">
<publishTime>12/03/2024 14:23:04</publishTime> <publishTime>12/06/2024 13:30:43</publishTime>
</File> </File>
<File Include="bin/Epost.BLL.XmlSerializers.dll"> <File Include="bin/Epost.BLL.XmlSerializers.dll">
<publishTime>08/26/2020 18:09:48</publishTime> <publishTime>08/26/2020 18:09:48</publishTime>
</File> </File>
<File Include="bin/Epost.DAL.dll"> <File Include="bin/Epost.DAL.dll">
<publishTime>12/03/2024 14:23:03</publishTime> <publishTime>12/06/2024 13:30:43</publishTime>
</File> </File>
<File Include="bin/Epost.DAL.pdb"> <File Include="bin/Epost.DAL.pdb">
<publishTime>12/03/2024 14:23:03</publishTime> <publishTime>12/06/2024 13:30:43</publishTime>
</File> </File>
<File Include="bin/Epost.DPS.dll"> <File Include="bin/Epost.DPS.dll">
<publishTime>12/03/2024 14:23:07</publishTime> <publishTime>12/06/2024 13:30:46</publishTime>
</File> </File>
<File Include="bin/Epost.DPS.pdb"> <File Include="bin/Epost.DPS.pdb">
<publishTime>12/03/2024 14:23:07</publishTime> <publishTime>12/06/2024 13:30:46</publishTime>
</File> </File>
<File Include="bin/Epost.Model.dll"> <File Include="bin/Epost.Model.dll">
<publishTime>12/03/2024 14:23:02</publishTime> <publishTime>12/06/2024 13:29:51</publishTime>
</File> </File>
<File Include="bin/Epost.Model.pdb"> <File Include="bin/Epost.Model.pdb">
<publishTime>12/03/2024 14:23:02</publishTime> <publishTime>12/06/2024 13:29:51</publishTime>
</File> </File>
<File Include="bin/Epost.TestToolsWeb.dll"> <File Include="bin/Epost.TestToolsWeb.dll">
<publishTime>09/06/2018 11:57:11</publishTime> <publishTime>09/06/2018 11:57:11</publishTime>
@ -5652,7 +5652,7 @@
<publishTime>05/30/2022 16:58:47</publishTime> <publishTime>05/30/2022 16:58:47</publishTime>
</File> </File>
<File Include="PrecompiledApp.config"> <File Include="PrecompiledApp.config">
<publishTime>12/03/2024 14:23:09</publishTime> <publishTime>12/06/2024 13:30:47</publishTime>
</File> </File>
<File Include="Scripts/ai.0.22.9-build00167.js"> <File Include="Scripts/ai.0.22.9-build00167.js">
<publishTime>04/04/2018 15:45:12</publishTime> <publishTime>04/04/2018 15:45:12</publishTime>
@ -7572,7 +7572,7 @@
<publishTime>07/04/2022 14:22:38</publishTime> <publishTime>07/04/2022 14:22:38</publishTime>
</File> </File>
<File Include="Web.config"> <File Include="Web.config">
<publishTime>12/03/2024 14:23:08</publishTime> <publishTime>12/06/2024 13:30:46</publishTime>
</File> </File>
</ItemGroup> </ItemGroup>
</Project> </Project>