From 07985264fa60178399611d9cdbe1fa4981e41cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=85=E5=87=AF=20=E8=B4=BE?= <807404298@qq.com> Date: Mon, 14 Aug 2023 14:57:24 +0800 Subject: [PATCH] --- Epost.BLL/AddressstorageBLL.cs | 7 + Epost.BLL/CommandBLL.cs | 48 +++++ Epost.BLL/OrderBLL.cs | 14 +- Epost.BLL/OrderControlBLL.cs | 35 +++- Epost.DAL/AddressstorageDAL.cs | 8 + Epost.DAL/OrdersDAL.cs | 22 ++- .../Controllers/ServerController.cs | 24 +++ Epost.TestToolsWeb/Epost.DPS.csproj.user | 2 +- .../PublishProfiles/Toolsweb.pubxml.user | 26 +-- .../WebService/WebService.asmx.cs | 183 ++++++++++++------ 10 files changed, 289 insertions(+), 80 deletions(-) diff --git a/Epost.BLL/AddressstorageBLL.cs b/Epost.BLL/AddressstorageBLL.cs index 324dde2..06a6082 100644 --- a/Epost.BLL/AddressstorageBLL.cs +++ b/Epost.BLL/AddressstorageBLL.cs @@ -374,5 +374,12 @@ namespace Epost.BLL return dal.GetAddressListByByPage(strWhere, orderby, startIndex, endIndex, out recordCount); } #endregion + + #region 根据订单获取要熄灭的标签 + public DataTable GetForcedendAddress(string orderid) + { + return dal.GetForcedendAddress(orderid); + } + #endregion } } diff --git a/Epost.BLL/CommandBLL.cs b/Epost.BLL/CommandBLL.cs index 92f99db..91001fd 100644 --- a/Epost.BLL/CommandBLL.cs +++ b/Epost.BLL/CommandBLL.cs @@ -738,7 +738,55 @@ namespace Epost.BLL #endregion + #region 强制结束灭灯 + public ResultModel Forcedend(string orderid) + { + ResultModel resultModel = new ResultModel(); + List list = new List(); + try + { + DataTable dt = addrBLL.GetForcedendAddress(orderid); + if (dt != null && dt.Rows.Count > 0) + { + foreach (DataRow item in dt.Rows) + { + LabelParamModel model = new LabelParamModel(); + model.ControlIP = item["ControlIP"].ToString(); + model.Address = item["address"].ToString(); + model.Command = "FORMAT_JOB_DATA"; + model.Parameter = "50"; + model.Timeout = "0.5"; + list.Add(model); + model = new LabelParamModel(); + model.ControlIP = item["ControlIP"].ToString(); + model.Address = "9999"; + model.Parameter = "11111000"; + model.Command = "UNLOCK"; + model.Timeout = "0.5"; + list.Add(model); + LED_OFF_CLEAR(item["ControlIP"].ToString()); + } + if (list.Any()) + { + resultModel = SendALL_Init(list); + } + + } + return resultModel; + + } + catch (Exception ex) + { + + resultModel.result = "0"; + resultModel.msg = "强制结束熄灭失败！"; + LogHelper.WriteLogInfo("强制结束异常：" + ex.Message); + + } + return resultModel; + } + #endregion } } diff --git a/Epost.BLL/OrderBLL.cs b/Epost.BLL/OrderBLL.cs index 14ecec2..d73e1ee 100644 --- a/Epost.BLL/OrderBLL.cs +++ b/Epost.BLL/OrderBLL.cs @@ -848,7 +848,7 @@ namespace Epost.BLL public DataTable GetOrderList(string area, string block) { - return dal.GetOrderList(area, block); + return dal.GetOrderList(area, block); } #endregion @@ -1043,5 +1043,17 @@ namespace Epost.BLL { return dal.GetDataIfRepeat(transderMid, transderDid); } + + public DataTable GetOrdersDT(string address, string ControlIP) + { + return dal.GetOrdersDT(address, ControlIP); + } + + #region 校验货位 + public DataTable GetlocationInfo(string location) + { + return dal.GetlocationInfo(location); + } + #endregion } } diff --git a/Epost.BLL/OrderControlBLL.cs b/Epost.BLL/OrderControlBLL.cs index dde4f39..cec44e3 100644 --- a/Epost.BLL/OrderControlBLL.cs +++ b/Epost.BLL/OrderControlBLL.cs @@ -206,6 +206,28 @@ namespace Epost.BLL } #endregion + + #region + public ResultModel Forcedend(string orderid) + { + try + { + ResultModel resultModel = comBLL.Forcedend(orderid); + + return resultModel; + } + catch (Exception ex) + { + LogHelper.WriteLogInfo("强制结束熄灭标签异常" + ex.ToString()); + ResultModel resultModel = new ResultModel(); + resultModel.result = "-1"; + resultModel.msg = "强制结束熄灭标签异常：" + ex.ToString() + ""; + return resultModel; + } + + } + #endregion. + #endregion #region 查询波次通道列表 @@ -418,7 +440,7 @@ namespace Epost.BLL List downlist = new List(); JobModel model = job.FirstOrDefault(); downlist.Add(model); - + model.State = 3; List manyList = job.FindAll(m => m.ManyState == 1 && m.Tolocation == model.Tolocation && m.Sku == model.Sku); #region 处理合并数据 //int endcount = 1; @@ -436,16 +458,17 @@ namespace Epost.BLL orderbll.UpdateOrderState_Car(downlist, model, truequantity, checkquantity); LogHelper.WriteLogInfo("标记------" + data.Address + "------" + model.Sku + "----" + model.State + ""); - bool skuInish = dal.IsFinishWork(1, block, "", area, model.Sku, "", model.OrderID); + bool skuInish = dal.IsFinishWork(1, block, "", area, "", "", model.OrderID); if (skuInish) { LogHelper.WriteLogInfo(data.Address + "=========------------------" + data.Parameter); - + + comBLL.DISPLAY_LIGHT_BLOCK(model.Block, data.Area, "0"); LogHelper.WriteLogInfo("区SKU拣选完成--------------"); //删除sku缓存信息 - List rjob = jobList.FindAll(m => m.Block == data.Block && m.Area == data.Area && m.Sku == model.Sku); - JobCache.UpdateJobModelList(rjob, EcommendType.Execute); + //List 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) @@ -461,7 +484,7 @@ namespace Epost.BLL //修改订单状态 dal.UpdateStateByCar(model.OrderID); - comBLL.DISPLAY_LIGHT_BLOCK(model.Block, data.Area, "0"); + } } } diff --git a/Epost.DAL/AddressstorageDAL.cs b/Epost.DAL/AddressstorageDAL.cs index 6b30052..55d6c4c 100644 --- a/Epost.DAL/AddressstorageDAL.cs +++ b/Epost.DAL/AddressstorageDAL.cs @@ -809,5 +809,13 @@ namespace Epost.DAL } #endregion + #region 根据订单获取要熄灭的标签 + public DataTable GetForcedendAddress(string orderid) + { + string sql = string.Format("select * from v_orders where orderid='20416' and oprationstate!=3"); + DataTable dt = db.GetsqlForDT(sql); + return dt; + } + #endregion } } diff --git a/Epost.DAL/OrdersDAL.cs b/Epost.DAL/OrdersDAL.cs index 6fa8c59..97751dd 100644 --- a/Epost.DAL/OrdersDAL.cs +++ b/Epost.DAL/OrdersDAL.cs @@ -1089,11 +1089,11 @@ namespace Epost.DAL } string sql = "select matchid, sku from V_orders where oprationstate <> 3 and state<>99 and block ='" + block + "' " + strwheres; - LogHelper.WriteLogInfo("判断当前sku是否为已完成" + sql); + LogHelper.WriteLogInfo("判断当前通道是否为已完成" + sql); DataTable dt = db.GetsqlForDT(sql); if (dt == null || dt.Rows.Count == 0) { - LogHelper.WriteLogInfo("判断当前sku是否为已完成true"); + LogHelper.WriteLogInfo("判断当前通道是否为已完成true"); return true; } @@ -2886,9 +2886,25 @@ namespace Epost.DAL public DataTable GetDataIfRepeat(string transderMid, string transderDid) { - string sql = string.Format("select distinct orderid,transderDid from Orders where orderid='" + transderMid + "' and transderDid='" + transderDid + "' "); + string sql = string.Format("select distinct orderid,transderDid from Orders where orderid='" + transderMid + "' and transderDid='" + transderDid + "' "); DataTable dt = db.GetsqlForDT(sql); return dt; } + + public DataTable GetOrdersDT(string address, string ControlIP) + { + string sql = string.Format("select address,type,area,block,ControlIP,v_orders.id,tolocation,quantity,oprationstate,v_orders.sku,v_orders.orderid from v_orders left join OrdersQueue on v_orders.block=OrdersQueue.Taskblock where address='2001' and ControlIP='192.168.3.118' and oprationstate!=3"); + DataTable dt = db.GetsqlForDT(sql); + return dt; + } + + #region 校验货位 + public DataTable GetlocationInfo(string location) + { + string sql = string.Format("select location from Addressstorage where location='" + location + "' "); + DataTable dt = db.GetsqlForDT(sql); + return dt; + } + #endregion } } diff --git a/Epost.TestToolsWeb/Controllers/ServerController.cs b/Epost.TestToolsWeb/Controllers/ServerController.cs index 1fe2008..50dd075 100644 --- a/Epost.TestToolsWeb/Controllers/ServerController.cs +++ b/Epost.TestToolsWeb/Controllers/ServerController.cs @@ -165,7 +165,31 @@ namespace Epost.DPS.Controllers #endregion + [Route("CloseLight")] + [HttpPost] + public ResultModel CloseLight(string orderid) + { + lock (lockinit) + { + ResultModel res = new ResultModel(); + try + { + res = contrbll.Forcedend(orderid); + return res; + + } + catch (Exception ex) + { + LogHelper.WriteLogInfo("GetDataList异常：" + ex.Message); + res.msg = "请求异常！"; + res.result = "-1"; + return res; + + } + } + + } } diff --git a/Epost.TestToolsWeb/Epost.DPS.csproj.user b/Epost.TestToolsWeb/Epost.DPS.csproj.user index 00fd366..5827539 100644 --- a/Epost.TestToolsWeb/Epost.DPS.csproj.user +++ b/Epost.TestToolsWeb/Epost.DPS.csproj.user @@ -11,7 +11,7 @@ False 600 D:\驿传\Epost\T_DAS_PTL\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml - Release|Any CPU + Debug|Any CPU diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user index 859ee82..c31f604 100644 --- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user +++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user @@ -7,7 +7,7 @@ <_PublishTargetUrl>D:\驿传\抚远 - True|2023-07-25T09:25:54.2443213Z;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; + 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; @@ -33,19 +33,19 @@ 04/16/2023 15:06:26 - 07/25/2023 17:23:54 + 08/11/2023 10:58:36 - 07/25/2023 17:23:54 + 08/11/2023 10:58:36 02/24/2020 15:29:24 - 07/25/2023 17:23:35 + 08/01/2023 10:41:25 - 07/25/2023 17:23:35 + 08/01/2023 10:41:25 04/16/2023 15:06:26 @@ -63,25 +63,25 @@ 10/23/2017 13:15:20 - 07/25/2023 17:23:37 + 08/11/2023 10:58:14 - 07/25/2023 17:23:37 + 08/11/2023 10:58:14 08/26/2020 18:09:48 - 07/25/2023 17:23:36 + 08/11/2023 10:58:13 - 07/25/2023 17:23:36 + 08/11/2023 10:58:13 - 07/25/2023 17:23:41 + 08/11/2023 10:58:21 - 07/25/2023 17:23:41 + 08/11/2023 10:58:21 07/19/2023 15:37:56 @@ -5652,7 +5652,7 @@ 04/16/2023 15:06:27 - 07/25/2023 17:23:46 + 08/11/2023 10:58:26 04/04/2018 15:45:12 @@ -7572,7 +7572,7 @@ 04/16/2023 15:06:27 - 07/19/2023 15:38:06 + 08/02/2023 10:43:56 07/19/2023 15:30:16 diff --git a/Epost.TestToolsWeb/WebService/WebService.asmx.cs b/Epost.TestToolsWeb/WebService/WebService.asmx.cs index 408ecf7..ce3f800 100644 --- a/Epost.TestToolsWeb/WebService/WebService.asmx.cs +++ b/Epost.TestToolsWeb/WebService/WebService.asmx.cs @@ -1,5 +1,7 @@ using Epost.BLL; using Epost.Common; +using Epost.DAL; +using Epost.DAL.Cache; using Epost.Model; using System; using System.Collections.Generic; @@ -7,6 +9,8 @@ using System.Data; using System.Linq; using System.Security.Policy; using System.Web; +using System.Web.Helpers; +using System.Web.Razor.Tokenizer.Symbols; using System.Web.Services; namespace Epost.DPS.WebService @@ -23,6 +27,9 @@ namespace Epost.DPS.WebService { OrderBLL bll = new OrderBLL(); OrdersQueueBLL queueBLL = new OrdersQueueBLL(); + CommandDAL dal = new CommandDAL(); + + JobModelCacheDAL JobCache = new JobModelCacheDAL(); [WebMethod] public string ReceiveDataInfo_XML(string action, string messages) @@ -41,9 +48,10 @@ namespace Epost.DPS.WebService //{ if (!string.IsNullOrEmpty(messages)) { + bool flag = true; string mms = string.Empty; LogHelper.WriteLogInfo("======开始处理数据======"); - DataSet set = XmlHelper.GetDataSetStrXml(messages); + DataSet set = XmlHelper.GetDataSetStrXml(messages.Replace("&", "").Replace("#", "")); if (set != null && set.Tables.Count > 0 && set.Tables[0].Rows.Count > 0) { var ReturnDt = set.Tables["pick"]; @@ -51,40 +59,93 @@ namespace Epost.DPS.WebService foreach (DataRow item in ReturnDt.Rows) { - DataTable dt = bll.GetDataIfRepeat(item["transderMid"].ToString(), item["transderDid"].ToString()); - if (dt == null || dt.Rows.Count <= 0) + if (!string.IsNullOrEmpty(item["labelNo"].ToString())) { - DataRow dataRow = dtResult.NewRow(); - dataRow["transderMid"] = item["transderMid"].ToString(); - dataRow["transderDid"] = item["transderDid"].ToString(); - dataRow["drugCode"] = item["drugCode"].ToString(); - dataRow["drugCommName"] = item["drugCommName"].ToString(); - dataRow["drugName"] = item["drugName"].ToString(); - dataRow["drugSpec"] = item["drugSpec"].ToString(); - dataRow["manufactName"] = item["manufactName"].ToString(); - dataRow["batchNo"] = item["batchNo"].ToString(); - dataRow["expire"] = item["expire"].ToString(); - dataRow["areaId"] = item["areaId"].ToString(); - dataRow["pickQty"] = item["pickQty"].ToString(); - dataRow["stock"] = item["stock"].ToString(); - dataRow["drugStoreName"] = item["drugStoreName"].ToString(); - dataRow["labelColor"] = item["labelColor"].ToString(); - dataRow["lookListen"] = item["lookListen"].ToString(); - dataRow["labelIP"] = item["labelIP"].ToString(); - dataRow["labelNo"] = item["labelNo"].ToString(); + if (!string.IsNullOrEmpty(item["labelIP"].ToString())) + { + DataTable orderdt = bll.GetOrdersDT(item["labelIP"].ToString(), item["labelIP"].ToString()); + if (orderdt != null && orderdt.Rows.Count > 0) + { + List list = new List(); + LabelParamModel model = new LabelParamModel(); + model.ControlIP = item["labelIP"].ToString(); + model.Address = item["labelNo"].ToString(); + model.Command = "REMOVE_JOB"; + model.Uid = orderdt.Rows[0]["id"].ToString(); + model.Type = "C"; + list.Add(model); + dal.SendALL(list); - dtResult.Rows.Add(dataRow); + List jobList = JobCache.GetPlanJobList().FindAll(p => p.ID == orderdt.Rows[0]["id"].ToString()); + JobCache.UpdateJobModelList(jobList, EcommendType.Execute); + + flag = false; + } + else + { + msg.Status = "erro"; + msg.Message = "数据异常：当前标签未亮灯！"; + main.msg = msg; + resultxml = XmlHelper.ModelToXml(main); + LogHelper.WriteLogInfo("数据异常：当前标签未亮灯！"); + return resultxml; + } + } + else + { + msg.Status = "erro"; + msg.Message = "数据异常：标签对应控制器IP未传值，请检查数据后重试！"; + main.msg = msg; + resultxml = XmlHelper.ModelToXml(main); + LogHelper.WriteLogInfo("数据异常：标签对应控制器IP未传值，请检查数据后重试！"); + return resultxml; + } } else { - mms += "主键重复 (" + item["transderMid"].ToString() + "-" + item["transderDid"].ToString() + ")，"; + DataTable dt = bll.GetDataIfRepeat(item["transderMid"].ToString(), item["transderDid"].ToString()); + if (dt == null || dt.Rows.Count <= 0) + { + DataTable locdt = bll.GetlocationInfo(item["areaId"].ToString()); + if (locdt != null && locdt.Rows.Count > 0) + { + DataRow dataRow = dtResult.NewRow(); + dataRow["transderMid"] = item["transderMid"].ToString(); + dataRow["transderDid"] = item["transderDid"].ToString(); + dataRow["drugCode"] = item["drugCode"].ToString(); + dataRow["drugCommName"] = item["drugCommName"].ToString(); + dataRow["drugName"] = item["drugName"].ToString(); + dataRow["drugSpec"] = item["drugSpec"].ToString(); + dataRow["manufactName"] = item["manufactName"].ToString(); + dataRow["batchNo"] = item["batchNo"].ToString(); + dataRow["expire"] = item["expire"].ToString(); + dataRow["areaId"] = item["areaId"].ToString(); + dataRow["pickQty"] = item["pickQty"].ToString(); + dataRow["stock"] = item["stock"].ToString(); + dataRow["drugStoreName"] = item["drugStoreName"].ToString(); + dataRow["labelColor"] = item["labelColor"].ToString(); + dataRow["lookListen"] = item["lookListen"].ToString(); + dataRow["labelIP"] = item["labelIP"].ToString(); + dataRow["labelNo"] = item["labelNo"].ToString(); + + dtResult.Rows.Add(dataRow); + } + else + { + LogHelper.WriteLogInfo("" + item["areaId"].ToString() + "该货位无对应关系"); + } + } + else + { + mms += "主键重复 (" + item["transderMid"].ToString() + "-" + item["transderDid"].ToString() + ")，"; + } } } if (!string.IsNullOrEmpty(mms)) { - mms = mms.Substring(mms.Length - 1, 1); + mms = mms.Substring(0, mms.Length - 1); msg.Status = "erro"; msg.Message = "数据异常：" + mms + ""; @@ -94,43 +155,53 @@ namespace Epost.DPS.WebService } else { - - - Dictionary diclist = new Dictionary(); - diclist.Add("transderMid", "orderid"); - diclist.Add("transderDid", "transderDid"); - diclist.Add("drugCode", "sku"); - diclist.Add("drugCommName", "genericname"); - diclist.Add("drugName", "goodsname"); - diclist.Add("drugSpec", "Spec"); - diclist.Add("manufactName", "manufactname"); - diclist.Add("batchNo", "batchno"); - diclist.Add("expire", "orderdate"); - diclist.Add("areaId", "tolocation"); - diclist.Add("pickQty", "quantity"); - diclist.Add("stock", "stockquantity"); - diclist.Add("drugStoreName", "shopname"); - diclist.Add("labelColor", "labelcolor"); - diclist.Add("lookListen", "looklisten"); - diclist.Add("labelIP", "labelIP"); - diclist.Add("labelNo", "labelno"); - - bool b = bll.ImportOrderinfo(dtResult, diclist); - if (b) + if (flag) { - msg.Status = "ok"; - msg.Message = "接收成功"; - main.msg = msg; - resultxml = XmlHelper.ModelToXml(main); - LogHelper.WriteLogInfo("接收成功"); + Dictionary diclist = new Dictionary(); + diclist.Add("transderMid", "orderid"); + diclist.Add("transderDid", "transderDid"); + diclist.Add("drugCode", "sku"); + diclist.Add("drugCommName", "genericname"); + diclist.Add("drugName", "goodsname"); + diclist.Add("drugSpec", "Spec"); + diclist.Add("manufactName", "manufactname"); + diclist.Add("batchNo", "batchno"); + diclist.Add("expire", "orderdate"); + diclist.Add("areaId", "tolocation"); + diclist.Add("pickQty", "quantity"); + diclist.Add("stock", "stockquantity"); + diclist.Add("drugStoreName", "shopname"); + diclist.Add("labelColor", "labelcolor"); + diclist.Add("lookListen", "looklisten"); + diclist.Add("labelIP", "labelIP"); + diclist.Add("labelNo", "labelno"); + + bool b = bll.ImportOrderinfo(dtResult, diclist); + if (b) + { + msg.Status = "ok"; + msg.Message = "接收成功"; + main.msg = msg; + resultxml = XmlHelper.ModelToXml(main); + LogHelper.WriteLogInfo("接收成功"); + } + else + { + msg.Status = "erro"; + msg.Message = "数据异常：数据接收失败，请重试！"; + main.msg = msg; + resultxml = XmlHelper.XmlSerialize(main); + LogHelper.WriteLogInfo("数据异常：数据接收失败，请重试！"); + } } else { - msg.Status = "erro"; - msg.Message = "数据异常：数据接收失败，请重试！"; + msg.Status = "ok"; + msg.Message = "熄灭成功"; main.msg = msg; - resultxml = XmlHelper.XmlSerialize(main); - LogHelper.WriteLogInfo("数据异常：数据接收失败，请重试！"); + resultxml = XmlHelper.ModelToXml(main); + LogHelper.WriteLogInfo("熄灭成功"); + return resultxml; } } }