hanlihui520/T-DAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
帅凯 贾
2023-07-18 11:18:52 +08:00
parent 53c4b66485
commit ccbca85c55
13 changed files with 504 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
Epost.BLL/OrderBLL.cs
View File

@ -18,17 +18,17 @@ namespace Epost.BLL
{
BoxPickBLL pickBLL = new BoxPickBLL();
OrdersDAL dal = new OrdersDAL();
OrdersQueueBLL queueBLL = new OrdersQueueBLL();
BoxQueueBLL queueboxBLL = new BoxQueueBLL();
CommandDAL comDAL = new CommandDAL();
CommandBLL comBLL = new CommandBLL();
CommandBLL comBLL = new CommandBLL();
AddressstorageBLL addrBLL = new AddressstorageBLL();
JobModelCacheDAL JobCache = new JobModelCacheDAL();
JobModelCacheDAL JobCache = new JobModelCacheDAL();
JobDownCacheDAL downCacheDAL = new JobDownCacheDAL();
LocationCacheDAL LocCacheDAL = new LocationCacheDAL();
UserModelCacheDAL UserCacheDAL = new UserModelCacheDAL();
private static object lockbox = new object();
UserModelCacheDAL UserCacheDAL = new UserModelCacheDAL();
private static object lockbox = new object();
#region 绑定箱号
public void BindBoxCode()
@ -110,7 +110,7 @@ namespace Epost.BLL
}
#endregion
#region 拆单
public bool packOrder(ResultMessageModel data, List<JobModel> job, string block, string area, string type)
{
@ -256,9 +256,9 @@ namespace Epost.BLL
return false;
}
}
#endregion
#endregion
#region 删除任务
public void REMOVE_JOB(string address, string ip, string no)
@ -388,11 +388,11 @@ namespace Epost.BLL
if (nowqty > jobmo.Quantity)
{
nowqty = nowqty - jobmo.Quantity;
dal.UpdateWorkState_Car(jobmo.Matchid, jobmo.Quantity, jobmo.Sku, jobmo.ID, checkquaantity, model.UserCode);
dal.UpdateWorkState_Car(jobmo.OrderID, jobmo.Quantity, jobmo.Sku, jobmo.ID, checkquaantity, model.UserCode);
}
else
{
dal.UpdateWorkState_Car(jobmo.Matchid, jobmo.Quantity, jobmo.Sku, jobmo.ID, checkquaantity, model.UserCode);
dal.UpdateWorkState_Car(jobmo.OrderID, jobmo.Quantity, jobmo.Sku, jobmo.ID, checkquaantity, model.UserCode);
nowqty = 0;
}
}
@ -453,11 +453,11 @@ namespace Epost.BLL
}
//换箱
#region 换箱
public void changeBox_ClearJOB(string sblock, string sarea, string address, string controlip)
@ -544,7 +544,7 @@ namespace Epost.BLL
public void BindJobListBySku(string sku)
{
try
{
{
List<OrderListModel> dnList = LocCacheDAL.GetLocationList().FindAll(m => m.State == 0 && m.Sku == sku);
if (dnList.Any())
{
@ -629,9 +629,9 @@ namespace Epost.BLL
}
#endregion
#region 清除显示标签
@ -731,30 +731,30 @@ namespace Epost.BLL
#endregion
#region 获取订单信息
public List<JobModel> GetOrderList(string matchid, string block, string sku = "", string area = "", string UserCode = "")
public List<JobModel> GetOrderList(string orderid, string block, string sku = "", string area = "", string UserCode = "")
{
try
{
List<JobModel> list = new List<JobModel>();
DataTable OrderDt = dal.GetOrderList_Car(matchid, sku, area, block);
DataTable OrderDt = dal.GetOrderList_Car(orderid, sku, area, block);
bool isecho = false;
//if (OrderDt == null || OrderDt.Rows.Count == 0)//回显
//{
// OrderDt = dal.GetOrderList_Car(matchid, sku, area, block);
// 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();
}
//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))
{
lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
@ -780,7 +780,14 @@ namespace Epost.BLL
demodel.Area = item["Area"].ToString();
demodel.Address = item["address"].ToString();
demodel.UserCode = usercode;
demodel.ColorCode = lightcolor;
demodel.ColorCode = item["labelcolor"].ToString();
demodel.looklisten = item["looklisten"].ToString();
demodel.labelIP = item["labelIP"].ToString();
demodel.labelno = item["labelno"].ToString();
demodel.genericname = item["genericname"].ToString();
demodel.manufactname = item["manufactname"].ToString();
demodel.batchno = item["batchno"].ToString();
demodel.Spec = item["Spec"].ToString();
demodel.Bkaddress = "0";
demodel.Addresstype = "1";
demodel.ControlID = "";
@ -801,9 +808,10 @@ namespace Epost.BLL
// demodel.ColorCode = EnumHelper.EMToDescriptionString(LightColor.Color.Blue);
//}
list.Add(demodel);
if (!isecho) {
//修改数据为已读
dal.UpOrder_Car(item["Matchid"].ToString(), item["sku"].ToString(), item["id"].ToString());
if (!isecho)
{
//修改数据为已读
dal.UpOrder_Car(item["Matchid"].ToString(), item["sku"].ToString(), item["id"].ToString());
}
#endregion
}
@ -813,8 +821,7 @@ namespace Epost.BLL
LogHelper.WriteLogInfo("查询无任务================");
OrdersQueueModel qmodel = new OrdersQueueModel();
qmodel.Sku = sku;
qmodel.Matchid = matchid;
qmodel.Orderid = orderid;
qmodel.UserCode = UserCode;
qmodel.Taskblock = block;
qmodel.Taskarea = area;
@ -839,7 +846,10 @@ namespace Epost.BLL
}
}
public DataTable GetOrderList(string area, string block)
{
return dal.GetOrderList(area, block);
}
#endregion
@ -901,7 +911,7 @@ namespace Epost.BLL
}
}
#endregion
#region 修改订单信息
public bool UpdateOrderstate(string orderid)
{
@ -917,9 +927,9 @@ namespace Epost.BLL
#endregion
#region 修改订单信息
public bool Updatestate(string matchid,string readdate)
public bool Updatestate(string matchid, string readdate)
{
return dal.Updatestate(matchid,readdate);
return dal.Updatestate(matchid, readdate);
}
#endregion
@ -940,6 +950,16 @@ namespace Epost.BLL
}
#endregion
#region
public bool ImportOrderinfo(DataTable ds, Dictionary<string, string> diclist)
{
bool bo = false;
if (ds != null && ds.Rows.Count > 0)
{
bo = dal.ImportOrderinfo(ds, diclist);
}
return bo;
}
public DataTable GetMatchOrderList()
{
@ -984,7 +1004,7 @@ namespace Epost.BLL
public bool IsFinishWorkByCar(int endcount, string matchid, string block="")
public bool IsFinishWorkByCar(int endcount, string matchid, string block = "")
{
return dal.IsFinishWorkByCar(endcount, matchid, block);
}
@ -998,13 +1018,13 @@ namespace Epost.BLL
{
return dal.IsFinishWork(endcount, block, usercode, area, sku, shopid, matchid);
}
public DataTable GetMatchOrder()
{
return dal.GetMatchOrder();
}
#endregion
#region 获取订单信息
public DataTable GetOrderList_Car(string matchid, string sku, string sarea, string sblock)
@ -1018,5 +1038,10 @@ namespace Epost.BLL
return dal.GetOrderList_echo(matchid, sku, sarea, sblock);
}
#endregion
public DataTable GetDataIfRepeat(string transderMid, string transderDid)
{
return dal.GetDataIfRepeat(transderMid, transderDid);
}
}
}