Compare commits
23 Commits
ZhuYou_Wcs
...
NanJing711
| Author | SHA1 | Date | |
|---|---|---|---|
| 6877cd31ea | |||
| 60517d6f9b | |||
| 7a359923d9 | |||
| 7ef2bbeb19 | |||
| 618028296e | |||
| ede9a6bedc | |||
| 7d4c441da4 | |||
| 0d861d7161 | |||
| 67ec46d1da | |||
| efe75a69d2 | |||
| e923301596 | |||
| 285bae186b | |||
| af5cde8e46 | |||
| adab2c3392 | |||
| bad533bcc1 | |||
| af2bdf2adc | |||
| 8f5d9ffbd3 | |||
| 122c2cb3bc | |||
| 102cc71af5 | |||
| f4b525c564 | |||
| 0f7cc10d25 | |||
| 5ac2c1b77c | |||
| a934f48c74 |
@ -150,9 +150,12 @@ namespace Epost.BLL
|
||||
{
|
||||
return dal.getLabelList(controlid, batchno);
|
||||
}
|
||||
|
||||
public DataTable getLabelList(string controlid)
|
||||
{
|
||||
return dal.getLabelList(controlid);
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region 获取所有地址
|
||||
public DataTable getAddressList()
|
||||
{
|
||||
|
||||
@ -102,7 +102,8 @@ namespace Epost.BLL
|
||||
{
|
||||
foreach (DataRow item in dt.Rows)
|
||||
{
|
||||
DataTable lableDt = addrBLL.getLabelList(item["id"].ToString(), batchno);
|
||||
DataTable lableDt = addrBLL.getLabelList(item["id"].ToString(), batchno);
|
||||
// DataTable lableDt = addrBLL.getLabelList(item["id"].ToString());
|
||||
if (lableDt != null && lableDt.Rows.Count > 0)
|
||||
{
|
||||
foreach (DataRow labelItem in lableDt.Rows)
|
||||
@ -122,22 +123,27 @@ namespace Epost.BLL
|
||||
}
|
||||
else
|
||||
{
|
||||
LabelParamModel lablemodel = new LabelParamModel();
|
||||
if (!string.IsNullOrEmpty(labelItem["shopid"].ToString()))
|
||||
{
|
||||
shopid = labelItem["shopid"].ToString();
|
||||
if (shopid.Length > 4)
|
||||
if (shopid.Length > 3)
|
||||
{
|
||||
shopid = shopid.Substring(shopid.Length-4,4);
|
||||
shopid = shopid.Substring(shopid.Length - 3, 3);
|
||||
lablemodel.Quantity = shopid;
|
||||
lablemodel.Mode = "50";
|
||||
}
|
||||
}
|
||||
LabelParamModel lablemodel = new LabelParamModel();
|
||||
else {
|
||||
|
||||
lablemodel.Quantity = shopid;
|
||||
lablemodel.Mode = "10";
|
||||
}
|
||||
lablemodel.Address = labelItem["address"].ToString();
|
||||
lablemodel.ControlIP = item["ControlIP"].ToString();
|
||||
lablemodel.Command = "DISPLAY_JOB";
|
||||
lablemodel.Type = "N";
|
||||
lablemodel.Quantity = shopid;
|
||||
lablemodel.Uid = labelItem["address"].ToString();
|
||||
lablemodel.Mode = "10";
|
||||
lablemodel.Type = "N";
|
||||
lablemodel.Uid = labelItem["address"].ToString();
|
||||
list.Add(lablemodel);
|
||||
}
|
||||
|
||||
@ -194,6 +200,12 @@ namespace Epost.BLL
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 格式化标签
|
||||
public bool FORMAT_DEVICE(LabelParamModel model)
|
||||
{
|
||||
return dal.FORMAT_DEVICE(model);
|
||||
}
|
||||
#endregion
|
||||
#region 连接控制器
|
||||
public bool CONNECT(LabelParamModel model)
|
||||
{
|
||||
@ -247,7 +259,7 @@ namespace Epost.BLL
|
||||
LabelParamModel lockModel = new LabelParamModel();
|
||||
lockModel.Address = model.Address;
|
||||
lockModel.ControlIP = model.ControlIP;
|
||||
lockModel.Parameter = "11101000";
|
||||
lockModel.Parameter = "11111000";
|
||||
lockModel.Command = "LOCK";
|
||||
lockModel.Timeout = "0.5";
|
||||
lockModel.Type = model.Type;
|
||||
@ -259,7 +271,7 @@ namespace Epost.BLL
|
||||
LabelParamModel lockModel = new LabelParamModel();
|
||||
lockModel.Address = model.Address;
|
||||
lockModel.ControlIP = model.ControlIP;
|
||||
lockModel.Parameter = "00011000";
|
||||
lockModel.Parameter = "11111000";
|
||||
lockModel.Command = "UNLOCK";
|
||||
lockModel.Timeout = "0.5";
|
||||
lockModel.Type = model.Type;
|
||||
@ -361,6 +373,8 @@ namespace Epost.BLL
|
||||
clearModel.Parameter = "1";
|
||||
clearModel.Command = "LED_OFF";
|
||||
clearModel.Timeout = "0.5";
|
||||
clearModel.Uid = "C"+item.Address;
|
||||
clearModel.Type = "N";
|
||||
list.Add(clearModel);
|
||||
}
|
||||
|
||||
@ -501,7 +515,7 @@ namespace Epost.BLL
|
||||
model.ControlIP = item.ControlIP;
|
||||
model.Address = item.Address;
|
||||
model.Command = "REMOVE_JOB";
|
||||
model.Uid = item.ID;
|
||||
model.Uid = "U" + item.ID;
|
||||
model.Type = "N";
|
||||
list.Add(model);
|
||||
LabelParamModel Unlockmodel = new LabelParamModel();
|
||||
|
||||
@ -689,12 +689,12 @@ namespace Epost.BLL
|
||||
{
|
||||
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);
|
||||
@ -717,11 +717,9 @@ namespace Epost.BLL
|
||||
demodel.BoxCode = item["boxcode"].ToString();
|
||||
|
||||
demodel.Discount = item["Discount"].ToString();
|
||||
|
||||
demodel.ColorCode = item["corlorcode"].ToString();
|
||||
demodel.WholeUnit = item["WholeUnit"].ToString();
|
||||
demodel.Unit = item["Unit"].ToString();
|
||||
|
||||
demodel.Readtime = item["readtime"].ToString();
|
||||
#region 获取库位信息
|
||||
demodel.Block = item["Block"].ToString();
|
||||
demodel.Area = item["Area"].ToString();
|
||||
@ -914,39 +912,51 @@ namespace Epost.BLL
|
||||
{
|
||||
return dal.GetSumList(matchid, sku, block, area);
|
||||
}
|
||||
|
||||
|
||||
public DataTable GetSumList_Echo(string matchid, string sku, string block, string area = "")
|
||||
{
|
||||
return dal.GetSumList_Echo(matchid, sku, block, area);
|
||||
}
|
||||
//查询sku对应的所有任务
|
||||
public DataTable getOrderListBysku(string block, string sku)
|
||||
public DataTable getOrderListBysku(string block, string sku,string area, string matchid)
|
||||
{
|
||||
return dal.getOrderListBysku(block, sku);
|
||||
return dal.getOrderListBysku(block, sku,area,matchid);
|
||||
}
|
||||
|
||||
public DataTable getOrderHisListBysku(string block, string sku, string area,string matchid)
|
||||
{
|
||||
return dal.getOrderHisListBysku(block, sku, area, matchid);
|
||||
}
|
||||
|
||||
public bool UpOrderStateBybat(string id)
|
||||
{
|
||||
return dal.UpOrderStateBybat(id);
|
||||
}
|
||||
|
||||
|
||||
public bool UpdateStateBymatchid(string matchid)
|
||||
{
|
||||
return dal.UpdateStateBymatchid(matchid);
|
||||
}
|
||||
|
||||
|
||||
public bool IsFinishWorkByCar(int endcount, string matchid, string block="")
|
||||
{
|
||||
return dal.IsFinishWorkByCar(endcount, matchid, block);
|
||||
}
|
||||
|
||||
public bool UpdateStateByCar(string matchid, string block = "", string sku = "")
|
||||
public bool UpdateStateByCar(string matchid, string sku = "")
|
||||
{
|
||||
return dal.UpdateStateByCar(matchid, block, sku);
|
||||
return dal.UpdateStateByCar(matchid, sku);
|
||||
}
|
||||
|
||||
public bool IsFinishWork(int endcount, string block, string usercode = "", string area = "", string sku = "", string shopid = "", string matchid = "")
|
||||
{
|
||||
return dal.IsFinishWork(endcount, block, usercode, area, sku, shopid, matchid);
|
||||
}
|
||||
|
||||
|
||||
public bool IsSkuFinishWork(string sku, string matchid)
|
||||
{
|
||||
return dal.IsSkuFinishWork(sku, matchid);
|
||||
}
|
||||
public DataTable GetMatchOrder()
|
||||
{
|
||||
return dal.GetMatchOrder();
|
||||
|
||||
@ -122,7 +122,7 @@ namespace Epost.BLL
|
||||
public ResultModel TestStart(string batchno)
|
||||
{
|
||||
|
||||
ResultModel result = comBLL.GetAllLabelList_M(batchno);
|
||||
ResultModel result = comBLL.GetAllLabelList_M(batchno);
|
||||
return result;
|
||||
|
||||
}
|
||||
@ -166,125 +166,125 @@ namespace Epost.BLL
|
||||
#endregion
|
||||
|
||||
#region 查询波次通道列表
|
||||
public void GetOrderQueue()
|
||||
{
|
||||
DataTable dt = queueBLL.getQueueOrderStateList();
|
||||
if (dt != null && dt.Rows.Count > 0)
|
||||
{
|
||||
foreach (DataRow item in dt.Rows)
|
||||
{
|
||||
if (item["lightcolor"].ToString() == EnumHelper.EMToDescriptionString(LightColor.Color.Blue))
|
||||
{
|
||||
Mes_Echo(item["sku"].ToString(), item["taskblock"].ToString(), item["taskarea"].ToString(), 1, null, "", item["matchid"].ToString());
|
||||
}
|
||||
else
|
||||
{
|
||||
showSummaryMes(item["sku"].ToString(), item["taskblock"].ToString(), item["taskarea"].ToString(), 1, null, "", item["matchid"].ToString());
|
||||
}
|
||||
//public void GetOrderQueue()
|
||||
//{
|
||||
// DataTable dt = queueBLL.getQueueOrderStateList();
|
||||
// if (dt != null && dt.Rows.Count > 0)
|
||||
// {
|
||||
// foreach (DataRow item in dt.Rows)
|
||||
// {
|
||||
// if (item["lightcolor"].ToString() == EnumHelper.EMToDescriptionString(LightColor.Color.Blue))
|
||||
// {
|
||||
// Mes_Echo(item["sku"].ToString(), item["taskblock"].ToString(), item["taskarea"].ToString(), 1, null, "", item["matchid"].ToString());
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// showSummaryMes(item["sku"].ToString(), item["taskblock"].ToString(), item["taskarea"].ToString(), 1, null, "", item["matchid"].ToString());
|
||||
// }
|
||||
|
||||
}
|
||||
}
|
||||
// }
|
||||
// }
|
||||
|
||||
}
|
||||
//}
|
||||
#endregion
|
||||
|
||||
|
||||
#region 复核显示
|
||||
public void Mes_Echo(string scanStr, string sblock, string sarea, int type, ResultMessageModel data = null, string location = "", string matchid = "", bool islock = true)
|
||||
{
|
||||
//#region 复核显示
|
||||
//public void Mes_Echo(string scanStr, string sblock, string sarea, int type, ResultMessageModel data = null, string location = "", string matchid = "", bool islock = true)
|
||||
//{
|
||||
|
||||
DataTable sudt = orderbll.GetSumList_Echo("", scanStr, sblock);
|
||||
if (type == 2)
|
||||
{
|
||||
sudt = orderbll.GetSumList_Echo("", scanStr, sblock, sarea);
|
||||
}
|
||||
//查询当前区任务队列
|
||||
DataTable qdt = queueBLL.getQueuesOrderbyState(sblock, sarea, "1");
|
||||
if (sudt != null && sudt.Rows.Count > 0)
|
||||
{
|
||||
matchid = sudt.Rows[0]["matchid"].ToString();
|
||||
string sku = string.Empty;
|
||||
string qty = string.Empty;
|
||||
string color = string.Empty;
|
||||
if (qdt != null && qdt.Rows.Count > 0)
|
||||
{
|
||||
sku = qdt.Rows[0]["sku"].ToString();
|
||||
qty = sudt.Rows[0]["SumQuantity"].ToString();
|
||||
color = qdt.Rows[0]["LightColor"].ToString();
|
||||
}
|
||||
// DataTable sudt = orderbll.GetSumList_Echo("", scanStr, sblock);
|
||||
// if (type == 2)
|
||||
// {
|
||||
// sudt = orderbll.GetSumList_Echo("", scanStr, sblock, sarea);
|
||||
// }
|
||||
// //查询当前区任务队列
|
||||
// DataTable qdt = queueBLL.getQueuesOrderbyState(sblock, sarea, "1");
|
||||
// if (sudt != null && sudt.Rows.Count > 0)
|
||||
// {
|
||||
// matchid = sudt.Rows[0]["matchid"].ToString();
|
||||
// string sku = string.Empty;
|
||||
// string qty = string.Empty;
|
||||
// string color = string.Empty;
|
||||
// if (qdt != null && qdt.Rows.Count > 0)
|
||||
// {
|
||||
// sku = qdt.Rows[0]["sku"].ToString();
|
||||
// qty = sudt.Rows[0]["SumQuantity"].ToString();
|
||||
// color = qdt.Rows[0]["LightColor"].ToString();
|
||||
// }
|
||||
|
||||
//规格
|
||||
// int discount = Convert.ToInt32(sudt.Rows[0]["discount"].ToString());
|
||||
//整件总数
|
||||
int SumCkQuantity = 0;// Convert.ToInt32(sudt.Rows[0]["SumCkQuantity"].ToString());
|
||||
//散件总数
|
||||
int SumQuantity = Convert.ToInt32(sudt.Rows[0]["SumQuantity"].ToString());
|
||||
//if (discount != 1)
|
||||
//{
|
||||
// if (SumQuantity >= discount)
|
||||
// {
|
||||
// //规格
|
||||
// // int discount = Convert.ToInt32(sudt.Rows[0]["discount"].ToString());
|
||||
// //整件总数
|
||||
// int SumCkQuantity = 0;// Convert.ToInt32(sudt.Rows[0]["SumCkQuantity"].ToString());
|
||||
// //散件总数
|
||||
// int SumQuantity = Convert.ToInt32(sudt.Rows[0]["SumQuantity"].ToString());
|
||||
// //if (discount != 1)
|
||||
// //{
|
||||
// // if (SumQuantity >= discount)
|
||||
// // {
|
||||
|
||||
// SumCkQuantity = SumQuantity / discount;
|
||||
// SumQuantity = SumQuantity % discount;
|
||||
// }
|
||||
//}
|
||||
// // SumCkQuantity = SumQuantity / discount;
|
||||
// // SumQuantity = SumQuantity % discount;
|
||||
// // }
|
||||
// //}
|
||||
|
||||
|
||||
ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
show.Title = sudt.Rows[0]["goodsname"].ToString();
|
||||
string mes = "复核显示";
|
||||
islock = false;
|
||||
// ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
// show.Title = sudt.Rows[0]["goodsname"].ToString();
|
||||
// string mes = "复核显示";
|
||||
// islock = false;
|
||||
|
||||
if (qdt != null && qdt.Rows.Count > 0)
|
||||
{
|
||||
show.Contents = qdt.Rows[0]["location"].ToString() + "(" + scanStr + ")" + "\r" + mes;
|
||||
}
|
||||
if (data != null)
|
||||
{
|
||||
// if (qdt != null && qdt.Rows.Count > 0)
|
||||
// {
|
||||
// show.Contents = qdt.Rows[0]["location"].ToString() + "(" + scanStr + ")" + "\r" + mes;
|
||||
// }
|
||||
// if (data != null)
|
||||
// {
|
||||
|
||||
show.Contents = data.ScanCode + "(" + scanStr + ")" + "\r"+ mes;
|
||||
sku = data.Parameter;
|
||||
}
|
||||
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Blue);
|
||||
show.Qty = SumQuantity.ToString();
|
||||
show.Wholeqty = SumCkQuantity;
|
||||
show.Unit = "件";
|
||||
show.Type = 8;
|
||||
show.Wholeunit = "箱";
|
||||
show.Block = sblock;
|
||||
show.Area = sarea;
|
||||
show.Islock = islock;
|
||||
show.Location = "check";
|
||||
comBLL.ShowBoxMessage_M(show);
|
||||
// show.Contents = data.ScanCode + "(" + scanStr + ")" + "\r"+ mes;
|
||||
// sku = data.Parameter;
|
||||
// }
|
||||
// show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Blue);
|
||||
// show.Qty = SumQuantity.ToString();
|
||||
// show.Wholeqty = SumCkQuantity;
|
||||
// show.Unit = "件";
|
||||
// show.Type = 8;
|
||||
// show.Wholeunit = "箱";
|
||||
// show.Block = sblock;
|
||||
// show.Area = sarea;
|
||||
// show.Islock = islock;
|
||||
// show.Location = "check";
|
||||
// comBLL.ShowBoxMessage_M(show);
|
||||
|
||||
if (data != null)
|
||||
{
|
||||
// if (data != null)
|
||||
// {
|
||||
|
||||
data.Status = "1";
|
||||
}
|
||||
// data.Status = "1";
|
||||
// }
|
||||
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
|
||||
//查询当前区任务队列
|
||||
DataTable finshqdt = queueBLL.getQueuesOrderbyState(sblock, sarea, "3");
|
||||
ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
//根据sku获取商品名称
|
||||
string goodsname = orderbll.GetGoodsname(location);
|
||||
show.Title = goodsname + "分播完成";
|
||||
show.Contents = scanStr + "\r请扫描继续作业";
|
||||
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||
show.Qty = "0";
|
||||
show.Type = 8;
|
||||
show.Block = sblock;
|
||||
show.Area = sarea;
|
||||
show.Islock = true;
|
||||
comBLL.ShowBoxMessage_M(show);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
// //查询当前区任务队列
|
||||
// DataTable finshqdt = queueBLL.getQueuesOrderbyState(sblock, sarea, "3");
|
||||
// ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
// //根据sku获取商品名称
|
||||
// string goodsname = orderbll.GetGoodsname(location);
|
||||
// show.Title = goodsname + "分播完成";
|
||||
// show.Contents = scanStr + "\r请扫描继续作业";
|
||||
// show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||
// show.Qty = "0";
|
||||
// show.Type = 8;
|
||||
// show.Block = sblock;
|
||||
// show.Area = sarea;
|
||||
// show.Islock = true;
|
||||
// comBLL.ShowBoxMessage_M(show);
|
||||
// }
|
||||
//}
|
||||
//#endregion
|
||||
|
||||
#region 订单显示器中分提示
|
||||
/// <summary>
|
||||
|
||||
@ -204,9 +204,9 @@ namespace Epost.BLL
|
||||
#endregion
|
||||
|
||||
#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
|
||||
|
||||
@ -14,30 +14,32 @@ namespace Epost.BLL
|
||||
WmsTaskBLL taskbll = new WmsTaskBLL();
|
||||
public DataTable GetSkuInfoList(string sku)
|
||||
{
|
||||
//if (sku.Substring(0, 1) == "2")
|
||||
//{
|
||||
// if (sku.Substring(1, 1) == "5")
|
||||
// {
|
||||
// if (sku.Length >= 7)
|
||||
// {
|
||||
// sku = sku.Substring(2, 6);
|
||||
// }
|
||||
// }
|
||||
// else {
|
||||
// if (sku.Length >= 7)
|
||||
// {
|
||||
// sku = sku.Substring(1, 6);
|
||||
// }
|
||||
// }
|
||||
// return dal.GetSkuInfo(sku);
|
||||
//}
|
||||
//else {
|
||||
if (sku.Substring(0, 1) == "2")
|
||||
{
|
||||
if (sku.Substring(1, 1) == "5")
|
||||
{
|
||||
if (sku.Length >= 7)
|
||||
{
|
||||
sku = sku.Substring(2, 6);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (sku.Length >= 7)
|
||||
{
|
||||
sku = sku.Substring(1, 6);
|
||||
}
|
||||
}
|
||||
return dal.GetSkuInfo(sku);
|
||||
}
|
||||
else
|
||||
{
|
||||
return dal.GetSkuInfoList(sku);
|
||||
// }
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -6,7 +6,8 @@ using Epost.Model.resource;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Linq;
|
||||
using System.Linq;
|
||||
using System.Runtime.InteropServices.WindowsRuntime;
|
||||
using System.Threading;
|
||||
|
||||
|
||||
@ -99,16 +100,48 @@ namespace Epost.BLL
|
||||
showmodel.Area = shelfid;
|
||||
showmodel.Block = nblock;
|
||||
showmodel.Color = queueDT.Rows[0]["lightcolor"].ToString();//EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||
showmodel.Contents = queueDT.Rows[0]["sku"].ToString();
|
||||
showmodel.Title = queueDT.Rows[0]["Shopid"].ToString();
|
||||
showmodel.Islock = true;
|
||||
|
||||
showmodel.Islock = true;
|
||||
showmodel.IsTwinkle = 0;
|
||||
showmodel.Type = 8;
|
||||
DataTable sudt = orderbll.GetSumList("", queueDT.Rows[0]["sku"].ToString(), nblock);
|
||||
if (sudt != null && sudt.Rows.Count > 0)
|
||||
{
|
||||
showmodel.Qty = sudt.Rows[0]["SumQuantity"].ToString();
|
||||
|
||||
DataTable skudt = orderbll.GetSumList(queueDT.Rows[0]["matchid"].ToString(), queueDT.Rows[0]["sku"].ToString(), nblock, shelfid);
|
||||
|
||||
if (queueDT.Rows[0]["lightcolor"].ToString() == "1")
|
||||
{
|
||||
showmodel.Islock = false;
|
||||
}
|
||||
else if (queueDT.Rows[0]["lightcolor"].ToString() == EnumHelper.EMToDescriptionString(LightColor.Color.Blue))
|
||||
{
|
||||
//复核显示
|
||||
skudt = orderbll.GetSumList_Echo(queueDT.Rows[0]["matchid"].ToString(), queueDT.Rows[0]["sku"].ToString(), nblock, shelfid);
|
||||
showmodel.Title = "回显:"+queueDT.Rows[0]["Shopid"].ToString();
|
||||
}
|
||||
|
||||
if (skudt != null && skudt.Rows.Count > 0)
|
||||
{
|
||||
showmodel.Qty = skudt.Rows[0]["SumQuantity"].ToString();
|
||||
int discount = Convert.ToInt32(skudt.Rows[0]["discount"].ToString());
|
||||
//整件总数
|
||||
int SumCkQuantity = 0;//= Convert.ToInt32(skudt.Rows[0]["SumCkQuantity"].ToString());
|
||||
//散件总数
|
||||
int SumQuantity = Convert.ToInt32(skudt.Rows[0]["SumQuantity"].ToString());
|
||||
int zcount = Convert.ToInt32(skudt.Rows[0]["SumQuantity"].ToString());
|
||||
if (discount != 1)
|
||||
{
|
||||
if (SumQuantity >= discount)
|
||||
{
|
||||
|
||||
SumCkQuantity = SumQuantity / discount;
|
||||
SumQuantity = SumQuantity % discount;
|
||||
}
|
||||
}
|
||||
//showmodel.Qty = SumQuantity.ToString();
|
||||
//showmodel.Wholeqty = SumCkQuantity;
|
||||
//showmodel.Unit = "件";
|
||||
//showmodel.Wholeunit = "箱";
|
||||
showmodel.Qty = "0";
|
||||
showmodel.Contents = queueDT.Rows[0]["sku"].ToString() + "\r规格： " + discount + " \r总数量:" + zcount+"("+ SumCkQuantity + "箱"+ SumQuantity+"件)";
|
||||
}
|
||||
comBLL.ShowBoxMessage_M(showmodel);//点亮显示标签
|
||||
#endregion
|
||||
|
||||
@ -172,11 +172,14 @@ namespace Epost.BLL
|
||||
LogHelper.WriteLogInfo("=======" + qmodel.UserCode + "=====" + area + "区===sku=" + skulist);
|
||||
}
|
||||
|
||||
if (data.Loc == "check")//任意回显标签拍下 熄灭回显设备
|
||||
if (type == "8")// 订单显示器熄灭回显设备
|
||||
{
|
||||
List<JobModel> rejob = jobList.FindAll(m => m.Block == block && m.Area == area && m.State == 1 && m.Sku == queueDT.Rows[0]["sku"].ToString());
|
||||
LogHelper.WriteLogInfo("显示器拍下");
|
||||
List<JobModel> rejob = jobList.FindAll(m => m.Block == block && m.Area == area && m.State == 1 && m.Sku == queueDT.Rows[0]["sku"].ToString()&&m.ColorCode=="1");
|
||||
|
||||
if (rejob.Any())
|
||||
{
|
||||
LogHelper.WriteLogInfo("显示器拍下=="+rejob.Count);
|
||||
JobModel model = rejob.FirstOrDefault();
|
||||
comBLL.ClearArea_M(rejob);
|
||||
//熄灭通道灯
|
||||
@ -245,7 +248,7 @@ namespace Epost.BLL
|
||||
//修改订单状态
|
||||
orderbll.UpdateOrderState_Car(downlist, model, truequantity, checkquantity);
|
||||
LogHelper.WriteLogInfo(data.Address + "=========------------------" + data.Parameter);
|
||||
bool skuInish = orderbll.IsFinishWork(1, block, "", area, model.Sku);
|
||||
bool skuInish = orderbll.IsFinishWork(1, block, "", area, model.Sku,"", model.Matchid);
|
||||
model.State = 3;
|
||||
if (skuInish)
|
||||
{
|
||||
@ -269,6 +272,7 @@ namespace Epost.BLL
|
||||
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Green);
|
||||
show.Type = 8;
|
||||
show.Block = block;
|
||||
show.Area = area;
|
||||
show.Islock = false;
|
||||
show.IsTwinkle = 1;
|
||||
comBLL.ShowBoxMessage_M(show);
|
||||
@ -285,44 +289,51 @@ namespace Epost.BLL
|
||||
queueBLL.UpdateQueueTaskArea_Car(qumodel);
|
||||
#endregion
|
||||
|
||||
#region 刷新波次信息
|
||||
// showSummaryMes(model.Sku, block, area, Convert.ToInt32(block), null, model.Tolocation, model.Matchid);
|
||||
#endregion
|
||||
|
||||
|
||||
Thread.Sleep(30);
|
||||
#region 整条通道当前用户所有任务分播结束
|
||||
bool blockfinish = orderbll.IsFinishWorkByCar(1, model.Matchid, block);
|
||||
if (blockfinish)
|
||||
{
|
||||
#region 点亮显示器
|
||||
|
||||
show.Title = "当前波次分播完成";
|
||||
show.Contents = "拍下熄灭所有设备\r请扫描继续作业";
|
||||
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Green);
|
||||
show.Qty = "0";
|
||||
show.Type = 8;
|
||||
show.Block = block;
|
||||
show.Islock = false;
|
||||
show.IsTwinkle = 1;
|
||||
|
||||
comBLL.ShowBoxMessage_M(show);
|
||||
#endregion
|
||||
//bool blockfinish = orderbll.IsFinishWorkByCar(1, model.Matchid, block);
|
||||
//if (blockfinish)
|
||||
//{
|
||||
// #region 点亮显示器
|
||||
|
||||
bool allfinish = orderbll.IsFinishWorkByCar(1, model.Matchid);
|
||||
if (allfinish)//判断整个波次是否已完成
|
||||
{ //更新state状态为已完成
|
||||
orderbll.UpdateStateByCar(model.Matchid);
|
||||
}
|
||||
//删除波次信息
|
||||
List<UserCodeModel> ulist = UserCacheDAL.GetUserCodeList().FindAll(m => m.Block == block);
|
||||
UserCacheDAL.UpdateUserCodeList(ulist, EUserCommend.Execute);
|
||||
// show.Title = "当前波次分播完成";
|
||||
// show.Contents = "拍下熄灭所有设备\r请扫描继续作业";
|
||||
// show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Green);
|
||||
// show.Qty = "0";
|
||||
// show.Type = 8;
|
||||
// show.Block = block;
|
||||
// show.Islock = false;
|
||||
// show.IsTwinkle = 1;
|
||||
|
||||
}
|
||||
// comBLL.ShowBoxMessage_M(show);
|
||||
// #endregion
|
||||
|
||||
// bool allfinish = orderbll.IsFinishWorkByCar(1, model.Matchid);
|
||||
// if (allfinish)//判断整个波次是否已完成
|
||||
// { //更新state状态为已完成
|
||||
// orderbll.UpdateStateByCar(model.Matchid);
|
||||
// }
|
||||
// //删除波次信息
|
||||
// List<UserCodeModel> ulist = UserCacheDAL.GetUserCodeList().FindAll(m => m.Block == block);
|
||||
// UserCacheDAL.UpdateUserCodeList(ulist, EUserCommend.Execute);
|
||||
|
||||
//}
|
||||
#endregion
|
||||
|
||||
#region 区内sku播完回传
|
||||
// orderbll.UpdateStateByCar(model.Matchid, "", model.Sku);
|
||||
|
||||
#region sku播完回传
|
||||
bool skubo = orderbll.IsSkuFinishWork(model.Sku, model.Matchid);
|
||||
if (skubo)
|
||||
{
|
||||
LogHelper.WriteLogInfo(model.Sku + "Sku播种完成" + model.Matchid);
|
||||
// orderbll.UpdateStateByCar(model.Matchid, model.Sku);
|
||||
bool matchbo= orderbll.IsSkuFinishWork("", model.Matchid);
|
||||
if (matchbo) {
|
||||
LogHelper.WriteLogInfo("波次播种完成" + model.Matchid);
|
||||
orderbll.UpdateStateBymatchid(model.Matchid);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 清除当前区已做完的sku
|
||||
@ -338,68 +349,7 @@ namespace Epost.BLL
|
||||
#endregion
|
||||
|
||||
|
||||
|
||||
#region 处理扫描条码
|
||||
public ResultModel BindJobList(ResultMessageModel data)
|
||||
{
|
||||
ResultModel res = new ResultModel();
|
||||
res.result = "0";
|
||||
try
|
||||
{
|
||||
string sblock = data.Block;
|
||||
string scanStr = data.Parameter.Trim();
|
||||
string sarea = data.Area;
|
||||
string name = string.Empty;
|
||||
string matchid = string.Empty;
|
||||
#region 提示请扫描波次号
|
||||
List<UserCodeModel> ulist = UserCacheDAL.GetUserCodeList().FindAll(m => m.Block == sblock && m.Area == sarea);//
|
||||
bool isnum = ConvertHexHelper.IsNum(scanStr.Substring(0, 1));//判断扫描首字母是否是数字
|
||||
|
||||
if (!ulist.Any())
|
||||
{
|
||||
//手动加波次信息
|
||||
DataTable matdt = orderbll.GetMatchOrderList();
|
||||
if (matdt != null && matdt.Rows.Count > 0)
|
||||
{
|
||||
UserCodeModel umodel = new UserCodeModel();
|
||||
umodel.Matchid = matdt.Rows[0]["matchid"].ToString();
|
||||
umodel.Block = sblock;
|
||||
umodel.Area = sarea;
|
||||
UserCacheDAL.UpdateUserCodeList(new List<UserCodeModel> { umodel }, EUserCommend.Create);
|
||||
}
|
||||
}
|
||||
ulist = UserCacheDAL.GetUserCodeList().FindAll(m => m.Block == sblock && m.Area == sarea);
|
||||
if (ulist.Any())
|
||||
{ matchid = ulist.FirstOrDefault().Matchid; }
|
||||
|
||||
#endregion
|
||||
if (data.Type == "5")//中分扫描枪
|
||||
{
|
||||
|
||||
zhongfenBind(ulist, scanStr, data);
|
||||
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
|
||||
}
|
||||
else if (data.Type == "6")//播种扫描枪
|
||||
{
|
||||
|
||||
xifenBind(ulist, scanStr, data, matchid, isnum);
|
||||
|
||||
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
|
||||
}
|
||||
|
||||
|
||||
return res;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
res.result = "-1";
|
||||
res.msg = "绑定任务异常";
|
||||
LogHelper.WriteLogInfo("绑定任务异常：" + ex.Message);
|
||||
return res;
|
||||
}
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region 中分
|
||||
|
||||
@ -502,7 +452,7 @@ namespace Epost.BLL
|
||||
else
|
||||
{
|
||||
ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
show.Title = "SKU" + scanStr + "无任务！";
|
||||
show.Title = "SKU" + scanStr + "未完纳！";
|
||||
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||
show.Block = item.block;
|
||||
show.Islock = true;
|
||||
@ -520,308 +470,8 @@ namespace Epost.BLL
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 细分播种
|
||||
public void xifenBind(List<UserCodeModel> ulist, string scanStr, ResultMessageModel data, string matchid, bool isnum)
|
||||
{
|
||||
//if (ulist.Any())
|
||||
//{
|
||||
// UserCodeModel usermodel = ulist.FirstOrDefault();
|
||||
//if (string.IsNullOrEmpty(usermodel.UserCode) && scanStr.Substring(0, 1) != "U")//
|
||||
//{
|
||||
// #region 提示先扫描工号
|
||||
// ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
// show.Title = "请先扫描工号！";
|
||||
// show.Contents = "";
|
||||
// show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||
// show.Block = sblock;
|
||||
// show.Area = sarea;
|
||||
// show.Type = 8;
|
||||
// show.Islock = true;
|
||||
// comBLL.ShowBoxMessage_M(show);
|
||||
// downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
|
||||
// #endregion
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
|
||||
if (scanStr.Substring(0, 1) == "U")
|
||||
{
|
||||
#region 扫描工号
|
||||
if (ulist.Any())
|
||||
{
|
||||
UserCodeModel umodel = ulist.FirstOrDefault();
|
||||
umodel.UserCode = scanStr;
|
||||
#region 扫描工号
|
||||
ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
show.Title = "请扫描sku开始作业！";
|
||||
show.Contents = "";
|
||||
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||
show.Block = data.Block;
|
||||
show.Area = data.Area;
|
||||
show.Type = 8;
|
||||
show.Islock = true;
|
||||
|
||||
comBLL.ShowBoxMessage_M(show);
|
||||
#endregion
|
||||
}
|
||||
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
|
||||
#endregion
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
#region 扫描商品
|
||||
|
||||
List<ResultMessageModel> hangList = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Parameter == "888888");
|
||||
|
||||
if (hangList.Any())
|
||||
{
|
||||
|
||||
#region 挂起
|
||||
LogHelper.WriteLogInfo("挂起" + data.Parameter + "-------通道" + data.Block);
|
||||
LabelParamModel FORMATEModel = new LabelParamModel();
|
||||
FORMATEModel.ControlIP = data.IP;
|
||||
comBLL.FORMATE_JOB_DATA(FORMATEModel);
|
||||
|
||||
|
||||
DataTable qdt = queueBLL.getQueuesOrderbyState(data.Block, data.Area, "1");
|
||||
if (qdt != null && qdt.Rows.Count > 0)
|
||||
{
|
||||
scanStr = qdt.Rows[0]["sku"].ToString();
|
||||
|
||||
// data.Parameter = scanStr;
|
||||
Hangup_SKU(scanStr, data.Block, data.Area);
|
||||
//删除sku对应缓存
|
||||
List<ResultMessageModel> sdown = downCacheDAL.GetPlanJobDownList().FindAll(p => p.Parameter == scanStr || p.Parameter == qdt.Rows[0]["location"].ToString());
|
||||
downCacheDAL.UpdateJobDownModelList(sdown, EdownCommend.Execute);
|
||||
}
|
||||
downCacheDAL.UpdateJobDownModelList(hangList, EdownCommend.Execute);
|
||||
//刷新波次
|
||||
GetMatchOrder();
|
||||
#endregion
|
||||
|
||||
}
|
||||
else if (isnum)//sku
|
||||
{
|
||||
#region 扫描SKU
|
||||
//根据扫描商品内码获取商品码
|
||||
data.ScanCode = data.Parameter;
|
||||
DataTable sinfodt = skuBLL.GetSkuInfoList(data.Parameter);
|
||||
string location = string.Empty;
|
||||
if (sinfodt != null && sinfodt.Rows.Count > 0)
|
||||
{
|
||||
scanStr = sinfodt.Rows[0]["sku"].ToString();
|
||||
location = data.Parameter;// sinfodt.Rows[0]["tolocation"].ToString();
|
||||
}
|
||||
data.Parameter = scanStr;
|
||||
DataTable skudt = queueBLL.GetOrderQueue(data.Block, data.Area, "3");
|
||||
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))
|
||||
{ //重复扫描
|
||||
//ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
//show.Title = scanStr + "重复扫描/已拣配！";
|
||||
//show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||
//show.Block = sblock;
|
||||
//show.Area = sarea;
|
||||
//show.Type = 8;
|
||||
//comBLL.ShowBoxMessage_M(show);
|
||||
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)
|
||||
{
|
||||
|
||||
if (ulist.Any())
|
||||
{
|
||||
UserCodeModel umodel = ulist.FirstOrDefault();
|
||||
data.Port = OrderDt.Rows[0]["matchid"].ToString();
|
||||
OrdersQueueModel qmodel = new OrdersQueueModel();
|
||||
qmodel.Sku = scanStr;
|
||||
qmodel.Taskblock = data.Block;
|
||||
qmodel.Taskarea = data.Area;
|
||||
qmodel.UserCode = umodel.UserCode;
|
||||
qmodel.Matchid = umodel.Matchid;
|
||||
qmodel.Location = location;
|
||||
qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||
queueBLL.insertQueueOrders(qmodel);
|
||||
//提示需要拣货总量/商品名称
|
||||
showSummaryMes(scanStr, data.Block, data.Area, 1, data, "", OrderDt.Rows[0]["matchid"].ToString());
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
LogHelper.WriteLogInfo("未扫描波次信息", LogHelper.Log_Type.ERROR);
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
#region 回显
|
||||
DataTable echoDt = orderbll.GetOrderList_echo(matchid, scanStr, data.Area, data.Block);
|
||||
if (echoDt != null && echoDt.Rows.Count > 0)
|
||||
{
|
||||
|
||||
if (ulist.Any())
|
||||
{
|
||||
UserCodeModel umodel = ulist.FirstOrDefault();
|
||||
data.Port = echoDt.Rows[0]["matchid"].ToString();
|
||||
OrdersQueueModel qmodel = new OrdersQueueModel();
|
||||
qmodel.Sku = scanStr;
|
||||
qmodel.Taskblock = data.Block;
|
||||
qmodel.Taskarea = data.Area;
|
||||
qmodel.UserCode = umodel.UserCode;
|
||||
qmodel.Matchid = umodel.Matchid;
|
||||
// qmodel.Location = location;
|
||||
qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Blue);
|
||||
queueBLL.insertQueueOrders(qmodel);
|
||||
//提示需要拣货总量/商品名称
|
||||
Mes_Echo(scanStr, data.Block, data.Area, 1, data, "", echoDt.Rows[0]["matchid"].ToString(), false);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
LogHelper.WriteLogInfo("未扫描波次信息", LogHelper.Log_Type.ERROR);
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
//提示无任务
|
||||
ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
show.Title = "商品：" + scanStr + "当前区无任务！";
|
||||
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||
show.Block = data.Block;
|
||||
show.Area = data.Area;
|
||||
show.Type = 8;
|
||||
show.Islock = false;
|
||||
comBLL.ShowBoxMessage_M(show);
|
||||
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
|
||||
}
|
||||
#endregion
|
||||
#region 复核显示
|
||||
public void Mes_Echo(string scanStr, string sblock, string sarea, int type, ResultMessageModel data = null, string location = "", string matchid = "", bool islock = true)
|
||||
{
|
||||
|
||||
DataTable sudt = orderbll.GetSumList_Echo("", scanStr, sblock);
|
||||
if (type == 2)
|
||||
{
|
||||
sudt = orderbll.GetSumList_Echo("", scanStr, sblock, sarea);
|
||||
}
|
||||
//查询当前区任务队列
|
||||
DataTable qdt = queueBLL.getQueuesOrderbyState(sblock, sarea, "1");
|
||||
if (sudt != null && sudt.Rows.Count > 0)
|
||||
{
|
||||
matchid = sudt.Rows[0]["matchid"].ToString();
|
||||
string sku = string.Empty;
|
||||
string qty = string.Empty;
|
||||
string color = string.Empty;
|
||||
if (qdt != null && qdt.Rows.Count > 0)
|
||||
{
|
||||
sku = qdt.Rows[0]["sku"].ToString();
|
||||
qty = sudt.Rows[0]["SumQuantity"].ToString();
|
||||
color = qdt.Rows[0]["LightColor"].ToString();
|
||||
}
|
||||
|
||||
//规格
|
||||
int discount = Convert.ToInt32(sudt.Rows[0]["discount"].ToString());
|
||||
//整件总数
|
||||
int SumCkQuantity = 0;// Convert.ToInt32(sudt.Rows[0]["SumCkQuantity"].ToString());
|
||||
//散件总数
|
||||
int SumQuantity = Convert.ToInt32(sudt.Rows[0]["SumQuantity"].ToString());
|
||||
//if (discount != 1)
|
||||
//{
|
||||
// if (SumQuantity >= discount)
|
||||
// {
|
||||
|
||||
// SumCkQuantity = SumQuantity / discount;
|
||||
// SumQuantity = SumQuantity % discount;
|
||||
// }
|
||||
//}
|
||||
|
||||
|
||||
ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
show.Title = sudt.Rows[0]["goodsname"].ToString();
|
||||
string mes = "复核显示";
|
||||
islock = false;
|
||||
|
||||
if (qdt != null && qdt.Rows.Count > 0)
|
||||
{
|
||||
show.Contents = qdt.Rows[0]["location"].ToString() + "(" + scanStr + ")" + "\r" + mes;//sudt.Rows[0]["goodscode"].ToString().Replace(';','\r');
|
||||
}
|
||||
if (data != null)
|
||||
{
|
||||
|
||||
show.Contents = data.ScanCode + "(" + scanStr + ")" + "\r" + mes;
|
||||
sku = data.Parameter;
|
||||
}
|
||||
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Blue);
|
||||
show.Qty = SumQuantity.ToString();
|
||||
show.Wholeqty = SumCkQuantity;
|
||||
show.Unit = "件";
|
||||
show.Type = 8;
|
||||
show.Wholeunit = "箱";
|
||||
show.Block = sblock;
|
||||
show.Area = sarea;
|
||||
show.Islock = islock;
|
||||
show.Location = "check";
|
||||
//ShowMesModel megmodel = new ShowMesModel();
|
||||
//megmodel.Qty = sudt.Rows[0]["SumQuantity"].ToString();
|
||||
//megmodel.Sku = sku;
|
||||
//megmodel.Area = sarea;
|
||||
//megmodel.Block = sblock;
|
||||
//megmodel.Matchid = matchid;
|
||||
|
||||
// msgCache.UpdateMsgModelList(new List<ShowMesModel> { megmodel }, EmsgCommend.Create);
|
||||
comBLL.ShowBoxMessage_M(show);
|
||||
|
||||
if (data != null)
|
||||
{
|
||||
|
||||
data.Status = "1";
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
//查询当前区任务队列
|
||||
DataTable finshqdt = queueBLL.getQueuesOrderbyState(sblock, sarea, "3");
|
||||
ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
//根据sku获取商品名称
|
||||
string goodsname = orderbll.GetGoodsname(location);
|
||||
show.Title = goodsname + "分播完成";
|
||||
show.Contents = scanStr + "\r请扫描继续作业";
|
||||
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||
show.Qty = "0";
|
||||
show.Type = 8;
|
||||
show.Block = sblock;
|
||||
show.Area = sarea;
|
||||
show.Islock = true;
|
||||
comBLL.ShowBoxMessage_M(show);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
|
||||
#region 订单显示器中分提示
|
||||
/// <summary>
|
||||
@ -962,63 +612,7 @@ namespace Epost.BLL
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SKU挂起/缺货
|
||||
public void Hangup_SKU(string sku, string block, string area, ResultMessageModel data = null)
|
||||
{
|
||||
List<LabelParamModel> list = new List<LabelParamModel>();
|
||||
//查询当前通道sku是否有任务
|
||||
DataTable dt = orderbll.getOrderListBysku(block, sku);
|
||||
if (dt != null && dt.Rows.Count > 0)
|
||||
{
|
||||
// 将当前通道所有sku正在亮的设备熄灭
|
||||
foreach (DataRow item in dt.Rows)
|
||||
{
|
||||
if (item["oprationstate"].ToString() == "1")
|
||||
{
|
||||
LabelParamModel lamodel = new LabelParamModel();
|
||||
lamodel.Address = item["address"].ToString(); ;
|
||||
lamodel.ControlIP = item["ControlIP"].ToString();
|
||||
lamodel.Command = "REMOVE_JOB";
|
||||
lamodel.Parameter = "01";
|
||||
list.Add(lamodel);
|
||||
orderbll.UpOrderStateBybat(item["id"].ToString());
|
||||
}
|
||||
}
|
||||
if (list != null && list.Count > 0)
|
||||
{
|
||||
LogHelper.WriteLogInfo("挂起list——" + sku + "——————————————————：" + list.Count);
|
||||
comBLL.DISPLAY_JOBALL(list);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//删除缓存中sku记录
|
||||
List<JobModel> jobList = JobCache.GetPlanJobList();
|
||||
List<JobModel> relist = jobList.FindAll(m => m.Sku == sku && m.Block == block);
|
||||
JobModel model = new JobModel();
|
||||
if (relist.Any())
|
||||
{
|
||||
model = relist.FirstOrDefault();
|
||||
JobCache.UpdateJobModelList(relist, EcommendType.Complete);
|
||||
//删除Orderqueue中sku的记录
|
||||
bool bo = queueBLL.DelQueueOrder(sku, block);
|
||||
LogHelper.WriteLogInfo("删除queue返回" + bo);
|
||||
}
|
||||
else
|
||||
{
|
||||
ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
show.Title = "挂起商品：" + sku + "错误！";
|
||||
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||
show.Block = block;
|
||||
show.Area = area;
|
||||
show.Type = 8;
|
||||
show.Islock = true;
|
||||
comBLL.ShowBoxMessage_M(show);
|
||||
}
|
||||
//downCacheDAL.GetPlanJobDownList().FindAll(p => p.Parameter == sku && p.Block == block);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
#region 查询波次通道列表
|
||||
public void GetMatchOrder()
|
||||
|
||||
@ -5,8 +5,10 @@ using Epost.Model;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.Entity.Core.Metadata.Edm;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
@ -99,7 +101,6 @@ namespace Epost.BLL
|
||||
case "QUERY_SPECIAL_STATUS":
|
||||
BindJobList(data);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@ -128,53 +129,53 @@ namespace Epost.BLL
|
||||
ResultModel res = new ResultModel();
|
||||
res.result = "0";
|
||||
try
|
||||
{
|
||||
string sblock = data.Block;
|
||||
string scanStr = data.Parameter.Trim();
|
||||
string sarea = data.Area;
|
||||
string name = string.Empty;
|
||||
string matchid = string.Empty;
|
||||
#region 提示请扫描波次号
|
||||
List<UserCodeModel> ulist = UserCacheDAL.GetUserCodeList().FindAll(m => m.Block == sblock && m.Area == sarea);//
|
||||
bool isnum = ConvertHexHelper.IsNum(scanStr.Substring(0, 1));//判断扫描首字母是否是数字
|
||||
{
|
||||
string sblock = data.Block;
|
||||
string scanStr = data.Parameter.Trim();
|
||||
string sarea = data.Area;
|
||||
string name = string.Empty;
|
||||
string matchid = string.Empty;
|
||||
#region 提示请扫描波次号
|
||||
List<UserCodeModel> ulist = UserCacheDAL.GetUserCodeList().FindAll(m => m.Block == sblock && m.Area == sarea);//
|
||||
bool isnum = ConvertHexHelper.IsNum(scanStr.Substring(0, 1));//判断扫描首字母是否是数字
|
||||
|
||||
if (!ulist.Any())
|
||||
if (!ulist.Any())
|
||||
{
|
||||
//手动加波次信息
|
||||
DataTable matdt = orderbll.GetMatchOrderList();
|
||||
if (matdt != null && matdt.Rows.Count > 0)
|
||||
{
|
||||
//手动加波次信息
|
||||
DataTable matdt = orderbll.GetMatchOrderList();
|
||||
if (matdt != null && matdt.Rows.Count > 0)
|
||||
{
|
||||
UserCodeModel umodel = new UserCodeModel();
|
||||
umodel.Matchid = matdt.Rows[0]["matchid"].ToString();
|
||||
umodel.Block = sblock;
|
||||
umodel.Area = sarea;
|
||||
UserCacheDAL.UpdateUserCodeList(new List<UserCodeModel> { umodel }, EUserCommend.Create);
|
||||
}
|
||||
UserCodeModel umodel = new UserCodeModel();
|
||||
umodel.Matchid = matdt.Rows[0]["matchid"].ToString();
|
||||
umodel.Block = sblock;
|
||||
umodel.Area = sarea;
|
||||
UserCacheDAL.UpdateUserCodeList(new List<UserCodeModel> { umodel }, EUserCommend.Create);
|
||||
}
|
||||
ulist = UserCacheDAL.GetUserCodeList().FindAll(m => m.Block == sblock && m.Area == sarea);
|
||||
if (ulist.Any())
|
||||
{ matchid = ulist.FirstOrDefault().Matchid; }
|
||||
}
|
||||
ulist = UserCacheDAL.GetUserCodeList().FindAll(m => m.Block == sblock && m.Area == sarea);
|
||||
if (ulist.Any())
|
||||
{ matchid = ulist.FirstOrDefault().Matchid; }
|
||||
|
||||
#endregion
|
||||
if (data.Type == "5")//中分扫描枪
|
||||
{
|
||||
#endregion
|
||||
if (data.Type == "5")//中分扫描枪
|
||||
{
|
||||
|
||||
zhongfenBind(ulist, scanStr, data);
|
||||
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
|
||||
}
|
||||
else if (data.Type == "6")//播种扫描枪
|
||||
{
|
||||
zhongfenBind(ulist, scanStr, data);
|
||||
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
|
||||
}
|
||||
else if (data.Type == "6")//播种扫描枪
|
||||
{
|
||||
|
||||
xifenBind(ulist, scanStr, data, matchid, isnum);
|
||||
xifenBind(ulist, scanStr, data, matchid, isnum);
|
||||
|
||||
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
|
||||
}
|
||||
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
|
||||
}
|
||||
|
||||
|
||||
return res;
|
||||
return res;
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -211,7 +212,7 @@ namespace Epost.BLL
|
||||
//}
|
||||
//else {
|
||||
|
||||
if (scanStr.Substring(0, 1) == "U")
|
||||
if (scanStr.Substring(0, 1) == "Y")
|
||||
{
|
||||
#region 扫描工号
|
||||
if (ulist.Any())
|
||||
@ -226,7 +227,7 @@ namespace Epost.BLL
|
||||
show.Block = data.Block;
|
||||
show.Area = data.Area;
|
||||
show.Type = 2;
|
||||
show.Islock = true;
|
||||
show.Islock = false;
|
||||
comBLL.ShowBoxMessage_M(show);
|
||||
#endregion
|
||||
}
|
||||
@ -245,51 +246,58 @@ namespace Epost.BLL
|
||||
// location = data.Parameter;// sinfodt.Rows[0]["tolocation"].ToString();
|
||||
}
|
||||
LogHelper.WriteLogInfo("中分" + data.Parameter + "===SKU" + scanStr);
|
||||
DataTable skudt = orderbll.GetSumList("", scanStr, data.Block);
|
||||
if (skudt != null && skudt.Rows.Count > 0)
|
||||
List<AddressstorageModel> Arealist = addrBLL.GetAreaList(data.Block);
|
||||
if (Arealist.Any())
|
||||
{
|
||||
//规格
|
||||
int discount = Convert.ToInt32(skudt.Rows[0]["discount"].ToString());
|
||||
//整件总数
|
||||
int SumCkQuantity = 0;//= Convert.ToInt32(skudt.Rows[0]["SumCkQuantity"].ToString());
|
||||
//散件总数
|
||||
int SumQuantity = Convert.ToInt32(skudt.Rows[0]["SumQuantity"].ToString());
|
||||
if (discount != 1)
|
||||
foreach (AddressstorageModel item in Arealist)
|
||||
{
|
||||
if (SumQuantity >= discount)
|
||||
DataTable skudt = orderbll.GetSumList("", scanStr, item.block, item.area);
|
||||
if (skudt != null && skudt.Rows.Count > 0)
|
||||
{
|
||||
//规格
|
||||
int discount = Convert.ToInt32(skudt.Rows[0]["discount"].ToString());
|
||||
//整件总数
|
||||
int SumCkQuantity = 0;//= Convert.ToInt32(skudt.Rows[0]["SumCkQuantity"].ToString());
|
||||
//散件总数
|
||||
int SumQuantity = Convert.ToInt32(skudt.Rows[0]["SumQuantity"].ToString());
|
||||
int zcount = Convert.ToInt32(skudt.Rows[0]["SumQuantity"].ToString());
|
||||
if (discount != 1)
|
||||
{
|
||||
if (SumQuantity >= discount)
|
||||
{
|
||||
|
||||
SumCkQuantity = SumQuantity / discount;
|
||||
SumQuantity = SumQuantity % discount;
|
||||
SumCkQuantity = SumQuantity / discount;
|
||||
SumQuantity = SumQuantity % discount;
|
||||
}
|
||||
}
|
||||
ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
show.Title = skudt.Rows[0]["goodsname"].ToString();
|
||||
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||
show.Block = item.block;
|
||||
show.Islock = true;
|
||||
show.Contents = data.Parameter + "(" + scanStr + ")\r规格：" + discount + " \r总数量:" + zcount + "(" + SumCkQuantity + "箱" + SumQuantity + "件)";
|
||||
// show.Qty = SumQuantity.ToString();
|
||||
//show.Wholeqty = SumCkQuantity;
|
||||
// show.Unit = "件";
|
||||
// show.Wholeunit = "箱";
|
||||
|
||||
show.Type = 2;
|
||||
comBLL.ShowBoxMessage_M(show);
|
||||
}
|
||||
else
|
||||
{
|
||||
ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
show.Title = "SKU" + scanStr + "无任务！";
|
||||
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||
show.Block = item.block;
|
||||
show.Islock = true;
|
||||
show.Contents = "请扫描其他商品！";
|
||||
show.Type = 2;
|
||||
comBLL.ShowBoxMessage_M(show);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
show.Title = skudt.Rows[0]["goodsname"].ToString();
|
||||
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||
show.Block = data.Block;
|
||||
show.Islock = true;
|
||||
show.Contents = data.Parameter + "(" + scanStr + ")\r" + "规格：" + discount;
|
||||
show.Qty = SumQuantity.ToString();
|
||||
show.Wholeqty = SumCkQuantity;
|
||||
show.Unit = "件";
|
||||
show.Wholeunit = "箱";
|
||||
show.Type = 2;
|
||||
comBLL.ShowBoxMessage_M(show);
|
||||
}
|
||||
else
|
||||
{
|
||||
ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
show.Title = "SKU" + scanStr + "无任务！";
|
||||
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||
show.Block = data.Block;
|
||||
show.Islock = true;
|
||||
show.Contents = "请扫描其他商品！";
|
||||
show.Type = 2;
|
||||
comBLL.ShowBoxMessage_M(show);
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
@ -321,97 +329,94 @@ namespace Epost.BLL
|
||||
//else
|
||||
//{
|
||||
|
||||
if (scanStr.Substring(0, 1) == "U")
|
||||
|
||||
#region 扫描商品
|
||||
|
||||
List<ResultMessageModel> hangList = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Parameter == "888888");
|
||||
|
||||
if (hangList.Any())
|
||||
{
|
||||
#region 扫描工号
|
||||
if (ulist.Any())
|
||||
|
||||
#region 挂起
|
||||
LogHelper.WriteLogInfo("挂起" + data.Parameter + "-------通道" + data.Block);
|
||||
// LabelParamModel FORMATEModel = new LabelParamModel();
|
||||
// FORMATEModel.ControlIP = data.IP;
|
||||
// comBLL.FORMATE_JOB_DATA(FORMATEModel);
|
||||
DataTable qdt = queueBLL.getQueuesOrderbyState(data.Block, data.Area, "1");
|
||||
if (qdt != null && qdt.Rows.Count > 0)
|
||||
{
|
||||
UserCodeModel umodel = ulist.FirstOrDefault();
|
||||
umodel.UserCode = scanStr;
|
||||
#region 扫描工号
|
||||
scanStr = qdt.Rows[0]["sku"].ToString();
|
||||
ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
show.Title = "请扫描sku开始作业！";
|
||||
show.Contents = "";
|
||||
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||
show.Block = data.Block;
|
||||
show.Area = data.Area;
|
||||
show.Type = 8;
|
||||
show.Islock = true;
|
||||
comBLL.ShowBoxMessage_M(show);
|
||||
#endregion
|
||||
comBLL.RemoveBoxMessage_M(show);
|
||||
// data.Parameter = scanStr;
|
||||
Hangup_SKU(scanStr, data.Block, data.Area, matchid);
|
||||
//删除sku对应缓存
|
||||
List<ResultMessageModel> sdown = downCacheDAL.GetPlanJobDownList().FindAll(p => p.Parameter == scanStr && p.Parameter == qdt.Rows[0]["sku"].ToString() && p.Block == data.Block && p.Area == data.Area);
|
||||
downCacheDAL.UpdateJobDownModelList(sdown, EdownCommend.Execute);
|
||||
}
|
||||
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
|
||||
downCacheDAL.UpdateJobDownModelList(hangList, EdownCommend.Execute);
|
||||
|
||||
#endregion
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
DataTable skudt = queueBLL.GetOrderQueue(data.Block, data.Area, "3");
|
||||
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);
|
||||
|
||||
#region 扫描商品
|
||||
|
||||
List<ResultMessageModel> hangList = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Parameter == "888888");
|
||||
|
||||
if (hangList.Any())
|
||||
{
|
||||
|
||||
#region 挂起
|
||||
LogHelper.WriteLogInfo("挂起" + data.Parameter + "-------通道" + data.Block);
|
||||
// LabelParamModel FORMATEModel = new LabelParamModel();
|
||||
// FORMATEModel.ControlIP = data.IP;
|
||||
// comBLL.FORMATE_JOB_DATA(FORMATEModel);
|
||||
|
||||
|
||||
DataTable qdt = queueBLL.getQueuesOrderbyState(data.Block, data.Area, "1");
|
||||
if (qdt != null && qdt.Rows.Count > 0)
|
||||
{
|
||||
scanStr = qdt.Rows[0]["sku"].ToString();
|
||||
ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
show.Block = data.Block;
|
||||
show.Area = data.Area;
|
||||
show.Type = 8;
|
||||
|
||||
comBLL.RemoveBoxMessage_M(show);
|
||||
// data.Parameter = scanStr;
|
||||
Hangup_SKU(scanStr, data.Block, data.Area);
|
||||
//删除sku对应缓存
|
||||
List<ResultMessageModel> sdown = downCacheDAL.GetPlanJobDownList().FindAll(p => p.Parameter == scanStr && p.Parameter == qdt.Rows[0]["sku"].ToString()&&p.Block == data.Block);
|
||||
downCacheDAL.UpdateJobDownModelList(sdown, EdownCommend.Execute);
|
||||
}
|
||||
downCacheDAL.UpdateJobDownModelList(hangList, EdownCommend.Execute);
|
||||
|
||||
#endregion
|
||||
if (scanlist.Count > 1 || (skudt != null && skudt.Rows.Count > 0))
|
||||
{ //重复扫描
|
||||
//ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
//show.Title = scanStr + "重复扫描/已拣配！";
|
||||
//show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||
//show.Block = sblock;
|
||||
//show.Area = sarea;
|
||||
//show.Type = 8;
|
||||
//comBLL.ShowBoxMessage_M(show);
|
||||
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
|
||||
|
||||
}
|
||||
else if (isnum)//sku
|
||||
else
|
||||
{
|
||||
#region 扫描SKU
|
||||
//根据扫描商品内码获取商品码
|
||||
data.ScanCode = data.Parameter;
|
||||
DataTable sinfodt = skuBLL.GetSkuInfoList(data.Parameter);
|
||||
string location = string.Empty;
|
||||
if (sinfodt != null && sinfodt.Rows.Count > 0)
|
||||
if (scanStr.Substring(0, 1) == "Y")
|
||||
{
|
||||
scanStr = sinfodt.Rows[0]["sku"].ToString();
|
||||
location = data.Parameter;// sinfodt.Rows[0]["tolocation"].ToString();
|
||||
}
|
||||
data.Parameter = scanStr;
|
||||
DataTable skudt = queueBLL.GetOrderQueue(data.Block, data.Area, "3");
|
||||
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))
|
||||
{ //重复扫描
|
||||
//ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
//show.Title = scanStr + "重复扫描/已拣配！";
|
||||
//show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||
//show.Block = sblock;
|
||||
//show.Area = sarea;
|
||||
//show.Type = 8;
|
||||
//comBLL.ShowBoxMessage_M(show);
|
||||
#region 扫描工号
|
||||
if (ulist.Any())
|
||||
{
|
||||
UserCodeModel umodel = ulist.FirstOrDefault();
|
||||
umodel.UserCode = scanStr;
|
||||
#region 扫描工号
|
||||
ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
show.Title = "请扫描sku开始作业！";
|
||||
show.Contents = "";
|
||||
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||
show.Block = data.Block;
|
||||
show.Area = data.Area;
|
||||
show.Type = 8;
|
||||
show.Islock = true;
|
||||
comBLL.ShowBoxMessage_M(show);
|
||||
#endregion
|
||||
}
|
||||
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
|
||||
|
||||
#endregion
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
else if (isnum)//sku
|
||||
{
|
||||
#region 扫描SKU
|
||||
//根据扫描商品内码获取商品码
|
||||
data.ScanCode = data.Parameter;
|
||||
DataTable sinfodt = skuBLL.GetSkuInfoList(data.Parameter);
|
||||
string location = string.Empty;
|
||||
if (sinfodt != null && sinfodt.Rows.Count > 0)
|
||||
{
|
||||
scanStr = sinfodt.Rows[0]["sku"].ToString();
|
||||
location = data.Parameter;// sinfodt.Rows[0]["tolocation"].ToString();
|
||||
}
|
||||
data.Parameter = scanStr;
|
||||
DataTable OrderDt = orderbll.GetOrderList_Car(matchid, scanStr, data.Area, data.Block);
|
||||
if (OrderDt != null && OrderDt.Rows.Count > 0)
|
||||
{
|
||||
@ -430,8 +435,6 @@ namespace Epost.BLL
|
||||
qmodel.Location = location;
|
||||
qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||
queueBLL.insertQueueOrders(qmodel);
|
||||
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -458,8 +461,8 @@ namespace Epost.BLL
|
||||
qmodel.Matchid = umodel.Matchid;
|
||||
// qmodel.Location = location;
|
||||
qmodel.Shopid = echoDt.Rows[0]["GoodsName"].ToString();
|
||||
|
||||
qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Green);
|
||||
|
||||
qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Blue);
|
||||
queueBLL.insertQueueOrders(qmodel);
|
||||
|
||||
|
||||
@ -475,7 +478,7 @@ namespace Epost.BLL
|
||||
|
||||
//提示无任务
|
||||
ShowMessageModel_M show = new ShowMessageModel_M();
|
||||
show.Title = "商品：" + scanStr + "当前区无任务！";
|
||||
show.Title = "商品：" + scanStr + "无任务！";
|
||||
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||
show.Block = data.Block;
|
||||
show.Area = data.Area;
|
||||
@ -483,43 +486,52 @@ namespace Epost.BLL
|
||||
show.Islock = false;
|
||||
comBLL.ShowBoxMessage_M(show);
|
||||
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
|
||||
|
||||
#endregion
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SKU挂起/缺货
|
||||
public void Hangup_SKU(string sku, string block, string area, ResultMessageModel data = null)
|
||||
public void Hangup_SKU(string sku, string block, string area, string matchid, ResultMessageModel data = null)
|
||||
{
|
||||
List<LabelParamModel> list = new List<LabelParamModel>();
|
||||
//查询当前通道sku是否有任务
|
||||
DataTable dt = orderbll.getOrderListBysku(block, sku);
|
||||
DataTable dt = orderbll.getOrderListBysku(block, sku, area, matchid);
|
||||
//if (dt == null || dt.Rows.Count == 0)
|
||||
//{
|
||||
// dt = orderbll.getOrderHisListBysku(block, sku, area, matchid);
|
||||
// //回显挂起
|
||||
//}
|
||||
|
||||
if (dt != null && dt.Rows.Count > 0)
|
||||
{
|
||||
// 将当前通道所有sku正在亮的设备熄灭
|
||||
foreach (DataRow item in dt.Rows)
|
||||
{
|
||||
|
||||
LabelParamModel lamodel = new LabelParamModel();
|
||||
lamodel.Address = item["address"].ToString(); ;
|
||||
lamodel.ControlIP = item["ControlIP"].ToString();
|
||||
lamodel.Command = "REMOVE_JOB";
|
||||
lamodel.Parameter = "";
|
||||
lamodel.Uid = "U" + item["id"].ToString();
|
||||
lamodel.Type = "N";
|
||||
list.Add(lamodel);
|
||||
|
||||
LabelParamModel lamodel = new LabelParamModel();
|
||||
lamodel.Address = item["address"].ToString(); ;
|
||||
lamodel.ControlIP = item["ControlIP"].ToString();
|
||||
lamodel.Command = "REMOVE_JOB";
|
||||
lamodel.Parameter = "";
|
||||
lamodel.Uid = "U" + item["id"].ToString();
|
||||
lamodel.Type = "N";
|
||||
list.Add(lamodel);
|
||||
LabelParamModel Unlockmodel = new LabelParamModel();
|
||||
Unlockmodel.ControlIP = item["ControlIP"].ToString();
|
||||
Unlockmodel.Address = item["address"].ToString();
|
||||
Unlockmodel.Command = "UNLOCK";
|
||||
Unlockmodel.Type = "N";
|
||||
Unlockmodel.Parameter = "11111000";
|
||||
list.Add(Unlockmodel);
|
||||
if (item["oprationstate"].ToString() == "1")
|
||||
{
|
||||
orderbll.UpOrderStateBybat(item["id"].ToString());
|
||||
@ -535,14 +547,14 @@ namespace Epost.BLL
|
||||
|
||||
//删除缓存中sku记录
|
||||
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();
|
||||
if (relist.Any())
|
||||
{
|
||||
model = relist.FirstOrDefault();
|
||||
JobCache.UpdateJobModelList(relist, EcommendType.Complete);
|
||||
//删除Orderqueue中sku的记录
|
||||
bool bo = queueBLL.DelQueueOrder(sku, block);
|
||||
bool bo = queueBLL.DelQueueOrder(sku, block, area);
|
||||
LogHelper.WriteLogInfo("删除queue返回" + bo);
|
||||
}
|
||||
else
|
||||
|
||||
@ -142,7 +142,7 @@ namespace Epost.DAL
|
||||
DataTable dt = db.GetsqlForDT(sql);
|
||||
return dt;
|
||||
}
|
||||
#endregion
|
||||
#endregion
|
||||
#region 根据区域 查询显示箱号地址
|
||||
public DataTable getAddressByBlock(string block)
|
||||
{
|
||||
|
||||
@ -131,12 +131,12 @@ namespace Epost.DAL.Cache
|
||||
//{
|
||||
// PlanJobList.Remove(planitem);
|
||||
//}
|
||||
List<JobModel> list = PlanJobList.FindAll(p => p.Block == JobParam.FirstOrDefault().Block);
|
||||
foreach (JobModel item in list)
|
||||
{
|
||||
PlanJobList.Remove(item);
|
||||
}
|
||||
|
||||
//List<JobModel> list = PlanJobList.FindAll(p => p.Block == JobParam.FirstOrDefault().Block);
|
||||
//foreach (JobModel item in list)
|
||||
//{
|
||||
// PlanJobList.Remove(item);
|
||||
//}
|
||||
JobParam.ForEach(m => PlanJobList.Remove(m));//删除计划任务
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -91,6 +91,18 @@ namespace Epost.DAL
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 格式化任务数据
|
||||
public bool FORMAT_DEVICE(LabelParamModel model)
|
||||
{
|
||||
|
||||
model.Address = model.Address;
|
||||
model.Command = "FORMAT_DEVICE";
|
||||
model.Parameter = "";
|
||||
model.Timeout = "0.5";
|
||||
return Send(model);
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 导入地址信息
|
||||
public bool INPUT_ADDRESS_DATA()
|
||||
{
|
||||
@ -578,7 +590,17 @@ namespace Epost.DAL
|
||||
sendModel.Address = model.Address;
|
||||
sendModel.Command = model.Command;
|
||||
sendModel.Parameter = model.Parameter;
|
||||
sendModel.Timeout = model.Timeout;
|
||||
sendModel.Uid = model.Uid;
|
||||
sendModel.Quantity = model.Quantity;
|
||||
sendModel.Title = model.Title;
|
||||
sendModel.Content = model.Content;
|
||||
sendModel.Type = model.Type;
|
||||
sendModel.Mode = model.Mode;
|
||||
sendModel.Order = model.Order;
|
||||
sendModel.Unit = model.Unit;
|
||||
sendModel.W_unit = model.W_unit;
|
||||
sendModel.W_quantity = model.W_quantity;
|
||||
sendModel.Loc = model.Loc;
|
||||
try
|
||||
{
|
||||
string postStr = JsonHelper.SerializeObject(sendModel);
|
||||
|
||||
@ -48,7 +48,7 @@ namespace Epost.DAL
|
||||
string sql = string.Empty;
|
||||
if (!string.IsNullOrEmpty(area))
|
||||
{
|
||||
sql = string.Format("select id, Matchid, orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, corlorcode, address, ControlIP,area, block,boxcode,isnull(checkquantity,0) as checkquantity,wholeunit,unit,shopid,wmsboxcode,shopname from v_orders where state = 0 and oprationstate <>3 and sku = '{0}' and block = '{1}' and area='{2}' " + strwhere + " order by layer,slist ",
|
||||
sql = string.Format("select id, Matchid, orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, corlorcode, address, ControlIP,area, block,boxcode,isnull(checkquantity,0) as checkquantity,wholeunit,unit,shopid,wmsboxcode,shopname,readtime from v_orders where state = 0 and oprationstate <>3 and sku = '{0}' and block = '{1}' and area='{2}' " + strwhere + " order by layer,slist ",
|
||||
|
||||
sku,
|
||||
block, area);
|
||||
@ -56,7 +56,7 @@ namespace Epost.DAL
|
||||
}
|
||||
else
|
||||
{
|
||||
sql = string.Format("select id, Matchid, orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, corlorcode, address, ControlIP, area , block,boxcode,isnull(checkquantity,0) as checkquantity,wholeunit,unit,shopid,wmsboxcode ,shopname from v_orders where state = 0 and oprationstate <>3 and sku = '{0}' and block = '{1}' " + strwhere + " order by layer,slist ",
|
||||
sql = string.Format("select id, Matchid, orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, corlorcode, address, ControlIP, area , block,boxcode,isnull(checkquantity,0) as checkquantity,wholeunit,unit,shopid,wmsboxcode ,shopname,readtime from v_orders where state = 0 and oprationstate <>3 and sku = '{0}' and block = '{1}' " + strwhere + " order by layer,slist ",
|
||||
|
||||
sku,
|
||||
block);
|
||||
@ -90,7 +90,7 @@ namespace Epost.DAL
|
||||
string sql = string.Empty;
|
||||
if (!string.IsNullOrEmpty(area))
|
||||
{
|
||||
sql = string.Format("select id, Matchid, orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, corlorcode, address, ControlIP,area, block,boxcode,isnull(checkquantity,0) as checkquantity,wholeunit,unit,shopid,wmsboxcode from v_orders where state = 0 and sku = '{0}' and block = '{1}' and area='{2}' " + strwhere + " order by layer,slist ",
|
||||
sql = string.Format("select id, Matchid, orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, corlorcode, address, ControlIP,area, block,boxcode,isnull(checkquantity,0) as checkquantity,wholeunit,unit,shopid,wmsboxcode,shopname,readtime from v_orders where state = 0 and sku = '{0}' and block = '{1}' and area='{2}' " + strwhere + " order by layer,slist ",
|
||||
|
||||
sku,
|
||||
block, area);
|
||||
@ -98,7 +98,7 @@ namespace Epost.DAL
|
||||
}
|
||||
else
|
||||
{
|
||||
sql = string.Format("select id, Matchid, orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, corlorcode, address, ControlIP, area , block,boxcode,isnull(checkquantity,0) as checkquantity,wholeunit,unit,shopid,wmsboxcode from v_orders where state = 0 and sku = '{0}' and block = '{1}' " + strwhere + " order by layer,slist ",
|
||||
sql = string.Format("select id, Matchid, orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, corlorcode, address, ControlIP, area , block,boxcode,isnull(checkquantity,0) as checkquantity,wholeunit,unit,shopid,wmsboxcode,shopname,readtime from v_orders where state = 0 and sku = '{0}' and block = '{1}' " + strwhere + " order by layer,slist ",
|
||||
|
||||
sku,
|
||||
block);
|
||||
@ -158,7 +158,7 @@ namespace Epost.DAL
|
||||
strwhere += " and matchid = '" + matchid + "'";
|
||||
}
|
||||
|
||||
string sql = string.Format("select sum(Quantity) as SumQuantity, Sum(checkquantity) as SumCkQuantity, Discount,unit,wholeunit,matchid ,goodscode,goodsname from v_orders where sku='{0}' and block='{1}' " + strwhere + " group by sku, Discount,goodsname,unit,wholeunit,matchid ,goodscode",
|
||||
string sql = string.Format("select sum(Quantity) as SumQuantity, Sum(checkquantity) as SumCkQuantity, Discount,unit,wholeunit,matchid ,goodscode,goodsname from v_orders where sku='{0}' and oprationstate<>3 and block='{1}' " + strwhere + " group by sku, Discount,goodsname,unit,wholeunit,matchid ,goodscode",
|
||||
sku,
|
||||
block);
|
||||
LogHelper.WriteLogInfo("获取订单信息-中分" + sql);
|
||||
@ -189,17 +189,17 @@ namespace Epost.DAL
|
||||
strwhere += " and matchid = '" + matchid + "'";
|
||||
}
|
||||
|
||||
string sql = string.Format("select sum(Quantity) as SumQuantity, Sum(checkquantity) as SumCkQuantity,boxweight, Discount,goodsname,unit,wholeunit,matchid ,goodscode,goodsname from v_orders where state = 0 and oprationstate =3 and sku='{0}' and block='{1}' " + strwhere + " group by sku ,boxweight, Discount,goodsname,unit,wholeunit,matchid ,goodscode,goodsname",
|
||||
string sql = string.Format("select sum(Quantity) as SumQuantity, Sum(checkquantity) as SumCkQuantity, Discount,unit,wholeunit,matchid ,goodscode,goodsname from v_orders where sku='{0}' and oprationstate<>3 and block='{1}' " + strwhere +" group by sku, Discount,goodsname,unit,wholeunit,matchid ,goodscode",
|
||||
|
||||
sku,
|
||||
block);
|
||||
|
||||
LogHelper.WriteLogInfo("获取订单信息-中分" + sql);
|
||||
LogHelper.WriteLogInfo("获取回显订单信息-中分" + sql);
|
||||
return db.GetsqlForDT(sql);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogHelper.WriteLogInfo("获取订单信息-中分异常：" + ex.Message, LogHelper.Log_Type.ERROR);
|
||||
LogHelper.WriteLogInfo("获取回显订单信息-中分异常：" + ex.Message, LogHelper.Log_Type.ERROR);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@ -646,7 +646,7 @@ namespace Epost.DAL
|
||||
// }
|
||||
// truequantity = trueqty + 1;
|
||||
// }
|
||||
string upsql = string.Format("update orders set oprationstate = '{3}' ,oprationtime='{0}',oprationcode='{5}',truequantity='{1}' where matchid='{2}' and id='{4}' ",
|
||||
string upsql = string.Format("update orders set oprationstate = '{3}' ,oprationtime='{0}',oprationcode='{5}',truequantity='{1}' where matchid='{2}' and id='{4}' ",
|
||||
DateTime.Now.ToString(),
|
||||
truequantity,
|
||||
matchid,
|
||||
@ -695,13 +695,14 @@ namespace Epost.DAL
|
||||
|
||||
|
||||
#region 修改门店拣货状态
|
||||
public bool UpdateStateByOrderID(string orderid)
|
||||
public bool UpdateStateBymatchid(string matchid)
|
||||
{
|
||||
try
|
||||
{
|
||||
string upsql = string.Format("update orders set oprationstate=3,truequantity=quantity, state=3 where orderid='{0}'",
|
||||
orderid);
|
||||
string upsql = string.Format("update orders set state=3 where matchid='{0}' and state=0",
|
||||
matchid);
|
||||
long x = db.UpdateSql(upsql);
|
||||
LogHelper.WriteLogInfo(x+"修改波次拣选完成"+upsql);
|
||||
if (x > 0)
|
||||
return true;
|
||||
return false;
|
||||
@ -717,30 +718,32 @@ namespace Epost.DAL
|
||||
#endregion
|
||||
|
||||
#region 修改当前小车拣货状态
|
||||
public bool UpdateStateByCar(string matchid, string block = "", string sku = "")
|
||||
public bool UpdateStateByCar(string matchid, string sku = "")
|
||||
{
|
||||
try
|
||||
{
|
||||
string strwhere = string.Empty;
|
||||
if (!string.IsNullOrEmpty(block))
|
||||
{
|
||||
strwhere = " and workblock='" + block + "'";
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(sku))
|
||||
{
|
||||
strwhere += " and sku='" + sku + "'";
|
||||
}
|
||||
string upsql = string.Format("update orders set state=3 where matchid = '{0}'" + strwhere,
|
||||
string upsql = string.Format("insert into ordershis([id] ,[orderid] ,[sku],[matchid],[quantity],[tolocation],[batchid],[orderstate] ,[truequantity] ,[checkquantity] ,[downdate] ,[lighttime] ,[oprationtime] ,[oprationstate] ,[shopid] ,[classes] ,[oprationcode]\r\n ,[boxcode] ,[goodscode] ,[corlorcode] ,[discount] ,[barcode] ,[goodsname] ,[tasktype] ,[prino] ,[wmsboxcode] ,[orderway] ,[wmsorderid] ,[shopname] ,[state] ,[warehouseid] ,[workblock] ,[unit] ,[wholeunit] ) select [id],[orderid],[sku],[matchid],[quantity],[tolocation],[batchid],[orderstate],[truequantity],[checkquantity],[downdate],[lighttime],[oprationtime] ,[oprationstate],[shopid],[classes],[oprationcode],[boxcode],[goodscode],[corlorcode],[discount],[barcode],[goodsname],[tasktype] ,[prino],[wmsboxcode],[orderway],[wmsorderid],[shopname],[state],[warehouseid],[workblock],[unit],[wholeunit] from v_orders where matchid = '{0}'" + strwhere,
|
||||
matchid);
|
||||
LogHelper.WriteLogInfo("修改波次拣货状态：" + upsql);
|
||||
long x = db.UpdateSql(upsql);
|
||||
LogHelper.WriteLogInfo("加入历史：" + upsql);
|
||||
long x = db.InsertSql(upsql);
|
||||
if (x > 0)
|
||||
{
|
||||
string sql = "update ordershis set state=3 where state=0";
|
||||
db.UpdateSql(sql);
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
else { return false; }
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogHelper.WriteLogInfo("修改当前小车拣货状态：" + ex.Message);
|
||||
LogHelper.WriteLogInfo("加入历史异常：" + ex.Message);
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -1082,6 +1085,38 @@ namespace Epost.DAL
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region 判断当前sku是否为已完成
|
||||
public bool IsSkuFinishWork( string sku , string matchid )
|
||||
{
|
||||
string strwheres = "";
|
||||
|
||||
if (!string.IsNullOrEmpty(matchid))
|
||||
{
|
||||
strwheres += " and matchid ='" + matchid + "'";
|
||||
}
|
||||
if (!string.IsNullOrEmpty(sku))
|
||||
{
|
||||
strwheres += " and sku ='" + sku + "'";
|
||||
}
|
||||
string sql = "select matchid, sku from V_orders where oprationstate <> 3 and state<>99 " + strwheres;
|
||||
|
||||
LogHelper.WriteLogInfo("判断sku是否为已完成" + sql);
|
||||
DataTable dt = db.GetsqlForDT(sql);
|
||||
if (dt == null || dt.Rows.Count == 0)
|
||||
{
|
||||
LogHelper.WriteLogInfo("判断sku是否为已完成true");
|
||||
return true;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
LogHelper.WriteLogInfo("判断sku是否为已完成false");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 查询下一区段区号
|
||||
public int getOrderarea(string usercode, string block, string area)
|
||||
{
|
||||
@ -1245,15 +1280,28 @@ namespace Epost.DAL
|
||||
|
||||
|
||||
#region 查询sku对应的所有任务
|
||||
public DataTable getOrderListBysku(string block, string sku)
|
||||
public DataTable getOrderListBysku(string block, string sku,string area, string matchid)
|
||||
{
|
||||
string sql = string.Format("select * from v_orders where block = '{0}' and sku ='{1}' order by layer,slist ",
|
||||
block,
|
||||
sku);
|
||||
string sql = string.Format("select * from v_orders where block = '{0}' and area='{1}' and sku ='{2}'and matchid ='{3}' order by layer,slist ",
|
||||
block,area,
|
||||
sku,matchid);
|
||||
LogHelper.WriteLogInfo("查询sku对应的所有任务:" + sql);
|
||||
DataTable dt = db.GetsqlForDT(sql);
|
||||
return dt;
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 查询sku对应的所有任务
|
||||
public DataTable getOrderHisListBysku(string block, string sku, string area,string matchid)
|
||||
{
|
||||
string sql = string.Format("select * from v_ordershis where block = '{0}' and area='{1}' and sku ='{2}' and matchid ='{3}' order by layer,slist ",
|
||||
block, area,
|
||||
sku,matchid);
|
||||
LogHelper.WriteLogInfo("查询sku对应的所有回显任务:" + sql);
|
||||
DataTable dt = db.GetsqlForDT(sql);
|
||||
return dt;
|
||||
|
||||
}
|
||||
#endregion
|
||||
#region 查询退货单号查询所在区
|
||||
|
||||
@ -290,10 +290,10 @@ namespace Epost.DAL
|
||||
{
|
||||
strwhere += "and Taskarea='" + model.Taskarea + "'";
|
||||
}
|
||||
string sql = string.Format("update OrdersQueue set state='{0}' where state<>3 and sku = '{1}' and matchid='{2}' and usercode='{3}'"+ strwhere,
|
||||
string sql = string.Format("update OrdersQueue set state='{0}' where state<>3 and sku = '{1}' and matchid='{2}' "+ strwhere,
|
||||
model.State
|
||||
,model.Sku,
|
||||
model.Matchid,model.UserCode
|
||||
model.Matchid
|
||||
|
||||
);
|
||||
LogHelper.WriteLogInfo("修改作业区段"+sql);
|
||||
@ -354,10 +354,10 @@ namespace Epost.DAL
|
||||
|
||||
|
||||
#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",
|
||||
sku,block);
|
||||
string sql = string.Format("delete from OrdersQueue where sku='{0}' and taskblock='{1}' and taskarea='{2}' and state<>3",
|
||||
sku,block,area);
|
||||
LogHelper.WriteLogInfo("删除queue"+sql);
|
||||
long x = db.DeleteSql(sql);
|
||||
if (x > 0)
|
||||
|
||||
@ -29,8 +29,8 @@ namespace Epost.DAL
|
||||
// sku);
|
||||
//string sql = string.Format(" SELECT * FROM skuinfo WHERE (CHARINDEX('{0}',location)>0) or sku='{1}'",
|
||||
// sku, sku);
|
||||
string sql = string.Format(" SELECT * FROM skuinfo WHERE sku='{0}'",
|
||||
sku);
|
||||
string sql = string.Format(" SELECT * FROM skuinfo WHERE (CHARINDEX('{0}',location)>0) or sku='{1}'",
|
||||
sku, sku);
|
||||
|
||||
return db.GetsqlForDT(sql);
|
||||
}
|
||||
|
||||
@ -48,6 +48,7 @@ namespace Epost.Model
|
||||
private string _Unit = string.Empty;//小单位
|
||||
private string _UserCode = string.Empty;//工号
|
||||
private string _no = string.Empty;//任务序号
|
||||
private string _readtime = string.Empty;
|
||||
public string BatchId
|
||||
{
|
||||
get
|
||||
@ -389,6 +390,7 @@ namespace Epost.Model
|
||||
public string UserCode { get => _UserCode; set => _UserCode = value; }
|
||||
public string No { get => _no; set => _no = value; }
|
||||
public string ID { get => _ID; set => _ID = value; }
|
||||
public string Readtime { get => _readtime; set => _readtime = value; }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -9,6 +9,7 @@ using Epost.Common;
|
||||
using System.Web.Helpers;
|
||||
using System.Data;
|
||||
using System.Configuration;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace Epost.TestToolsWeb.Tests.Controllers
|
||||
{
|
||||
@ -19,13 +20,16 @@ namespace Epost.TestToolsWeb.Tests.Controllers
|
||||
[TestMethod]
|
||||
public void d()
|
||||
{
|
||||
string sku = "211100";
|
||||
if (sku.Substring(0, 1) == "2" && sku.Substring(1, 1) != "5")
|
||||
string sku = "2509267236248";
|
||||
if (sku.Substring(0, 1) == "2")
|
||||
{
|
||||
if (sku.Length >= 7)
|
||||
|
||||
if (sku.Length >= 8)
|
||||
{
|
||||
sku = sku.Substring(1, 6);
|
||||
sku = sku.Substring(0, 8);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
using ComposerSDK;
|
||||
using Epost.BLL;
|
||||
using Epost.Common;
|
||||
using Epost.DAL;
|
||||
using Epost.DAL.Cache;
|
||||
using Epost.DAL.Enum;
|
||||
using Epost.DPS.Controllers;
|
||||
@ -9,6 +10,7 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Configuration;
|
||||
using System.Data;
|
||||
using System.Data.Entity.Core.Metadata.Edm;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Net.Http;
|
||||
@ -34,6 +36,8 @@ namespace Epost.TestToolsWeb.Controllers
|
||||
BoxQueueBLL quboxbll = new BoxQueueBLL();
|
||||
JobDownCacheDAL JobCache = new JobDownCacheDAL();
|
||||
HttpHelper http = new HttpHelper();
|
||||
AddressstorageDAL addal = new AddressstorageDAL();
|
||||
ErrorLogDAL errdal = new ErrorLogDAL();
|
||||
[Route("ProcessingResult")]
|
||||
[HttpPost]
|
||||
public string ProcessingResult([FromBody]ResultMessageModel data)
|
||||
@ -79,7 +83,25 @@ namespace Epost.TestToolsWeb.Controllers
|
||||
JobCache.UpdateJobDownModelList(new List<ResultMessageModel>() { data }, EdownCommend.Create);
|
||||
|
||||
}
|
||||
|
||||
if (data.Command == "JOB_Fail")
|
||||
{
|
||||
LabelParamModel lbmodel = new LabelParamModel();
|
||||
lbmodel.Address = data.Address;
|
||||
lbmodel.Uid = data.Address;
|
||||
string stype = "N";
|
||||
if (data.Type == "2")
|
||||
{ stype = "C"; }
|
||||
lbmodel.Type = stype;
|
||||
lbmodel.ControlIP = data.IP;
|
||||
combll.FORMAT_DEVICE(lbmodel);
|
||||
LogHelper.WriteLogInfo("设备报错："+JsonHelper.SerializeObject(data), Log_Type.ERROR);
|
||||
|
||||
ErrorLogModel errmodel = new ErrorLogModel();
|
||||
errmodel.Address = data.Address;
|
||||
errmodel.ControlIP = data.IP;
|
||||
addal.UpdateErrorState(data.Address, data.IP);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<UseIISExpress>true</UseIISExpress>
|
||||
@ -11,7 +11,7 @@
|
||||
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
|
||||
<WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
|
||||
<NameOfLastUsedPublishProfile>E:\WORK\代码管理\T系列\播种\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml</NameOfLastUsedPublishProfile>
|
||||
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
||||
<Use64BitIISExpress />
|
||||
<IISExpressSSLPort />
|
||||
<IISExpressAnonymousAuthentication />
|
||||
@ -19,7 +19,7 @@
|
||||
<IISExpressUseClassicPipelineMode />
|
||||
<UseGlobalApplicationHostFile />
|
||||
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
|
||||
<Controller_SelectedScaffolderCategoryPath>root/Controller</Controller_SelectedScaffolderCategoryPath>
|
||||
<Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
|
||||
</PropertyGroup>
|
||||
<ProjectExtensions>
|
||||
<VisualStudio>
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
<PropertyGroup>
|
||||
<TimeStampOfAssociatedLegacyPublishXmlFile />
|
||||
<_PublishTargetUrl>D:\驿传\Wuxidingshi_DAS</_PublishTargetUrl>
|
||||
<History>False|2024-11-04T09:48:25.2781696Z;True|2024-11-01T16:04:56.3535724+08:00;True|2024-09-01T10:13:37.1598955+08:00;True|2024-08-31T17:27:57.5375469+08:00;True|2022-07-15T16:41:13.9750291+08:00;True|2022-07-14T14:02:20.7983427+08:00;True|2022-07-13T17:40:22.7531000+08:00;True|2022-07-13T17:34:22.9908701+08:00;True|2022-07-13T17:30:06.3588502+08:00;True|2022-07-11T10:32:06.9053981+08:00;True|2021-04-26T10:07:37.4889549+08:00;True|2021-04-09T10:32:51.9130162+08:00;True|2021-04-09T10:31:50.4974012+08:00;</History>
|
||||
<History>True|2025-06-26T13:19:18.0735602Z||;True|2025-06-26T21:12:51.6536773+08:00||;True|2025-06-26T21:06:38.5762552+08:00||;True|2025-06-26T20:56:58.9703670+08:00||;True|2025-06-26T20:51:55.6003060+08:00||;True|2025-06-26T16:32:01.0915594+08:00||;True|2025-06-24T21:33:51.6120305+08:00||;True|2025-06-24T15:40:47.6769336+08:00||;True|2025-06-24T10:20:08.6997539+08:00||;True|2025-06-23T16:45:32.2447039+08:00||;True|2025-06-19T17:51:13.7383312+08:00||;True|2025-06-19T16:33:25.6789576+08:00||;True|2025-06-19T16:31:35.8668377+08:00||;True|2025-06-17T17:16:38.1010406+08:00||;True|2025-06-15T11:14:12.6170562+08:00||;True|2025-06-15T10:42:25.1172247+08:00||;True|2025-06-14T13:26:43.2442778+08:00||;True|2025-06-10T13:21:34.1684919+08:00||;True|2025-06-09T11:40:40.2739751+08:00||;True|2025-06-08T16:20:45.8519262+08:00||;True|2025-01-16T15:37:40.8814043+08:00||;True|2024-12-19T15:11:44.2536385+08:00||;True|2024-12-10T19:10:26.6514077+08:00||;True|2024-12-10T18:30:34.7211512+08:00||;True|2024-12-09T14:06:46.4112259+08:00||;True|2024-12-03T14:23:26.2134334+08:00||;True|2024-11-27T18:53:48.7373661+08:00||;True|2024-11-27T14:27:33.0840789+08:00||;True|2024-11-27T14:08:15.6442660+08:00||;True|2024-11-27T12:10:03.9412549+08:00||;True|2024-11-27T11:45:31.3775097+08:00||;True|2024-11-27T11:32:00.8297320+08:00||;True|2024-11-23T20:50:04.5476409+08:00||;False|2024-11-04T17:48:25.2781696+08:00||;True|2024-11-01T16:04:56.3535724+08:00||;True|2024-09-01T10:13:37.1598955+08:00||;True|2024-08-31T17:27:57.5375469+08:00||;True|2022-07-15T16:41:13.9750291+08:00||;True|2022-07-14T14:02:20.7983427+08:00||;True|2022-07-13T17:40:22.7531000+08:00||;True|2022-07-13T17:34:22.9908701+08:00||;True|2022-07-13T17:30:06.3588502+08:00||;True|2022-07-11T10:32:06.9053981+08:00||;True|2021-04-26T10:07:37.4889549+08:00||;True|2021-04-09T10:32:51.9130162+08:00||;True|2021-04-09T10:31:50.4974012+08:00||;</History>
|
||||
<LastFailureDetails />
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
@ -33,19 +33,19 @@
|
||||
<publishTime>04/04/2018 15:45:12</publishTime>
|
||||
</File>
|
||||
<File Include="bin/App_global.asax.compiled">
|
||||
<publishTime>11/08/2024 11:47:18</publishTime>
|
||||
<publishTime>06/26/2025 21:19:16</publishTime>
|
||||
</File>
|
||||
<File Include="bin/App_global.asax.dll">
|
||||
<publishTime>11/08/2024 11:47:17</publishTime>
|
||||
<publishTime>06/26/2025 21:19:16</publishTime>
|
||||
</File>
|
||||
<File Include="bin/BouncyCastle.Crypto.dll">
|
||||
<publishTime>02/24/2020 15:29:24</publishTime>
|
||||
</File>
|
||||
<File Include="bin/Common.dll">
|
||||
<publishTime>11/06/2024 10:26:56</publishTime>
|
||||
<publishTime>06/26/2025 20:51:31</publishTime>
|
||||
</File>
|
||||
<File Include="bin/Common.pdb">
|
||||
<publishTime>11/06/2024 10:26:56</publishTime>
|
||||
<publishTime>06/26/2025 20:51:31</publishTime>
|
||||
</File>
|
||||
<File Include="bin/ComposerSDK.dll">
|
||||
<publishTime>04/29/2020 16:50:14</publishTime>
|
||||
@ -63,31 +63,31 @@
|
||||
<publishTime>10/23/2017 13:15:20</publishTime>
|
||||
</File>
|
||||
<File Include="bin/Epost.BLL.dll">
|
||||
<publishTime>11/08/2024 11:47:07</publishTime>
|
||||
<publishTime>06/26/2025 21:19:04</publishTime>
|
||||
</File>
|
||||
<File Include="bin/Epost.BLL.pdb">
|
||||
<publishTime>11/08/2024 11:47:07</publishTime>
|
||||
<publishTime>06/26/2025 21:19:04</publishTime>
|
||||
</File>
|
||||
<File Include="bin/Epost.BLL.XmlSerializers.dll">
|
||||
<publishTime>08/26/2020 18:09:48</publishTime>
|
||||
</File>
|
||||
<File Include="bin/Epost.DAL.dll">
|
||||
<publishTime>11/08/2024 11:47:06</publishTime>
|
||||
<publishTime>06/26/2025 20:51:32</publishTime>
|
||||
</File>
|
||||
<File Include="bin/Epost.DAL.pdb">
|
||||
<publishTime>11/08/2024 11:47:06</publishTime>
|
||||
<publishTime>06/26/2025 20:51:32</publishTime>
|
||||
</File>
|
||||
<File Include="bin/Epost.DPS.dll">
|
||||
<publishTime>11/08/2024 11:47:09</publishTime>
|
||||
<publishTime>06/26/2025 21:19:08</publishTime>
|
||||
</File>
|
||||
<File Include="bin/Epost.DPS.pdb">
|
||||
<publishTime>11/08/2024 11:47:09</publishTime>
|
||||
<publishTime>06/26/2025 21:19:08</publishTime>
|
||||
</File>
|
||||
<File Include="bin/Epost.Model.dll">
|
||||
<publishTime>11/06/2024 10:26:56</publishTime>
|
||||
<publishTime>06/26/2025 20:51:29</publishTime>
|
||||
</File>
|
||||
<File Include="bin/Epost.Model.pdb">
|
||||
<publishTime>11/06/2024 10:26:56</publishTime>
|
||||
<publishTime>06/26/2025 20:51:29</publishTime>
|
||||
</File>
|
||||
<File Include="bin/Epost.TestToolsWeb.dll">
|
||||
<publishTime>09/06/2018 11:57:11</publishTime>
|
||||
@ -5652,7 +5652,7 @@
|
||||
<publishTime>05/30/2022 16:58:47</publishTime>
|
||||
</File>
|
||||
<File Include="PrecompiledApp.config">
|
||||
<publishTime>11/08/2024 11:47:11</publishTime>
|
||||
<publishTime>06/26/2025 21:19:09</publishTime>
|
||||
</File>
|
||||
<File Include="Scripts/ai.0.22.9-build00167.js">
|
||||
<publishTime>04/04/2018 15:45:12</publishTime>
|
||||
@ -7572,7 +7572,7 @@
|
||||
<publishTime>07/04/2022 14:22:38</publishTime>
|
||||
</File>
|
||||
<File Include="Web.config">
|
||||
<publishTime>11/01/2024 16:24:56</publishTime>
|
||||
<publishTime>06/26/2025 20:51:38</publishTime>
|
||||
</File>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
Reference in New Issue
Block a user