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

Browse Source
This commit is contained in:
帅凯 贾
2023-08-30 17:23:23 +08:00
parent 07985264fa
commit 07d01e0cd0
10 changed files with 525 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Epost.BLL/CommandBLL.cs
View File

@ -677,6 +677,30 @@ namespace Epost.BLL
#endregion
#region 点亮指定区域通道灯
public bool DISPLAY_LIGHT_BLOCK_Out(string block, string area, string isoff)
{
DataTable dt = addrBLL.GetBoxAddress(block, area, 6);
List<LabelParamModel> list = new List<LabelParamModel>();
if (dt != null && dt.Rows.Count > 0)
{
foreach (DataRow item in dt.Rows)
{
LabelParamModel model = new LabelParamModel();
model.Command = "DISPLAY_LIGHT";
model.Timeout = "0.5";
model.Type = "T";
model.Address = item["address"].ToString();
model.ControlIP = item["ControlIP"].ToString();
model.Parameter = ConvertHexHelper.ConvertString(item["addresstype"].ToString(), 10, 16).ToString().PadLeft(2, '0') + isoff;
list.Add(model);
}
dal.SendALL(list);
}
return true;
}
public bool DISPLAY_LIGHT_BLOCK(string block, string area, string isoff)
{

6
Epost.BLL/OrderBLL.cs
View File

@ -409,7 +409,7 @@ namespace Epost.BLL
else
{
dal.UpdateWorkState_Car(model.OrderID, truequantity, model.Sku, model.ID, checkquaantity, model.UserCode);
dal.UpdateWorkState(model.OrderID, truequantity, model.Sku, model.ID, checkquaantity, model.UserCode);
}
@ -846,9 +846,9 @@ namespace Epost.BLL
}
}
public DataTable GetOrderList(string area, string block)
public DataTable GetOrderList(string Orderid, string area, string block)
{
return dal.GetOrderList(area, block);
return dal.GetOrderList(Orderid, area, block);
}
#endregion

122
Epost.BLL/OrderControlBLL.cs
View File

@ -212,8 +212,11 @@ namespace Epost.BLL
{
try
{
List<JobModel> jobList = JobCache.GetPlanJobList().FindAll(x => x.OrderID == orderid);
ResultModel resultModel = comBLL.Forcedend(orderid);
JobCache.UpdateJobModelList(jobList, EcommendType.Execute);
return resultModel;
}
catch (Exception ex)
@ -416,8 +419,8 @@ namespace Epost.BLL
}
}
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
List<JobModel> rjob = job.FindAll(m => m.Block == data.Block && m.State == 3);
JobCache.UpdateJobModelList(rjob, EcommendType.Execute);
List<JobModel> finList = jobList.FindAll(m => m.Block == block && m.Area == area && m.State == 3);
JobCache.UpdateJobModelList(finList, EcommendType.Execute);
}
#endregion
@ -457,35 +460,41 @@ namespace Epost.BLL
#endregion
orderbll.UpdateOrderState_Car(downlist, model, truequantity, checkquantity);
LogHelper.WriteLogInfo("标记------" + data.Address + "------" + model.Sku + "----" + model.State + "");
bool skuInish = dal.IsFinishWork(1, block, "", area, "", "", model.OrderID);
LogHelper.WriteLogInfo("拍下------" + data.Address + "------" + model.OrderID + "----" + model.State + "");
//bool skuInish = dal.IsFinishWork(1, block, "", area, "", "", model.OrderID);
bool skuInish = dal.IsFinishWork(1, block, "", area, "", "", "");
if (skuInish)
{
LogHelper.WriteLogInfo(data.Address + "=========------------------" + data.Parameter);
//LogHelper.WriteLogInfo(data.Address + "=========------------------" + data.Parameter);
comBLL.DISPLAY_LIGHT_BLOCK(model.Block, data.Area, "0");
LogHelper.WriteLogInfo("区SKU拣选完成--------------");
LogHelper.WriteLogInfo("通道拣货完成--------------");
//删除sku缓存信息
//List<JobModel> rjob = jobList.FindAll(m => m.Block == data.Block && m.Area == data.Area && m.Sku == model.Sku);
//JobCache.UpdateJobModelList(rjob, EcommendType.Execute);
bool allfinish = dal.IsFinishWork_box("", 0, model.OrderID);
if (allfinish)
{
//bool allfinish = dal.IsFinishWork_box("", 0, model.OrderID);
//if (allfinish)
//{
#region 修改任务队列状态
OrdersQueueModel qumodel = new OrdersQueueModel();
qumodel.State = 3;
qumodel.Taskblock = block;
qumodel.Taskarea = area;
qumodel.Orderid = model.OrderID;
//qumodel.Orderid = model.OrderID;
queueBLL.UpdateQueueTaskArea_Car(qumodel);
#endregion
//修改订单状态
dal.UpdateStateByCar(model.OrderID);
dal.UpdateState(model.Area, model.Block);
bool WorkArea = dal.IsFinishWorkArea("", "", "99", "", "", "");
if (skuInish)
{
comBLL.DISPLAY_LIGHT_BLOCK_Out("", model.Area, "0");
}
//}
}
}
@ -522,24 +531,37 @@ namespace Epost.BLL
//当前区没有作业
if (queueDT.Rows[0]["state"].ToString() == "0")
{
displayOrder(queueDT, nblock, narea, list, model);
model.Id = Convert.ToInt32(queueDT.Rows[0]["id"].ToString());
model.State = 1;
//orderbll.GetOrderList(queueDT.Rows[0]["Orderid"].ToString(), nblock, "", narea, queueDT.Rows[0]["usercode"].ToString());
//orderbll.GetOrderList("", nblock, "", narea, queueDT.Rows[0]["usercode"].ToString());
queueBLL.UpdateQueueOrderState(model);//缓存队列状态修改
}
DataTable orderdt = orderbll.GetOrderList("", narea, nblock);
if (orderdt != null && orderdt.Rows.Count > 0)
{
orderbll.GetOrderList("", nblock, "", narea, queueDT.Rows[0]["usercode"].ToString());
}
}
else
{
DataTable orderdt = orderbll.GetOrderList(narea, nblock);
DataTable QueueDt = queueBLL.getQueueState(model);
if (QueueDt == null || QueueDt.Rows.Count <= 0)
{
DataTable orderdt = orderbll.GetOrderList("", narea, nblock);
if (orderdt != null && orderdt.Rows.Count > 0)
{
OrdersQueueModel qmodel = new OrdersQueueModel();
qmodel.Taskblock = nblock;
qmodel.Taskarea = narea;
qmodel.UserCode = "";
qmodel.Orderid = orderdt.Rows[0]["orderid"].ToString();
//qmodel.Orderid = orderdt.Rows[0]["orderid"].ToString();
queueBLL.insertQueueOrders(qmodel);
}
}
}
displayOrder(queueDT, nblock, narea, list, model);
#endregion
}
@ -558,29 +580,28 @@ namespace Epost.BLL
#region 点亮设备
public void displayOrder(DataTable queueDT, string nblock, string narea, List<LabelParamModel> list, OrdersQueueModel model)
{
model.Id = Convert.ToInt32(queueDT.Rows[0]["id"].ToString());
#region 点亮任务
List<JobModel> jobList = JobCache.GetPlanJobList();
List<JobModel> isJobList = jobList.FindAll(p => p.Block == nblock && p.Area == narea && p.State != 3);
ShowMessageModel showmodel = new ShowMessageModel();
//获取当前区任务并加入缓存
if (!isJobList.Any())
if (queueDT != null && queueDT.Rows.Count > 0)
{
model.State = 1;
orderbll.GetOrderList(queueDT.Rows[0]["Orderid"].ToString(), nblock, "", narea, queueDT.Rows[0]["usercode"].ToString());
ShowMessageModel showmodel = new ShowMessageModel();
////获取当前区任务并加入缓存
//if (!isJobList.Any())
//{
List<JobModel> nowJoblist = jobList.FindAll(p => p.State == 0 && p.Block == model.Taskblock && p.Area == model.Taskarea);
if (nowJoblist.Any())
{
var nowmodel = nowJoblist.FirstOrDefault();
LogHelper.WriteLogInfo("进入任务点亮=====matchid=" + nowmodel.Matchid + "===orderid===" + nowmodel.OrderID + "=====");
#region 点亮任务标s签
foreach (JobModel item in nowJoblist.ToArray())
{
if (item.State == 0)
List<JobModel> isshowList = jobList.FindAll(p => p.Address == item.Address && p.ControlIP == item.ControlIP && p.State == 1);
if (!isshowList.Any())
{
#region
#region 判断同一订单、同一货位多条数据 合并显示
//List<JobModel> manyJoblist = nowJoblist.FindAll(m => m.Tolocation == item.Tolocation);
int quantity = item.Quantity;
@ -599,10 +620,6 @@ namespace Epost.BLL
//}
#endregion
//if (item.Tolocation.Contains("-"))
//{
// var aryloc = item.Tolocation.Split('-');
//}
LabelParamModel lamodel = new LabelParamModel();
string address = item.Address.ToString();
lamodel.Address = address;
@ -616,7 +633,7 @@ namespace Epost.BLL
lamodel.Loc = "" + aryloc[0].ToString() + "-" + aryloc[1].ToString() + "";
lamodel.W_quantity = aryloc[2].ToString();
lamodel.Quantity = quantity.ToString();
lamodel.Unit = "盒";
lamodel.Unit = item.Unit;
lamodel.PicChoose = "";
#region 看似听似
if (item.looklisten == "18")
@ -678,14 +695,30 @@ namespace Epost.BLL
list.Add(lamodel);
item.State = 1;
item.DisplayTime = DateTime.Now;
#region 点亮通道灯
List<JobModel> isJobListss = jobList.FindAll(p => p.Area == narea && p.Block == nblock && p.State == 1);
if (!isJobListss.Any())
{
comBLL.DISPLAY_LIGHT_BLOCK(model.Taskblock, model.Taskarea, "F");
}
List<JobModel> isJobLists = jobList.FindAll(p => p.Area == narea && p.State == 1);
if (!isJobLists.Any())
{
comBLL.DISPLAY_LIGHT_BLOCK_Out("", model.Taskarea, "F");
}
#endregion
#region 点亮通道灯
comBLL.DISPLAY_LIGHT_BLOCK(model.Taskblock, model.Taskarea, "1");
item.State = 1;
item.DisplayTime = DateTime.Now;
#endregion
}
#endregion
}
if (list != null && list.Count > 0)
{
@ -693,21 +726,14 @@ namespace Epost.BLL
comBLL.DISPLAY_JOBALL(list);
}
}
else
{//无任务
LogHelper.WriteLogInfo("点亮====无任务=======================");
model.State = 3;
}
//else
//{//无任务
// LogHelper.WriteLogInfo("点亮====无任务=======================");
// model.State = 3;
// queueBLL.UpdateQueueOrderState(model);//缓存队列状态修改
//}
#endregion
if (jobList.Any())
{
var finishList = jobList.FindAll(p => p.State == 0);
if (!finishList.Any())
{
queueBLL.UpdateQueueOrderState(model);//缓存队列状态修改
}
}
}
//else
//{

12
Epost.DAL/AddressstorageDAL.cs
View File

@ -163,13 +163,17 @@ namespace Epost.DAL
string strwhere = string.Empty;
if (!string.IsNullOrEmpty(area))
{
strwhere = " and area='"+area+"'";
strwhere += " and area='" + area + "'";
}
string sql = string.Format("select address,bkaddress,state,type,area,way,shelfid,ControlID,location,layer,slist,block,addresstype,ControlIP,ControlType,info from V_address where type='{1}' and block='{0}' " + strwhere,
if (!string.IsNullOrEmpty(block))
{
strwhere += " and block='" + block + "'";
}
string sql = string.Format("select address,bkaddress,state,type,area,way,shelfid,ControlID,location,layer,slist,block,addresstype,ControlIP,ControlType,info from V_address where type='{1}' " + strwhere,
block,
type);
LogHelper.WriteLogInfo("根据区域 查询显示地址"+sql);
LogHelper.WriteLogInfo("根据区域 查询显示地址---通道灯" + sql);
return db.GetsqlForDT(sql);
}
@ -812,7 +816,7 @@ namespace Epost.DAL
#region 根据订单获取要熄灭的标签
public DataTable GetForcedendAddress(string orderid)
{
string sql = string.Format("select * from v_orders where orderid='20416' and oprationstate!=3");
string sql = string.Format("select distinct ControlIP,address from v_orders where orderid='" + orderid + "' and oprationstate!=3");
DataTable dt = db.GetsqlForDT(sql);
return dt;
}

149
Epost.DAL/OrdersDAL.cs
View File

@ -52,7 +52,7 @@ namespace Epost.DAL
string sql = string.Empty;
if (!string.IsNullOrEmpty(area))
{
sql = string.Format("select id,transderDid,orderid,Sku,genericname,GoodsName,Spec,unit,batchno,manufactname,Quantity,stockquantity,shopname,Tolocation,labelcolor,looklisten,labelIP,labelno,Matchid,barcode,BatchId,DownDate,Discount,address,ControlIP,area,block,shopid from v_orders where state = 0 and oprationstate <>3 and block = '{1}' and area='{2}' " + strwhere + "",
sql = string.Format("select id,transderDid,orderid,Sku,genericname,GoodsName,Spec,Unit,batchno,manufactname,Quantity,stockquantity,shopname,Tolocation,labelcolor,looklisten,labelIP,labelno,Matchid,barcode,BatchId,DownDate,Discount,address,ControlIP,area,block,shopid from v_orders where state = 0 and oprationstate =0 and block = '{1}' and area='{2}' " + strwhere + "",
sku,
block, area);
@ -60,7 +60,7 @@ namespace Epost.DAL
}
else
{
sql = string.Format("select id,transderDid,orderid,Sku,genericname,GoodsName,Spec,unit,batchno,manufactname,Quantity,stockquantity,shopname,Tolocation,labelcolor,looklisten,labelIP,labelno,Matchid,barcode,BatchId,DownDate,Discount,address,ControlIP,area,block,shopid from v_orders where state = 0 and oprationstate <>3 and sku = '{0}' and block = '{1}' " + strwhere + "",
sql = string.Format("select id,transderDid,orderid,Sku,genericname,GoodsName,Spec,Unit,batchno,manufactname,Quantity,stockquantity,shopname,Tolocation,labelcolor,looklisten,labelIP,labelno,Matchid,barcode,BatchId,DownDate,Discount,address,ControlIP,area,block,shopid from v_orders where state = 0 and oprationstate =0 and sku = '{0}' and block = '{1}' " + strwhere + "",
sku,
block);
@ -78,13 +78,16 @@ namespace Epost.DAL
}
}
public DataTable GetOrderList(string area, string block)
public DataTable GetOrderList(string Orderid, string area, string block)
{
try
{
string strwhere = string.Empty;
string sql = string.Format("select id,transderDid,orderid,Sku,genericname,GoodsName,Spec,unit,batchno,manufactname,Quantity,stockquantity,shopname,Tolocation,labelcolor,looklisten,labelIP,labelno,Matchid,barcode,BatchId,DownDate,Discount,address,ControlIP,area,block,shopid from v_orders where state = 0 and oprationstate <>3 and block = '{0}' and area='{1}' " + strwhere + "",
if (!string.IsNullOrEmpty(Orderid))
{
strwhere += " and orderid='" + Orderid + "'";
}
string sql = string.Format("select id,transderDid,orderid,Sku,genericname,GoodsName,Spec,unit,batchno,manufactname,Quantity,stockquantity,shopname,Tolocation,labelcolor,looklisten,labelIP,labelno,Matchid,barcode,BatchId,DownDate,Discount,address,ControlIP,area,block,shopid from v_orders where state = 0 and oprationstate=0 and block = '{0}' and area='{1}' " + strwhere + "",
block, area);
return db.GetsqlForDT(sql);
@ -504,7 +507,7 @@ namespace Epost.DAL
string sql = string.Empty;
if (!string.IsNullOrEmpty(id))
{
sql = string.Format(" update orders set oprationstate=1,oprationtime='{0}' where matchid='{1}' and id='{2}'",
sql = string.Format(" update orders set oprationstate=1,oprationtime='{0}' where orderid='{1}' and id='{2}'",
DateTime.Now.ToString(),
orderid,
@ -512,7 +515,7 @@ namespace Epost.DAL
}
else
{
sql = string.Format(" update orders set oprationstate=1,oprationtime='{0}' where matchid='{1}' and sku='{2}'",
sql = string.Format(" update orders set oprationstate=1,oprationtime='{0}' where orderid='{1}' and sku='{2}'",
DateTime.Now.ToString(),
orderid,
sku);
@ -691,6 +694,55 @@ namespace Epost.DAL
}
}
public bool UpdateWorkState(string orderid, int truequantity, string sku, string id, int checkquantity, string usercode = "")
{
try
{
lock (uplock)
{
int oprationstate = 3;
// string sql = string.Format("select quantity,truequantity from orders where matchid='{0}' and sku = '{1}' and batchid='{2}'",
// matchid,
// sku,
// batchid);
//DataTable dt= db.GetsqlForDT(sql);
// if (dt!=null&&dt.Rows.Count > 0)
// {
// int trueqty =Convert.ToInt32( dt.Rows[0]["truequantity"].ToString());
// int quantity =Convert.ToInt32( dt.Rows[0]["quantity"].ToString());
// if (trueqty + 1 == quantity)
// {
// oprationstate = 3;
// }
// truequantity = trueqty + 1;
// }
string upsql = string.Format("update orders set oprationstate = '{3}' ,oprationtime='{0}',oprationcode='{5}',truequantity=quantity where orderid='{2}' and id='{4}' ",
DateTime.Now.ToString(),
truequantity,
orderid,
oprationstate,
id,
// checkquantity,
usercode
);
long x = db.UpdateSql(upsql);
LogHelper.WriteLogInfo("修改当前标签拣货状态:" + upsql + ",成功条数：" + x + "");
if (x > 0)
return true;
return false;
}
}
catch (Exception ex)
{
LogHelper.WriteLogInfo("修改当前标签拣货状态异常：" + ex.Message);
return false;
}
}
#endregion
@ -768,6 +820,36 @@ namespace Epost.DAL
}
}
public bool UpdateState(string area, string block = "", string sku = "")
{
try
{
string strwhere = string.Empty;
if (!string.IsNullOrEmpty(block))
{
strwhere = " and block='" + block + "'";
}
if (!string.IsNullOrEmpty(sku))
{
strwhere += " and sku='" + sku + "'";
}
string upsql = string.Format("update v_orders set state=3 where area ='" + area + "' " + strwhere);
LogHelper.WriteLogInfo("修改通道拣货状态：" + upsql);
long x = db.UpdateSql(upsql);
if (x > 0)
return true;
return false;
}
catch (Exception ex)
{
LogHelper.WriteLogInfo("修改当前小车拣货状态：" + ex.Message);
return false;
}
}
#endregion
@ -1105,6 +1187,59 @@ namespace Epost.DAL
}
#endregion
#region
public bool IsFinishWorkArea(string block, string usercode = "", string area = "", string sku = "", string shopid = "", string orderid = "")
{
string strwheres = "";
if (!string.IsNullOrEmpty(usercode))
{
strwheres = " and sku in(select sku from ordersqueue where usercode = '" + usercode + "')";
}
if (!string.IsNullOrEmpty(sku))
{
strwheres += " and sku ='" + sku + "'";
}
if (!string.IsNullOrEmpty(block))
{
strwheres += " and block ='" + block + "'";
}
if (!string.IsNullOrEmpty(area))
{
strwheres += " and area ='" + area + "'";
}
if (!string.IsNullOrEmpty(orderid))
{
strwheres += " and orderid ='" + orderid + "'";
}
if (!string.IsNullOrEmpty(shopid))
{
strwheres += " and shopid ='" + shopid + "'";
}
if (!string.IsNullOrEmpty(orderid))
{
strwheres += " and orderid ='" + orderid + "'";
}
string sql = "select matchid, sku from V_orders where oprationstate <> 3 and state<>99 " + strwheres;
LogHelper.WriteLogInfo("判断阴凉区是否为已完成" + sql);
DataTable dt = db.GetsqlForDT(sql);
if (dt == null || dt.Rows.Count == 0)
{
LogHelper.WriteLogInfo("判断阴凉区是否为已完成true");
return true;
}
else
{
LogHelper.WriteLogInfo("判断阴凉区是否为已完成false");
return false;
}
}
#endregion
#region 查询下一区段区号
public int getOrderarea(string usercode, string block, string area)
{

18
Epost.DAL/OrdersQueueDAL.cs
View File

@ -89,7 +89,12 @@ namespace Epost.DAL
#region 获取当前区的作业状态
public DataTable getQueueOrderState(OrdersQueueModel model)
{
string sql = string.Format("select * from OrdersQueue where taskblock='{0}' and taskarea='{1}' and state<>2 and state<>3 order by sort",
string strwhere = string.Empty;
if (!string.IsNullOrEmpty(model.Orderid))
{
strwhere += " and orderid='" + model.Orderid + "'";
}
string sql = string.Format("select * from OrdersQueue where taskblock='{0}' and taskarea='{1}' and state<>2 and state<>3 " + strwhere + " order by sort",
model.Taskblock,
model.Taskarea);
return db.GetsqlForDT(sql);
@ -122,7 +127,7 @@ namespace Epost.DAL
#region 获取当前区的作业状态
public DataTable getQueueState(OrdersQueueModel model)
{
string sql = string.Format("select * from OrdersQueue where taskblock='{0}' and taskarea='{1}' and state=1",
string sql = string.Format("select * from OrdersQueue where state=1 and Taskblock='{0}' and Taskarea='{1}'",
model.Taskblock,
model.Taskarea);
return db.GetsqlForDT(sql);
@ -290,9 +295,12 @@ namespace Epost.DAL
{
strwhere += "and Taskarea='" + model.Taskarea + "'";
}
string sql = string.Format("update OrdersQueue set state='{0}' where state<>3 and orderid='{1}' and usercode='{2}'" + strwhere,
model.State,
model.Orderid,model.UserCode
if (!string.IsNullOrEmpty(model.Orderid))
{
strwhere += "and Orderid='" + model.Orderid + "'";
}
string sql = string.Format("update OrdersQueue set state='{0}' where state<>3 " + strwhere,
model.State
);
LogHelper.WriteLogInfo("修改作业区段" + sql);

2
Epost.TestToolsWeb/Epost.DPS.csproj.user
View File

@ -11,7 +11,7 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
<NameOfLastUsedPublishProfile>D:\驿传\Epost\T_DAS_PTL\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />

26
Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
View File

@ -7,7 +7,7 @@
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<_PublishTargetUrl>D:\驿传\抚远</_PublishTargetUrl>
<History>True|2023-08-11T02:59:03.8399200Z;True|2023-08-10T10:43:16.0729140+08:00;True|2023-08-08T15:22:08.0127989+08:00;True|2023-08-08T13:59:07.6838749+08:00;True|2023-08-08T13:57:15.7160673+08:00;True|2023-08-03T15:39:49.2488696+08:00;True|2023-08-03T13:13:24.0839734+08:00;True|2023-08-02T14:19:21.5188473+08:00;True|2023-08-02T10:44:46.7436910+08:00;True|2023-08-01T10:42:26.5280618+08:00;True|2023-07-28T15:54:24.3172356+08:00;True|2023-07-25T17:25:54.2443213+08:00;True|2023-07-25T17:24:33.4620388+08:00;True|2023-07-19T16:26:31.8476193+08:00;True|2023-07-19T16:04:27.8753884+08:00;True|2023-07-19T15:38:50.9706808+08:00;True|2023-07-03T13:53:41.0701316+08:00;True|2023-04-27T20:14:15.0331014+08:00;True|2023-04-21T16:37:45.9559800+08:00;True|2023-04-20T19:12:32.4520337+08:00;True|2023-04-20T18:51:17.9201241+08:00;True|2023-04-20T16:36:34.8353434+08:00;True|2023-04-19T11:42:01.7398184+08:00;True|2023-04-19T11:37:42.0024926+08:00;True|2023-04-18T15:36:56.8763198+08:00;True|2023-04-18T14:56:45.8672402+08:00;True|2023-04-17T10:51:00.4138485+08:00;True|2023-04-16T18:42:38.2510554+08:00;False|2023-04-16T18:42:10.5319125+08:00;True|2023-04-16T18:32:05.9038034+08:00;True|2023-04-16T17:11:22.6510841+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|2023-08-29T06:40:55.7436382Z;True|2023-08-29T13:53:07.9540335+08:00;True|2023-08-28T18:11:01.9231397+08:00;True|2023-08-28T14:56:19.8843265+08:00;True|2023-08-23T11:17:33.7204155+08:00;True|2023-08-11T10:59:03.8399200+08:00;True|2023-08-10T10:43:16.0729140+08:00;True|2023-08-08T15:22:08.0127989+08:00;True|2023-08-08T13:59:07.6838749+08:00;True|2023-08-08T13:57:15.7160673+08:00;True|2023-08-03T15:39:49.2488696+08:00;True|2023-08-03T13:13:24.0839734+08:00;True|2023-08-02T14:19:21.5188473+08:00;True|2023-08-02T10:44:46.7436910+08:00;True|2023-08-01T10:42:26.5280618+08:00;True|2023-07-28T15:54:24.3172356+08:00;True|2023-07-25T17:25:54.2443213+08:00;True|2023-07-25T17:24:33.4620388+08:00;True|2023-07-19T16:26:31.8476193+08:00;True|2023-07-19T16:04:27.8753884+08:00;True|2023-07-19T15:38:50.9706808+08:00;True|2023-07-03T13:53:41.0701316+08:00;True|2023-04-27T20:14:15.0331014+08:00;True|2023-04-21T16:37:45.9559800+08:00;True|2023-04-20T19:12:32.4520337+08:00;True|2023-04-20T18:51:17.9201241+08:00;True|2023-04-20T16:36:34.8353434+08:00;True|2023-04-19T11:42:01.7398184+08:00;True|2023-04-19T11:37:42.0024926+08:00;True|2023-04-18T15:36:56.8763198+08:00;True|2023-04-18T14:56:45.8672402+08:00;True|2023-04-17T10:51:00.4138485+08:00;True|2023-04-16T18:42:38.2510554+08:00;False|2023-04-16T18:42:10.5319125+08:00;True|2023-04-16T18:32:05.9038034+08:00;True|2023-04-16T17:11:22.6510841+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/16/2023 15:06:26</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>08/11/2023 10:58:36</publishTime>
<publishTime>08/30/2023 15:26:38</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>08/11/2023 10:58:36</publishTime>
<publishTime>08/30/2023 15:26:38</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>02/24/2020 15:29:24</publishTime>
</File>
<File Include="bin/Common.dll">
<publishTime>08/01/2023 10:41:25</publishTime>
<publishTime>08/29/2023 13:52:05</publishTime>
</File>
<File Include="bin/Common.pdb">
<publishTime>08/01/2023 10:41:25</publishTime>
<publishTime>08/29/2023 13:52:05</publishTime>
</File>
<File Include="bin/ComposerSDK.dll">
<publishTime>04/16/2023 15:06:26</publishTime>
@ -63,25 +63,25 @@
<publishTime>10/23/2017 13:15:20</publishTime>
</File>
<File Include="bin/Epost.BLL.dll">
<publishTime>08/11/2023 10:58:14</publishTime>
<publishTime>08/30/2023 15:23:28</publishTime>
</File>
<File Include="bin/Epost.BLL.pdb">
<publishTime>08/11/2023 10:58:14</publishTime>
<publishTime>08/30/2023 15:23:28</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>08/11/2023 10:58:13</publishTime>
<publishTime>08/29/2023 16:29:38</publishTime>
</File>
<File Include="bin/Epost.DAL.pdb">
<publishTime>08/11/2023 10:58:13</publishTime>
<publishTime>08/29/2023 16:29:38</publishTime>
</File>
<File Include="bin/Epost.DPS.dll">
<publishTime>08/11/2023 10:58:21</publishTime>
<publishTime>08/30/2023 15:26:31</publishTime>
</File>
<File Include="bin/Epost.DPS.pdb">
<publishTime>08/11/2023 10:58:21</publishTime>
<publishTime>08/30/2023 15:26:30</publishTime>
</File>
<File Include="bin/Epost.Model.dll">
<publishTime>07/19/2023 15:37:56</publishTime>
@ -5652,7 +5652,7 @@
<publishTime>04/16/2023 15:06:27</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>08/11/2023 10:58:26</publishTime>
<publishTime>08/30/2023 15:26:32</publishTime>
</File>
<File Include="Scripts/ai.0.22.9-build00167.js">
<publishTime>04/04/2018 15:45:12</publishTime>
@ -7572,7 +7572,7 @@
<publishTime>04/16/2023 15:06:27</publishTime>
</File>
<File Include="Web.config">
<publishTime>08/02/2023 10:43:56</publishTime>
<publishTime>08/30/2023 15:26:31</publishTime>
</File>
<File Include="WebService/WebService.asmx">
<publishTime>07/19/2023 15:30:16</publishTime>

4
Epost.TestToolsWeb/Web.config
View File

@ -25,11 +25,11 @@
<add key="ControlXML" value="/App_Data/EpostController.xml" />
<add key="LabelXML" value="/App_Data/AddressStorage.xml" />
<add key="ResultsXML" value="/App_Data/Results.xml" />
<add key="WebAPIUrl" value="http://localhost:63118/api/WebAPI/ProcessingResult"/>
<add key="WebAPIUrl" value="http://192.168.0.111:8081/api/WebAPI/ProcessingResult"/>
<add key="ShowMode" value="1" />
<add key="SetupMode" value="\Epost_P\Epost.TestToolsWeb\App_Data\SetupMode.txt" />
<add key="CARID" value="HT01" />
<add key="ServerAPIURL" value="http://localhost:63119/api/WebAPI" />
<add key="ServerAPIURL" value="http://localhost:63118/api/WebAPI" />
<add key="SleepTime" value="1" />
</appSettings>
<!--

12
Epost.TestToolsWeb/WebService/WebService.asmx.cs
View File

@ -28,11 +28,14 @@ namespace Epost.DPS.WebService
OrderBLL bll = new OrderBLL();
OrdersQueueBLL queueBLL = new OrdersQueueBLL();
CommandDAL dal = new CommandDAL();
private object obj = new object();
JobModelCacheDAL JobCache = new JobModelCacheDAL();
[WebMethod]
public string ReceiveDataInfo_XML(string action, string messages)
{
lock (obj)
{
LogHelper.WriteLogInfo("WebService请求报文：");
LogHelper.WriteLogInfo("action：" + action + "");
@ -51,7 +54,7 @@ namespace Epost.DPS.WebService
bool flag = true;
string mms = string.Empty;
LogHelper.WriteLogInfo("======开始处理数据======");
DataSet set = XmlHelper.GetDataSetStrXml(messages.Replace("&", "").Replace("#", ""));
DataSet set = XmlHelper.GetDataSetStrXml(messages.Replace("&", "").Replace("#", "").Replace("△", "").Replace("☆", "").Replace("=", "").Replace("】", "").Replace("【", "").Replace(" ","").Replace("\"", ""));
if (set != null && set.Tables.Count > 0 && set.Tables[0].Rows.Count > 0)
{
var ReturnDt = set.Tables["pick"];
@ -116,6 +119,7 @@ namespace Epost.DPS.WebService
dataRow["drugCommName"] = item["drugCommName"].ToString();
dataRow["drugName"] = item["drugName"].ToString();
dataRow["drugSpec"] = item["drugSpec"].ToString();
dataRow["Unit"] = item["Unit"].ToString();
dataRow["manufactName"] = item["manufactName"].ToString();
dataRow["batchNo"] = item["batchNo"].ToString();
dataRow["expire"] = item["expire"].ToString();
@ -132,7 +136,7 @@ namespace Epost.DPS.WebService
}
else
{
LogHelper.WriteLogInfo("" + item["areaId"].ToString() + "该货位无对应关系");
LogHelper.WriteLogInfo("" + item["areaId"].ToString() + "，该货位不存在");
}
}
else
@ -164,6 +168,7 @@ namespace Epost.DPS.WebService
diclist.Add("drugCommName", "genericname");
diclist.Add("drugName", "goodsname");
diclist.Add("drugSpec", "Spec");
diclist.Add("Unit", "unit");
diclist.Add("manufactName", "manufactname");
diclist.Add("batchNo", "batchno");
diclist.Add("expire", "orderdate");
@ -188,7 +193,7 @@ namespace Epost.DPS.WebService
else
{
msg.Status = "erro";
msg.Message = "数据异常：数据接收失败，请重试！";
msg.Message = "数据异常：数据接收失败,请检查货位和标签对应关系是否正确，请重试！";
main.msg = msg;
resultxml = XmlHelper.XmlSerialize(main);
LogHelper.WriteLogInfo("数据异常：数据接收失败，请重试！");
@ -244,3 +249,4 @@ namespace Epost.DPS.WebService
}
}
}
}