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-11-08 11:54:40 +08:00
parent 7c1ab8ce69
commit 2219cae500
15 changed files with 83 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Epost.BLL/AddressstorageBLL.cs
View File

@ -146,9 +146,9 @@ namespace Epost.BLL
#endregion
#region 获取控制器列表
public DataTable getLabelList(string controlid)
public DataTable getLabelList(string controlid,string batchno)
{
return dal.getLabelList(controlid);
return dal.getLabelList(controlid, batchno);
}
#endregion

24
Epost.BLL/CommandBLL.cs
View File

@ -27,7 +27,7 @@ namespace Epost.BLL
string IP = ConfigurationManager.AppSettings["WebAPIUrl"];
#region 初始化数据
public ResultModel Initialization_M(bool isback = true)
public ResultModel Initialization_T(bool isback = true)
{
ResultModel resultModel = new ResultModel();
List<LabelParamModel> list = new List<LabelParamModel>();
@ -60,6 +60,12 @@ namespace Epost.BLL
model.Command = "UNLOCK";
model.Timeout = "0.5";
list.Add(model);
model = new LabelParamModel();
model.ControlIP = item["ControlIP"].ToString();
model.Address = "9999";
model.Command = "LED_OFF";
model.Timeout = "0.5";
list.Add(model);
}
if (list.Any())
@ -84,7 +90,7 @@ namespace Epost.BLL
#endregion
#region 设备检测 查询所有标签
public ResultModel GetAllLabelList_M()
public ResultModel GetAllLabelList_M(string batchno)
{
ResultModel model = new ResultModel();
try
@ -96,11 +102,12 @@ namespace Epost.BLL
{
foreach (DataRow item in dt.Rows)
{
DataTable lableDt = addrBLL.getLabelList(item["id"].ToString());
DataTable lableDt = addrBLL.getLabelList(item["id"].ToString(), batchno);
if (lableDt != null && lableDt.Rows.Count > 0)
{
foreach (DataRow labelItem in lableDt.Rows)
{
string shopid = labelItem["address"].ToString();
if (labelItem["addresstype"].ToString() == "2")
{
LabelParamModel CNlablemodel = new LabelParamModel();
@ -115,12 +122,20 @@ namespace Epost.BLL
}
else
{
if (!string.IsNullOrEmpty(labelItem["shopid"].ToString()))
{
shopid = labelItem["shopid"].ToString();
if (shopid.Length > 4)
{
shopid = shopid.Substring(shopid.Length-4,4);
}
}
LabelParamModel lablemodel = new LabelParamModel();
lablemodel.Address = labelItem["address"].ToString();
lablemodel.ControlIP = item["ControlIP"].ToString();
lablemodel.Command = "DISPLAY_JOB";
lablemodel.Type = "N";
lablemodel.Quantity = labelItem["address"].ToString();
lablemodel.Quantity = shopid;
lablemodel.Uid = labelItem["address"].ToString();
lablemodel.Mode = "10";
list.Add(lablemodel);
@ -432,6 +447,7 @@ namespace Epost.BLL
LabelParamModel model = new LabelParamModel();
model.ControlIP = item["ControlIP"].ToString();
FORMATE_JOB_DATA(model);
LED_OFF_CLEAR(item["ControlIP"].ToString());
}

8
Epost.BLL/OrderBLL.cs
View File

@ -707,7 +707,7 @@ namespace Epost.BLL
demodel.BatchId = item["BatchId"].ToString();
demodel.ID = item["ID"].ToString();
demodel.GoodsName = item["GoodsName"].ToString();
demodel.GoodsType = item["GoodsType"].ToString();
demodel.Quantity = Convert.ToInt32(item["Quantity"].ToString());
demodel.CheckQuantity = Convert.ToInt32(item["CheckQuantity"].ToString());
demodel.Sku = item["Sku"].ToString();
@ -715,13 +715,13 @@ namespace Epost.BLL
demodel.Matchid = item["Matchid"].ToString();
demodel.ShopID = item["shopid"].ToString();
demodel.BoxCode = item["boxcode"].ToString();
demodel.LotNo = item["LotNo"].ToString();
demodel.Discount = item["Discount"].ToString();
demodel.ProdArea = item["ProdArea"].ToString();
demodel.ColorCode = item["corlorcode"].ToString();
demodel.WholeUnit = item["WholeUnit"].ToString();
demodel.Unit = item["Unit"].ToString();
demodel.TrayCode = item["bkbarcode"].ToString();
#region 获取库位信息
demodel.Block = item["Block"].ToString();
demodel.Area = item["Area"].ToString();

6
Epost.BLL/OrderControlBLL.cs
View File

@ -48,7 +48,7 @@ namespace Epost.BLL
orderbll.UpOrderstate();
UserCacheDAL.ClearUserCodeList();
boxcache.ClearBoxList();
ResultModel resultModel = comBLL.Initialization_M();
ResultModel resultModel = comBLL.Initialization_T();
// GetOrderQueue(); //加载任务显示器信息
return resultModel;
@ -119,10 +119,10 @@ namespace Epost.BLL
#region 设备检测
public ResultModel TestStart()
public ResultModel TestStart(string batchno)
{
ResultModel result = comBLL.GetAllLabelList_M();
ResultModel result = comBLL.GetAllLabelList_M(batchno);
return result;
}

2
Epost.BLL/Work_JobDownThread.cs
View File

@ -286,7 +286,7 @@ namespace Epost.BLL
#endregion
#region 刷新波次信息
showSummaryMes(model.Sku, block, area, Convert.ToInt32(block), null, model.Tolocation, model.Matchid);
// showSummaryMes(model.Sku, block, area, Convert.ToInt32(block), null, model.Tolocation, model.Matchid);
#endregion
Thread.Sleep(30);

2
Epost.BLL/Work_ScanThread.cs
View File

@ -267,7 +267,7 @@ namespace Epost.BLL
ShowMessageModel_M show = new ShowMessageModel_M();
show.Title = skudt.Rows[0]["sku_goodsname"].ToString();
show.Title = skudt.Rows[0]["goodsname"].ToString();
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
show.Block = data.Block;
show.Islock = true;