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-24 21:27:13 +08:00
parent 7ed7a8cd88
commit cc38437359
10 changed files with 55 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Epost.BLL/OrderBLL.cs
View File

@ -660,7 +660,7 @@ namespace Epost.BLL
//}
if (OrderDt != null && OrderDt.Rows.Count > 0)
{
string usercode = string.Empty;
// string usercode = string.Empty;
string lightcolor = string.Empty;
//DataTable udt = dal.GetOrderUseerXCode(matchid, sku, area, block);
//if (udt != null && udt.Rows.Count > 0)
@ -692,12 +692,12 @@ namespace Epost.BLL
demodel.Discount = item["Discount"].ToString();
demodel.WholeUnit = item["WholeUnit"].ToString();
demodel.Unit = item["Unit"].ToString();
#region 获取库位信息
demodel.Block = item["Block"].ToString();
demodel.Area = item["Area"].ToString();
demodel.Address = item["address"].ToString();
demodel.UserCode = usercode;
demodel.UserCode = UserCode;
demodel.ColorCode = lightcolor;
demodel.Bkaddress = "0";
demodel.Addresstype = "1";
@ -718,6 +718,7 @@ namespace Epost.BLL
// demodel.No = "04";
// demodel.ColorCode = EnumHelper.EMToDescriptionString(LightColor.Color.Blue);
//}
demodel.UserCode = UserCode;
list.Add(demodel);
if (!isecho) {
//修改数据为已读
@ -835,9 +836,9 @@ namespace Epost.BLL
#endregion
#region 修改订单信息
public bool Updatestate(string matchid,string readdate)
public bool Updatestate(string matchid,string shopid)
{
return dal.Updatestate(matchid,readdate);
return dal.Updatestate(matchid, shopid);
}
#endregion

4
Epost.BLL/OrdersQueueBLL.cs
View File

@ -141,10 +141,10 @@ namespace Epost.BLL
}
#endregion
#region 获取sku是否正在作业
public DataTable GetOrderQueue(string block,string area, string state)
public DataTable GetOrderQueue(string block,string area, string state,string sku)
{
return dal.GetOrderQueue(block,area, state);
return dal.GetOrderQueue(block,area, state,sku);
}
#endregion

24
Epost.BLL/Work_JobDownThread.cs
View File

@ -6,6 +6,7 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Runtime.Remoting.Metadata.W3cXsd2001;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
@ -161,7 +162,7 @@ namespace Epost.BLL
if (finjob.Any())
{
JobModel finmodel = finjob.FirstOrDefault();
qmodel.UserCode = finmodel.UserCode;
// qmodel.UserCode = finmodel.UserCode;
qmodel.Sku = finmodel.Sku;
qmodel.Matchid = finmodel.Matchid;
@ -275,22 +276,29 @@ namespace Epost.BLL
#endregion
}
bool shopfinish = orderbll.IsFinishWork(1, block, "", area,"", model.ShopID, model.Matchid);
bool shopfinish = orderbll.IsFinishWork(1, block, "", area, "", model.ShopID, model.Matchid);
if (shopfinish)
{
LogHelper.WriteLogInfo("门店拣选完成换箱" + model.ShopID);
orderbll.ChangeBox(model, 2);
orderbll.Updatestate(model.Matchid, model.ShopID);
}
else {
#region 换箱
if (type == 2)
{
LogHelper.WriteLogInfo("开始换箱" + model.ShopID);
orderbll.ChangeBox(model);
LogHelper.WriteLogInfo("拣选人员操作换箱");
orderbll.Updatestate(model.Matchid, model.ShopID);
}
#endregion
}
//else {
// #region 换箱
// if (type == 2)
// {
// LogHelper.WriteLogInfo("开始换箱" + model.ShopID);
// orderbll.ChangeBox(model);
// }
// #endregion
//}
}

10
Epost.BLL/Work_ScanThread.cs
View File

@ -417,7 +417,7 @@ namespace Epost.BLL
location = data.Parameter;// sinfodt.Rows[0]["tolocation"].ToString();
}
data.Parameter = scanStr;
DataTable skudt = queueBLL.GetOrderQueue(data.Block, data.Area, "2");
DataTable skudt = queueBLL.GetOrderQueue(data.Block, data.Area, "2", scanStr);
List<ResultMessageModel> scanlist = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Address == data.Address && m.Parameter == scanStr && m.Parameter != "888888" && m.Block == data.Block && m.Area == data.Area);
if (scanlist.Count > 1 || (skudt != null && skudt.Rows.Count > 0))
@ -429,12 +429,14 @@ namespace Epost.BLL
//show.Area = sarea;
//show.Type = 8;
//comBLL.ShowBoxMessage_M(show);
logBLL.SaveShowMesError("商品重复扫描或正在拣配！", "商品重复扫描或正在拣配");
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
}
}
else
{
DataTable OrderDt = orderbll.GetOrderList_Car(matchid, scanStr, data.Area, data.Block);
if (OrderDt != null && OrderDt.Rows.Count > 0)
{
@ -454,7 +456,7 @@ namespace Epost.BLL
qmodel.State = 2;
qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
queueBLL.insertQueueOrders(qmodel);
}
else
@ -484,7 +486,7 @@ namespace Epost.BLL
qmodel.Matchid = umodel.Matchid;
// qmodel.Location = location;
qmodel.Shopid = echoDt.Rows[0]["GoodsName"].ToString();
qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Blue);
queueBLL.insertQueueOrders(qmodel);