This commit is contained in:
@ -611,13 +611,13 @@ namespace Epost.BLL
|
|||||||
|
|
||||||
|
|
||||||
#region 取消订单
|
#region 取消订单
|
||||||
public bool DelOrder(string orderid)
|
public bool DelOrder(string strwhere)
|
||||||
{
|
{
|
||||||
|
|
||||||
//bool t = dal.DelOrder(orderid);
|
bool t = dal.DelOrder(strwhere);
|
||||||
|
|
||||||
//return t;
|
return t;
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
@ -644,7 +644,7 @@ namespace Epost.BLL
|
|||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region 获取订单信息
|
#region 获取订单信息
|
||||||
public List<JobModel> GetOrderList(string matchid, string block, string sku = "", string area = "", string UserCode = "")
|
public List<JobModel> GetOrderList(string matchid, string block, string sku = "", string area = "", string UserCode = "",string color="")
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@ -652,25 +652,25 @@ namespace Epost.BLL
|
|||||||
List<JobModel> list = new List<JobModel>();
|
List<JobModel> list = new List<JobModel>();
|
||||||
DataTable OrderDt = dal.GetOrderList_Car(matchid, sku, area, block, UserCode);
|
DataTable OrderDt = dal.GetOrderList_Car(matchid, sku, area, block, UserCode);
|
||||||
bool isecho = false;
|
bool isecho = false;
|
||||||
//if (OrderDt == null || OrderDt.Rows.Count == 0)//回显
|
if (OrderDt == null || OrderDt.Rows.Count == 0)//回显
|
||||||
//{
|
{
|
||||||
// OrderDt = dal.GetOrderList_echo(matchid, sku, area, block, UserCode);
|
OrderDt = dal.GetOrderList_echo(matchid, sku, area, block, UserCode);
|
||||||
// isecho = true;
|
isecho = true;
|
||||||
|
|
||||||
//}
|
}
|
||||||
if (OrderDt != null && OrderDt.Rows.Count > 0)
|
if (OrderDt != null && OrderDt.Rows.Count > 0)
|
||||||
{
|
{
|
||||||
// string usercode = string.Empty;
|
// string usercode = string.Empty;
|
||||||
string lightcolor = string.Empty;
|
|
||||||
//DataTable udt = dal.GetOrderUseerXCode(matchid, sku, area, block);
|
//DataTable udt = dal.GetOrderUseerXCode(matchid, sku, area, block);
|
||||||
//if (udt != null && udt.Rows.Count > 0)
|
//if (udt != null && udt.Rows.Count > 0)
|
||||||
//{
|
//{
|
||||||
// usercode = udt.Rows[0]["usercode"].ToString();
|
// usercode = udt.Rows[0]["usercode"].ToString();
|
||||||
// lightcolor = udt.Rows[0]["lightcolor"].ToString();
|
// lightcolor = udt.Rows[0]["lightcolor"].ToString();
|
||||||
//}
|
//}
|
||||||
if (string.IsNullOrEmpty(lightcolor))
|
if (string.IsNullOrEmpty(color))
|
||||||
{
|
{
|
||||||
lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||||
}
|
}
|
||||||
foreach (DataRow item in OrderDt.Rows)
|
foreach (DataRow item in OrderDt.Rows)
|
||||||
{
|
{
|
||||||
@ -698,7 +698,7 @@ namespace Epost.BLL
|
|||||||
demodel.Area = item["Area"].ToString();
|
demodel.Area = item["Area"].ToString();
|
||||||
demodel.Address = item["address"].ToString();
|
demodel.Address = item["address"].ToString();
|
||||||
demodel.UserCode = UserCode;
|
demodel.UserCode = UserCode;
|
||||||
demodel.ColorCode = lightcolor;
|
demodel.ColorCode = color;
|
||||||
demodel.Bkaddress = "0";
|
demodel.Bkaddress = "0";
|
||||||
demodel.Addresstype = "1";
|
demodel.Addresstype = "1";
|
||||||
demodel.ControlID = "";
|
demodel.ControlID = "";
|
||||||
@ -713,11 +713,11 @@ namespace Epost.BLL
|
|||||||
demodel.TaskArea = Convert.ToInt32(item["area"].ToString());
|
demodel.TaskArea = Convert.ToInt32(item["area"].ToString());
|
||||||
demodel.TaskBlock = Convert.ToInt32(item["block"].ToString());
|
demodel.TaskBlock = Convert.ToInt32(item["block"].ToString());
|
||||||
demodel.No = "01";
|
demodel.No = "01";
|
||||||
//if (isecho)
|
if (isecho)
|
||||||
//{
|
{
|
||||||
// demodel.No = "04";
|
demodel.No = "04";
|
||||||
// demodel.ColorCode = EnumHelper.EMToDescriptionString(LightColor.Color.Blue);
|
demodel.ColorCode = EnumHelper.EMToDescriptionString(LightColor.Color.Pink);
|
||||||
//}
|
}
|
||||||
demodel.UserCode = UserCode;
|
demodel.UserCode = UserCode;
|
||||||
list.Add(demodel);
|
list.Add(demodel);
|
||||||
if (!isecho) {
|
if (!isecho) {
|
||||||
|
@ -64,9 +64,9 @@ namespace Epost.BLL
|
|||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
#region 获取当前区的作业状态
|
#region 获取当前区的作业状态
|
||||||
public DataTable getQueuesOrderbyState(string block, string area,string state)
|
public DataTable getQueuesOrderbyState(string block, string area,string state,string usercode="")
|
||||||
{
|
{
|
||||||
return dal.getQueuesOrderbyState(block, area, state);
|
return dal.getQueuesOrderbyState(block, area, state,usercode);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -128,74 +128,74 @@ namespace Epost.BLL
|
|||||||
//if (!isJobList.Any())
|
//if (!isJobList.Any())
|
||||||
//{
|
//{
|
||||||
model.State = 1;
|
model.State = 1;
|
||||||
orderbll.GetOrderList(queueDT.Rows[0]["matchid"].ToString(), nblock, queueDT.Rows[0]["sku"].ToString(), narea, queueDT.Rows[0]["usercode"].ToString());
|
orderbll.GetOrderList(queueDT.Rows[0]["matchid"].ToString(), nblock, queueDT.Rows[0]["sku"].ToString(), narea, queueDT.Rows[0]["usercode"].ToString(), queueDT.Rows[0]["lightcolor"].ToString());
|
||||||
List<JobModel> nowJoblist = jobList.FindAll(p => p.State == 0 && p.Block == model.Taskblock && p.Area == model.Taskarea);
|
List<JobModel> nowJoblist = jobList.FindAll(p => p.State == 0 && p.Block == model.Taskblock && p.Area == model.Taskarea);
|
||||||
if (nowJoblist.Any())
|
if (nowJoblist.Any())
|
||||||
{
|
{
|
||||||
var nowmodel = nowJoblist.FirstOrDefault();
|
var nowmodel = nowJoblist.FirstOrDefault();
|
||||||
|
|
||||||
LogHelper.WriteLogInfo("进入任务点亮=====matchid=" + nowmodel.Matchid + "===orderid===" + nowmodel.OrderID + "=====sku==" + nowmodel.Sku + "========");
|
LogHelper.WriteLogInfo("进入任务点亮=====matchid=" + nowmodel.Matchid + "===orderid===" + nowmodel.OrderID + "=====sku==" + nowmodel.Sku + "========");
|
||||||
#region 点亮任务标签
|
#region 点亮任务标签
|
||||||
foreach (JobModel item in nowJoblist.ToArray())
|
foreach (JobModel item in nowJoblist.ToArray())
|
||||||
{
|
{
|
||||||
|
|
||||||
//#region 回显设备锁定
|
#region 回显设备锁定
|
||||||
//if (queueDT.Rows[0]["lightcolor"].ToString() == EnumHelper.EMToDescriptionString(LightColor.Color.Blue))
|
if (item.ColorCode == EnumHelper.EMToDescriptionString(LightColor.Color.Pink))
|
||||||
//{
|
|
||||||
|
|
||||||
// LabelParamModel locklamodel = new LabelParamModel();
|
|
||||||
// locklamodel.Address = item.Address.ToString();
|
|
||||||
// locklamodel.ControlIP = item.ControlIP.ToString();
|
|
||||||
// locklamodel.Command = "LOCK";
|
|
||||||
// locklamodel.Parameter = "11111000";
|
|
||||||
// locklamodel.Type = "N";
|
|
||||||
// list.Add(locklamodel);
|
|
||||||
|
|
||||||
//}
|
|
||||||
//#endregion
|
|
||||||
// else
|
|
||||||
//{
|
|
||||||
//判断设备当前有没有被点亮
|
|
||||||
List<JobModel> isshowList = jobList.FindAll(p => p.Address == item.Address && p.ControlIP == item.ControlIP && p.State == 1);
|
|
||||||
if (!isshowList.Any())
|
|
||||||
{
|
{
|
||||||
List<JobModel> manyJoblist = nowJoblist.FindAll(m => m.Tolocation == item.Tolocation && m.Address == item.Address);
|
|
||||||
int quantity = item.Quantity;
|
|
||||||
LabelParamModel lamodel = new LabelParamModel();
|
|
||||||
lamodel.Address = item.Address.ToString();
|
|
||||||
lamodel.ControlIP = item.ControlIP.ToString();
|
|
||||||
lamodel.Command = "DISPLAY_JOB";
|
|
||||||
#region 同一个货位的数据合并显示
|
|
||||||
if (manyJoblist.Count > 1)
|
|
||||||
{
|
|
||||||
quantity = 0;
|
|
||||||
if (manyJoblist.FindAll(m => m.State == 0).Any())
|
|
||||||
{
|
|
||||||
foreach (JobModel mitem in manyJoblist)
|
|
||||||
{
|
|
||||||
quantity += mitem.Quantity;
|
|
||||||
mitem.State = 1;
|
|
||||||
mitem.ManyState = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
LabelParamModel locklamodel = new LabelParamModel();
|
||||||
}
|
locklamodel.Address = item.Address.ToString();
|
||||||
|
locklamodel.ControlIP = item.ControlIP.ToString();
|
||||||
#endregion
|
locklamodel.Command = "LOCK";
|
||||||
lamodel.Type = "N";
|
locklamodel.Parameter = "11111000";
|
||||||
lamodel.Quantity = quantity.ToString();
|
locklamodel.Type = "N";
|
||||||
lamodel.Uid = "U" + item.ID;
|
locklamodel.Uid = "L" + item.Address;
|
||||||
lamodel.Mode = queueDT.Rows[0]["lightcolor"].ToString() + "0";
|
list.Add(locklamodel);
|
||||||
list.Add(lamodel);
|
|
||||||
//}
|
|
||||||
item.State = 1;
|
|
||||||
item.ColorCode = queueDT.Rows[0]["lightcolor"].ToString();
|
|
||||||
item.DisplayTime = DateTime.Now;
|
|
||||||
}
|
}
|
||||||
}
|
#endregion
|
||||||
|
|
||||||
|
//判断设备当前有没有被点亮
|
||||||
|
List<JobModel> isshowList = jobList.FindAll(p => p.Address == item.Address && p.ControlIP == item.ControlIP && p.State == 1);
|
||||||
|
if (!isshowList.Any())
|
||||||
|
{
|
||||||
|
List<JobModel> manyJoblist = nowJoblist.FindAll(m => m.Tolocation == item.Tolocation && m.Address == item.Address);
|
||||||
|
int quantity = item.Quantity;
|
||||||
|
LabelParamModel lamodel = new LabelParamModel();
|
||||||
|
lamodel.Address = item.Address.ToString();
|
||||||
|
lamodel.ControlIP = item.ControlIP.ToString();
|
||||||
|
lamodel.Command = "DISPLAY_JOB";
|
||||||
|
#region 同一个货位的数据合并显示
|
||||||
|
if (manyJoblist.Count > 1)
|
||||||
|
{
|
||||||
|
quantity = 0;
|
||||||
|
if (manyJoblist.FindAll(m => m.State == 0).Any())
|
||||||
|
{
|
||||||
|
foreach (JobModel mitem in manyJoblist)
|
||||||
|
{
|
||||||
|
quantity += mitem.Quantity;
|
||||||
|
mitem.State = 1;
|
||||||
|
mitem.ManyState = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
lamodel.Type = "N";
|
||||||
|
lamodel.Quantity = quantity.ToString();
|
||||||
|
lamodel.Uid = "U" + item.ID;
|
||||||
|
lamodel.Mode =item.ColorCode + "0";
|
||||||
|
list.Add(lamodel);
|
||||||
|
//}
|
||||||
|
item.State = 1;
|
||||||
|
|
||||||
|
item.DisplayTime = DateTime.Now;
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
#region 点亮通道灯
|
#region 点亮通道灯
|
||||||
comBLL.DISPLAY_LIGHT_BLOCK(model.Taskblock, model.Taskarea, "1");
|
// comBLL.DISPLAY_LIGHT_BLOCK(model.Taskblock, model.Taskarea, "1");
|
||||||
#endregion
|
#endregion
|
||||||
if (list != null && list.Count > 0)
|
if (list != null && list.Count > 0)
|
||||||
{
|
{
|
||||||
@ -203,11 +203,12 @@ namespace Epost.BLL
|
|||||||
comBLL.DISPLAY_JOBALL(list);
|
comBLL.DISPLAY_JOBALL(list);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
}
|
||||||
{//无任务
|
else
|
||||||
LogHelper.WriteLogInfo("点亮====无任务=======================");
|
{//无任务
|
||||||
model.State = 3;
|
LogHelper.WriteLogInfo("点亮====无任务=======================");
|
||||||
}
|
model.State = 3;
|
||||||
|
}
|
||||||
#endregion
|
#endregion
|
||||||
if (jobList.Any())
|
if (jobList.Any())
|
||||||
{
|
{
|
||||||
|
@ -183,28 +183,25 @@ namespace Epost.BLL
|
|||||||
else if (data.Uid == "09" + "-" + data.Address)//完成灯拍下
|
else if (data.Uid == "09" + "-" + data.Address)//完成灯拍下
|
||||||
{
|
{
|
||||||
LogHelper.WriteLogInfo(data.Address+"end拍下");
|
LogHelper.WriteLogInfo(data.Address+"end拍下");
|
||||||
|
#region 修改任务队列状态
|
||||||
|
OrdersQueueModel qumodel = new OrdersQueueModel();
|
||||||
|
qumodel.State = 3;
|
||||||
|
qumodel.Taskblock = block;
|
||||||
|
qumodel.Taskarea = area;
|
||||||
|
qumodel.UserCode = data.Info;
|
||||||
|
queueBLL.UpdateQueueTaskArea_Car(qumodel);
|
||||||
|
#endregion
|
||||||
List<JobModel> offList = jobList.FindAll(m => m.Block == block && m.Area == area && m.Address == data.Address && m.ControlIP == data.IP && m.State == 3 );
|
List<JobModel> offList = jobList.FindAll(m => m.Block == block && m.Area == area && m.Address == data.Address && m.ControlIP == data.IP && m.State == 3 );
|
||||||
|
|
||||||
if (offList.Any())
|
if (offList.Any())
|
||||||
{
|
{
|
||||||
JobModel model = offList.FirstOrDefault();
|
JobModel model = offList.FirstOrDefault();
|
||||||
|
|
||||||
#region 修改任务队列状态
|
|
||||||
OrdersQueueModel qumodel = new OrdersQueueModel();
|
|
||||||
qumodel.State = 3;
|
|
||||||
qumodel.Taskblock = block;
|
|
||||||
qumodel.Taskarea = area;
|
|
||||||
qumodel.Sku = model.Sku;
|
|
||||||
qumodel.Matchid = model.Matchid;
|
|
||||||
qumodel.UserCode = model.UserCode;
|
|
||||||
queueBLL.UpdateQueueTaskArea_Car(qumodel);
|
|
||||||
#endregion
|
|
||||||
List<JobModel> AllList = jobList.FindAll(m => m.Block == block && m.Area == area && m.ControlIP == data.IP && m.State == 3&&m.UserCode== model.UserCode);
|
List<JobModel> AllList = jobList.FindAll(m => m.Block == block && m.Area == area && m.ControlIP == data.IP && m.State == 3&&m.UserCode== model.UserCode);
|
||||||
bool bo = orderbll.IsSkuFinishWork("", model.Matchid);
|
bool bo = orderbll.IsSkuFinishWork("", model.Matchid);
|
||||||
if (bo)
|
if (bo)
|
||||||
{
|
{
|
||||||
LogHelper.WriteLogInfo("波次拣选完成");
|
LogHelper.WriteLogInfo("波次拣选完成");
|
||||||
|
orderbll.DelOrder(" and matchid ='" + model.Matchid + "'");
|
||||||
List<UserCodeModel> ulist = UserCacheDAL.GetUserCodeList();
|
List<UserCodeModel> ulist = UserCacheDAL.GetUserCodeList();
|
||||||
UserCacheDAL.UpdateUserCodeList(ulist, EUserCommend.Execute);//删除波次信息
|
UserCacheDAL.UpdateUserCodeList(ulist, EUserCommend.Execute);//删除波次信息
|
||||||
}
|
}
|
||||||
|
@ -383,28 +383,27 @@ namespace Epost.BLL
|
|||||||
|
|
||||||
#region 扫描商品
|
#region 扫描商品
|
||||||
|
|
||||||
List<ResultMessageModel> hangList = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Parameter == "888888");
|
List<ResultMessageModel> hangList = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Parameter == "888888|Y01"|| m.Parameter == "888888|Y02" || m.Parameter == "888888|Y03" || m.Parameter == "888888|Y04"|| m.Parameter == "888888|Y05" || m.Parameter == "888888|Y06" || m.Parameter == "888888|Y07" || m.Parameter == "888888|Y08");
|
||||||
|
|
||||||
if (hangList.Any())
|
if (hangList.Any())
|
||||||
{
|
{
|
||||||
|
ResultMessageModel datapar= hangList.FirstOrDefault();
|
||||||
|
string[] str= datapar.Parameter.Split('|');
|
||||||
#region 挂起
|
#region 挂起
|
||||||
LogHelper.WriteLogInfo("挂起" + data.Parameter + "-------通道" + data.Block);
|
LogHelper.WriteLogInfo("挂起" + data.Parameter + "-------工号" + str[1]);
|
||||||
// LabelParamModel FORMATEModel = new LabelParamModel();
|
// LabelParamModel FORMATEModel = new LabelParamModel();
|
||||||
// FORMATEModel.ControlIP = data.IP;
|
// FORMATEModel.ControlIP = data.IP;
|
||||||
// comBLL.FORMATE_JOB_DATA(FORMATEModel);
|
// comBLL.FORMATE_JOB_DATA(FORMATEModel);
|
||||||
|
DataTable qdt = queueBLL.getQueuesOrderbyState(data.Block, data.Area, "1", str[1]);
|
||||||
|
|
||||||
DataTable qdt = queueBLL.getQueuesOrderbyState(data.Block, data.Area, "1");
|
|
||||||
if (qdt != null && qdt.Rows.Count > 0)
|
if (qdt != null && qdt.Rows.Count > 0)
|
||||||
{
|
{
|
||||||
scanStr = qdt.Rows[0]["sku"].ToString();
|
scanStr = qdt.Rows[0]["sku"].ToString();
|
||||||
ShowMessageModel_M show = new ShowMessageModel_M();
|
//ShowMessageModel_M show = new ShowMessageModel_M();
|
||||||
show.Block = data.Block;
|
//show.Block = data.Block;
|
||||||
show.Area = data.Area;
|
//show.Area = data.Area;
|
||||||
show.Type = 8;
|
//show.Type = 8;
|
||||||
|
|
||||||
comBLL.RemoveBoxMessage_M(show);
|
//comBLL.RemoveBoxMessage_M(show);
|
||||||
// data.Parameter = scanStr;
|
// data.Parameter = scanStr;
|
||||||
Hangup_SKU(scanStr, data.Block, data.Area,matchid);
|
Hangup_SKU(scanStr, data.Block, data.Area,matchid);
|
||||||
//删除sku对应缓存
|
//删除sku对应缓存
|
||||||
@ -498,8 +497,8 @@ namespace Epost.BLL
|
|||||||
qmodel.Matchid = umodel.Matchid;
|
qmodel.Matchid = umodel.Matchid;
|
||||||
// qmodel.Location = location;
|
// qmodel.Location = location;
|
||||||
qmodel.Shopid = echoDt.Rows[0]["GoodsName"].ToString();
|
qmodel.Shopid = echoDt.Rows[0]["GoodsName"].ToString();
|
||||||
|
qmodel.State = 2;
|
||||||
qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Blue);
|
qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Pink);
|
||||||
queueBLL.insertQueueOrders(qmodel);
|
queueBLL.insertQueueOrders(qmodel);
|
||||||
|
|
||||||
|
|
||||||
@ -562,7 +561,7 @@ namespace Epost.BLL
|
|||||||
{
|
{
|
||||||
|
|
||||||
LabelParamModel lamodel = new LabelParamModel();
|
LabelParamModel lamodel = new LabelParamModel();
|
||||||
lamodel.Address = item["address"].ToString(); ;
|
lamodel.Address = item["address"].ToString();
|
||||||
lamodel.ControlIP = item["ControlIP"].ToString();
|
lamodel.ControlIP = item["ControlIP"].ToString();
|
||||||
lamodel.Command = "REMOVE_JOB";
|
lamodel.Command = "REMOVE_JOB";
|
||||||
lamodel.Parameter = "";
|
lamodel.Parameter = "";
|
||||||
@ -575,6 +574,7 @@ namespace Epost.BLL
|
|||||||
Unlockmodel.Command = "UNLOCK";
|
Unlockmodel.Command = "UNLOCK";
|
||||||
Unlockmodel.Type = "N";
|
Unlockmodel.Type = "N";
|
||||||
Unlockmodel.Parameter = "11111000";
|
Unlockmodel.Parameter = "11111000";
|
||||||
|
Unlockmodel.Uid = "UN"+ item["address"].ToString();
|
||||||
list.Add(Unlockmodel);
|
list.Add(Unlockmodel);
|
||||||
if (item["oprationstate"].ToString() == "1")
|
if (item["oprationstate"].ToString() == "1")
|
||||||
{
|
{
|
||||||
|
@ -83,7 +83,7 @@ namespace Epost.DAL
|
|||||||
|
|
||||||
|
|
||||||
#region 获取回显订单信息
|
#region 获取回显订单信息
|
||||||
public DataTable GetOrderList_echo(string matchid, string sku, string area, string block)
|
public DataTable GetOrderList_echo(string matchid, string sku, string area, string block,string usercode="")
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@ -92,6 +92,10 @@ namespace Epost.DAL
|
|||||||
{
|
{
|
||||||
strwhere = "and matchid= '" + matchid + "'";
|
strwhere = "and matchid= '" + matchid + "'";
|
||||||
}
|
}
|
||||||
|
if (!string.IsNullOrEmpty(usercode))
|
||||||
|
{
|
||||||
|
strwhere += "and info= '" + usercode + "'";
|
||||||
|
}
|
||||||
string sql = string.Empty;
|
string sql = string.Empty;
|
||||||
if (!string.IsNullOrEmpty(area))
|
if (!string.IsNullOrEmpty(area))
|
||||||
{
|
{
|
||||||
@ -1171,13 +1175,11 @@ namespace Epost.DAL
|
|||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region 删除订单信息
|
#region 删除订单信息
|
||||||
public bool DelOrder(string matchid, string orderid)
|
public bool DelOrder(string strwhere)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
string sql = string.Format(" delete from orders where orderid ='{0}' and matchid='{1}' and oprationstate=3 and state =3 ",
|
string sql = string.Format(" delete from orders where state =3 "+strwhere);
|
||||||
orderid,
|
|
||||||
matchid);
|
|
||||||
LogHelper.WriteLogInfo("-删除订单信息:" + sql);
|
LogHelper.WriteLogInfo("-删除订单信息:" + sql);
|
||||||
long x = db.DeleteSql(sql);
|
long x = db.DeleteSql(sql);
|
||||||
if (x > 0)
|
if (x > 0)
|
||||||
@ -1229,7 +1231,7 @@ namespace Epost.DAL
|
|||||||
#region 查询标签所在区
|
#region 查询标签所在区
|
||||||
public DataTable getArea(string address, string ip)
|
public DataTable getArea(string address, string ip)
|
||||||
{
|
{
|
||||||
string sql = string.Format("select area,block,way,type from v_address where address='{0}' and ControlIP='{1}' group by block,area,way,type",
|
string sql = string.Format("select area,block,way,type,info from v_address where address='{0}' and ControlIP='{1}' group by block,area,way,type,info",
|
||||||
address,
|
address,
|
||||||
ip);
|
ip);
|
||||||
LogHelper.WriteLogInfo("查询标签所在区getArea:" + sql);
|
LogHelper.WriteLogInfo("查询标签所在区getArea:" + sql);
|
||||||
|
@ -44,7 +44,7 @@ namespace Epost.DAL
|
|||||||
#endregion
|
#endregion
|
||||||
#region 获取任务信息
|
#region 获取任务信息
|
||||||
public DataTable getQueuesOrderbyState(string state="0")
|
public DataTable getQueuesOrderbyState(string state="0")
|
||||||
{
|
{
|
||||||
string sql = string.Format("select * from OrdersQueue where state ='{0}'",
|
string sql = string.Format("select * from OrdersQueue where state ='{0}'",
|
||||||
state);
|
state);
|
||||||
// LogHelper.WriteLogInfo("获取正在绑定的信息" + sql);
|
// LogHelper.WriteLogInfo("获取正在绑定的信息" + sql);
|
||||||
@ -54,9 +54,14 @@ namespace Epost.DAL
|
|||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region 获取queue信息
|
#region 获取queue信息
|
||||||
public DataTable getQueuesOrderbyState(string block,string area,string state)
|
public DataTable getQueuesOrderbyState(string block,string area,string state,string usercode)
|
||||||
{
|
{
|
||||||
string sql = string.Format("select * from OrdersQueue where (state ='{0}' or state='0') and taskblock='{1}' and taskarea='{2}' ",
|
string strwhere = string.Empty;
|
||||||
|
if (!string.IsNullOrEmpty(usercode))
|
||||||
|
{
|
||||||
|
strwhere += " and usercode= '" + usercode + "'";
|
||||||
|
}
|
||||||
|
string sql = string.Format("select * from OrdersQueue where (state ='{0}' or state='0') and taskblock='{1}' and taskarea='{2}' "+ strwhere,
|
||||||
state,
|
state,
|
||||||
block,
|
block,
|
||||||
area);
|
area);
|
||||||
@ -311,10 +316,10 @@ namespace Epost.DAL
|
|||||||
{
|
{
|
||||||
strwhere += "and Taskarea='" + model.Taskarea + "'";
|
strwhere += "and Taskarea='" + model.Taskarea + "'";
|
||||||
}
|
}
|
||||||
string sql = string.Format("update OrdersQueue set state='{0}' where state<>3 and sku = '{1}' and matchid='{2}' "+ strwhere,
|
string sql = string.Format("update OrdersQueue set state='{0}' where state<>3 and usercode = '{1}' "+ strwhere,
|
||||||
model.State
|
model.State
|
||||||
,model.Sku,
|
,model.UserCode
|
||||||
model.Matchid
|
|
||||||
|
|
||||||
);
|
);
|
||||||
LogHelper.WriteLogInfo("修改作业区段"+sql);
|
LogHelper.WriteLogInfo("修改作业区段"+sql);
|
||||||
|
@ -26,6 +26,7 @@ namespace Epost.Model
|
|||||||
private string _W_Quantity = string.Empty;
|
private string _W_Quantity = string.Empty;
|
||||||
private string _Quantity = string.Empty;
|
private string _Quantity = string.Empty;
|
||||||
private string _Rfcode = string.Empty;
|
private string _Rfcode = string.Empty;
|
||||||
|
private string _info = string.Empty;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -132,5 +133,6 @@ namespace Epost.Model
|
|||||||
public string Rfcode { get => _Rfcode; set => _Rfcode = value; }
|
public string Rfcode { get => _Rfcode; set => _Rfcode = value; }
|
||||||
public string W_Quantity { get => _W_Quantity; set => _W_Quantity = value; }
|
public string W_Quantity { get => _W_Quantity; set => _W_Quantity = value; }
|
||||||
public string Quantity { get => _Quantity; set => _Quantity = value; }
|
public string Quantity { get => _Quantity; set => _Quantity = value; }
|
||||||
|
public string Info { get => _info; set => _info = value; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -50,6 +50,7 @@ namespace Epost.TestToolsWeb.Controllers
|
|||||||
data.Block = sdt.Rows[0]["Block"].ToString();
|
data.Block = sdt.Rows[0]["Block"].ToString();
|
||||||
data.Type = sdt.Rows[0]["type"].ToString();
|
data.Type = sdt.Rows[0]["type"].ToString();
|
||||||
data.Way = sdt.Rows[0]["way"].ToString();
|
data.Way = sdt.Rows[0]["way"].ToString();
|
||||||
|
data.Info = sdt.Rows[0]["info"].ToString();
|
||||||
}
|
}
|
||||||
if (data.Command == "QUERY_SPECIAL_STATUS")//扫描枪返回
|
if (data.Command == "QUERY_SPECIAL_STATUS")//扫描枪返回
|
||||||
{
|
{
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TimeStampOfAssociatedLegacyPublishXmlFile />
|
<TimeStampOfAssociatedLegacyPublishXmlFile />
|
||||||
<_PublishTargetUrl>D:\驿传\GuangzhouHuiFeng_DAS</_PublishTargetUrl>
|
<_PublishTargetUrl>D:\驿传\GuangzhouHuiFeng_DAS</_PublishTargetUrl>
|
||||||
<History>True|2025-06-27T09:35:33.5131523Z||;True|2025-06-26T17:43:01.0379434+08:00||;True|2025-06-26T17:35:14.4249922+08:00||;True|2025-06-26T16:52:50.3133122+08:00||;True|2025-06-26T14:43:53.4124674+08:00||;True|2025-06-26T14:36:49.8290629+08:00||;True|2025-06-26T14:32:48.0261661+08:00||;True|2025-06-26T14:25:41.0829044+08:00||;True|2025-06-26T11:51:25.0046611+08:00||;True|2025-06-26T10:39:18.2677815+08:00||;True|2025-06-24T19:52:28.3640036+08:00||;True|2025-06-24T19:41:27.8431415+08:00||;True|2025-06-24T19:02:20.3384315+08:00||;True|2025-06-24T14:58:06.2128620+08:00||;False|2025-06-24T14:57:07.8710970+08:00||;True|2025-06-24T14:54:53.0047658+08:00||;True|2025-06-24T14:21:21.1147627+08:00||;False|2025-06-24T14:20:37.2040902+08:00||;True|2025-06-24T13:14:08.5696828+08:00||;True|2025-06-24T11:28:41.9414169+08:00||;False|2025-06-24T11:28:18.5427055+08:00||;True|2025-06-23T18:49:19.8150434+08:00||;False|2025-06-23T18:47:53.8200239+08:00||;True|2025-06-23T18:13:17.9954519+08:00||;True|2025-06-16T16:39:46.1896351+08:00||;True|2025-06-04T15:01:49.8008687+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>
|
<History>True|2025-06-30T00:52:19.2275165Z||;True|2025-06-30T08:51:25.4626932+08:00||;True|2025-06-28T16:15:03.8714874+08:00||;True|2025-06-28T16:09:07.6965176+08:00||;True|2025-06-28T15:34:51.7432575+08:00||;True|2025-06-28T14:46:14.4119481+08:00||;True|2025-06-28T14:14:50.7601565+08:00||;True|2025-06-27T17:35:33.5131523+08:00||;True|2025-06-26T17:43:01.0379434+08:00||;True|2025-06-26T17:35:14.4249922+08:00||;True|2025-06-26T16:52:50.3133122+08:00||;True|2025-06-26T14:43:53.4124674+08:00||;True|2025-06-26T14:36:49.8290629+08:00||;True|2025-06-26T14:32:48.0261661+08:00||;True|2025-06-26T14:25:41.0829044+08:00||;True|2025-06-26T11:51:25.0046611+08:00||;True|2025-06-26T10:39:18.2677815+08:00||;True|2025-06-24T19:52:28.3640036+08:00||;True|2025-06-24T19:41:27.8431415+08:00||;True|2025-06-24T19:02:20.3384315+08:00||;True|2025-06-24T14:58:06.2128620+08:00||;False|2025-06-24T14:57:07.8710970+08:00||;True|2025-06-24T14:54:53.0047658+08:00||;True|2025-06-24T14:21:21.1147627+08:00||;False|2025-06-24T14:20:37.2040902+08:00||;True|2025-06-24T13:14:08.5696828+08:00||;True|2025-06-24T11:28:41.9414169+08:00||;False|2025-06-24T11:28:18.5427055+08:00||;True|2025-06-23T18:49:19.8150434+08:00||;False|2025-06-23T18:47:53.8200239+08:00||;True|2025-06-23T18:13:17.9954519+08:00||;True|2025-06-16T16:39:46.1896351+08:00||;True|2025-06-04T15:01:49.8008687+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 />
|
<LastFailureDetails />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@ -33,19 +33,19 @@
|
|||||||
<publishTime>04/04/2018 15:45:12</publishTime>
|
<publishTime>04/04/2018 15:45:12</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/App_global.asax.compiled">
|
<File Include="bin/App_global.asax.compiled">
|
||||||
<publishTime>06/27/2025 17:35:27</publishTime>
|
<publishTime>06/30/2025 08:52:16</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/App_global.asax.dll">
|
<File Include="bin/App_global.asax.dll">
|
||||||
<publishTime>06/27/2025 17:35:27</publishTime>
|
<publishTime>06/30/2025 08:52:16</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/BouncyCastle.Crypto.dll">
|
<File Include="bin/BouncyCastle.Crypto.dll">
|
||||||
<publishTime>02/24/2020 15:29:24</publishTime>
|
<publishTime>02/24/2020 15:29:24</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/Common.dll">
|
<File Include="bin/Common.dll">
|
||||||
<publishTime>06/27/2025 11:53:36</publishTime>
|
<publishTime>06/28/2025 15:34:36</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/Common.pdb">
|
<File Include="bin/Common.pdb">
|
||||||
<publishTime>06/27/2025 11:53:36</publishTime>
|
<publishTime>06/28/2025 15:34:36</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/ComposerSDK.dll">
|
<File Include="bin/ComposerSDK.dll">
|
||||||
<publishTime>04/29/2020 16:50:14</publishTime>
|
<publishTime>04/29/2020 16:50:14</publishTime>
|
||||||
@ -63,31 +63,31 @@
|
|||||||
<publishTime>10/23/2017 13:15:20</publishTime>
|
<publishTime>10/23/2017 13:15:20</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/Epost.BLL.dll">
|
<File Include="bin/Epost.BLL.dll">
|
||||||
<publishTime>06/27/2025 17:35:04</publishTime>
|
<publishTime>06/30/2025 08:51:02</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/Epost.BLL.pdb">
|
<File Include="bin/Epost.BLL.pdb">
|
||||||
<publishTime>06/27/2025 17:35:04</publishTime>
|
<publishTime>06/30/2025 08:51:02</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/Epost.BLL.XmlSerializers.dll">
|
<File Include="bin/Epost.BLL.XmlSerializers.dll">
|
||||||
<publishTime>08/26/2020 18:09:48</publishTime>
|
<publishTime>08/26/2020 18:09:48</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/Epost.DAL.dll">
|
<File Include="bin/Epost.DAL.dll">
|
||||||
<publishTime>06/27/2025 11:53:37</publishTime>
|
<publishTime>06/28/2025 15:34:37</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/Epost.DAL.pdb">
|
<File Include="bin/Epost.DAL.pdb">
|
||||||
<publishTime>06/27/2025 11:53:37</publishTime>
|
<publishTime>06/28/2025 15:34:37</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/Epost.DPS.dll">
|
<File Include="bin/Epost.DPS.dll">
|
||||||
<publishTime>06/27/2025 17:35:09</publishTime>
|
<publishTime>06/30/2025 08:51:06</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/Epost.DPS.pdb">
|
<File Include="bin/Epost.DPS.pdb">
|
||||||
<publishTime>06/27/2025 17:35:09</publishTime>
|
<publishTime>06/30/2025 08:51:06</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/Epost.Model.dll">
|
<File Include="bin/Epost.Model.dll">
|
||||||
<publishTime>06/27/2025 11:53:36</publishTime>
|
<publishTime>06/28/2025 15:34:35</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/Epost.Model.pdb">
|
<File Include="bin/Epost.Model.pdb">
|
||||||
<publishTime>06/27/2025 11:53:36</publishTime>
|
<publishTime>06/28/2025 15:34:35</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/Epost.TestToolsWeb.dll">
|
<File Include="bin/Epost.TestToolsWeb.dll">
|
||||||
<publishTime>09/06/2018 11:57:11</publishTime>
|
<publishTime>09/06/2018 11:57:11</publishTime>
|
||||||
@ -5661,7 +5661,7 @@
|
|||||||
<publishTime>05/30/2022 16:58:47</publishTime>
|
<publishTime>05/30/2022 16:58:47</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="PrecompiledApp.config">
|
<File Include="PrecompiledApp.config">
|
||||||
<publishTime>06/27/2025 17:35:12</publishTime>
|
<publishTime>06/30/2025 08:52:09</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="Scripts/ai.0.22.9-build00167.js">
|
<File Include="Scripts/ai.0.22.9-build00167.js">
|
||||||
<publishTime>04/04/2018 15:45:12</publishTime>
|
<publishTime>04/04/2018 15:45:12</publishTime>
|
||||||
|
Reference in New Issue
Block a user