diff --git a/Epost.BLL/CommandBLL.cs b/Epost.BLL/CommandBLL.cs index 9d39e56..92f99db 100644 --- a/Epost.BLL/CommandBLL.cs +++ b/Epost.BLL/CommandBLL.cs @@ -62,7 +62,7 @@ namespace Epost.BLL model.Command = "UNLOCK"; model.Timeout = "0.5"; list.Add(model); - + LED_OFF_CLEAR(item["ControlIP"].ToString()); } if (list.Any()) { @@ -511,6 +511,7 @@ namespace Epost.BLL model.ControlIP = item["ControlIP"].ToString(); FORMATE_JOB_DATA(model); + LED_OFF_CLEAR(item["ControlIP"].ToString()); } } diff --git a/Epost.BLL/OrderBLL.cs b/Epost.BLL/OrderBLL.cs index 671fab5..14ecec2 100644 --- a/Epost.BLL/OrderBLL.cs +++ b/Epost.BLL/OrderBLL.cs @@ -401,7 +401,7 @@ namespace Epost.BLL { foreach (JobModel jobmo in downlist.ToArray()) { - dal.UpdateWorkState_Car(jobmo.Matchid, jobmo.Quantity, jobmo.Sku, jobmo.ID, checkquaantity, model.UserCode); + dal.UpdateWorkState_Car(jobmo.OrderID, jobmo.Quantity, jobmo.Sku, jobmo.ID, checkquaantity, model.UserCode); } } @@ -409,7 +409,7 @@ namespace Epost.BLL else { - dal.UpdateWorkState_Car(model.Matchid, truequantity, model.Sku, model.ID, checkquaantity, model.UserCode); + dal.UpdateWorkState_Car(model.OrderID, truequantity, model.Sku, model.ID, checkquaantity, model.UserCode); } @@ -811,7 +811,7 @@ namespace Epost.BLL if (!isecho) { //修改数据为已读 - dal.UpOrder_Car(item["Matchid"].ToString(), item["sku"].ToString(), item["id"].ToString()); + dal.UpOrder_Car(item["orderid"].ToString(), item["sku"].ToString(), item["id"].ToString()); } #endregion } diff --git a/Epost.BLL/OrderControlBLL.cs b/Epost.BLL/OrderControlBLL.cs index 628c504..dde4f39 100644 --- a/Epost.BLL/OrderControlBLL.cs +++ b/Epost.BLL/OrderControlBLL.cs @@ -590,8 +590,8 @@ namespace Epost.BLL lamodel.Title = item.genericname; lamodel.Content = "" + item.Sku.Substring(item.Sku.Length - 4, 4) + "\t" + item.Spec + "\r" + item.GoodsName + "\r批号 " + item.batchno + "\t" + item.manufactname.Substring(0, 4) + ""; var aryloc = item.Tolocation.Split('-'); - lamodel.Loc = "" + aryloc[1].ToString() + "-" + aryloc[2].ToString() + ""; - lamodel.W_quantity = aryloc[3].ToString(); + lamodel.Loc = "" + aryloc[0].ToString() + "-" + aryloc[1].ToString() + ""; + lamodel.W_quantity = aryloc[2].ToString(); lamodel.Quantity = quantity.ToString(); lamodel.Unit = "盒"; lamodel.PicChoose = ""; diff --git a/Epost.TestToolsWeb/Epost.DPS.csproj.user b/Epost.TestToolsWeb/Epost.DPS.csproj.user index 5827539..00fd366 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 - Debug|Any CPU + Release|Any CPU diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml index 07f6911..31ba5e6 100644 --- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml +++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml @@ -11,7 +11,7 @@ true false - D:\驿传\SanYing_DAS-T后台 + D:\驿传\抚远 true true true diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user index 27c94b0..859ee82 100644 --- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user +++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user @@ -6,8 +6,8 @@ - <_PublishTargetUrl>D:\驿传\SanYing_DAS-T后台 - True|2023-07-03T05:53:41.0701316Z;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; + <_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; @@ -33,19 +33,19 @@ 04/16/2023 15:06:26 - 07/03/2023 13:53:15 + 07/25/2023 17:23:54 - 07/03/2023 13:53:15 + 07/25/2023 17:23:54 02/24/2020 15:29:24 - 07/03/2023 13:52:54 + 07/25/2023 17:23:35 - 07/03/2023 13:52:54 + 07/25/2023 17:23:35 04/16/2023 15:06:26 @@ -63,31 +63,31 @@ 10/23/2017 13:15:20 - 07/03/2023 13:52:56 + 07/25/2023 17:23:37 - 07/03/2023 13:52:56 + 07/25/2023 17:23:37 08/26/2020 18:09:48 - 07/03/2023 13:52:55 + 07/25/2023 17:23:36 - 07/03/2023 13:52:55 + 07/25/2023 17:23:36 - 07/03/2023 13:53:00 + 07/25/2023 17:23:41 - 07/03/2023 13:53:00 + 07/25/2023 17:23:41 - 04/16/2023 17:10:57 + 07/19/2023 15:37:56 - 04/16/2023 17:10:57 + 07/19/2023 15:37:56 09/06/2018 11:57:11 @@ -5652,7 +5652,7 @@ 04/16/2023 15:06:27 - 07/03/2023 13:53:05 + 07/25/2023 17:23:46 04/04/2018 15:45:12 @@ -7572,7 +7572,10 @@ 04/16/2023 15:06:27 - 04/16/2023 17:11:05 + 07/19/2023 15:38:06 + + + 07/19/2023 15:30:16 \ No newline at end of file diff --git a/Epost.TestToolsWeb/WebService/WebService.asmx.cs b/Epost.TestToolsWeb/WebService/WebService.asmx.cs index f550c3c..408ecf7 100644 --- a/Epost.TestToolsWeb/WebService/WebService.asmx.cs +++ b/Epost.TestToolsWeb/WebService/WebService.asmx.cs @@ -36,45 +36,66 @@ namespace Epost.DPS.WebService var resultxml = string.Empty; try { - DataTable queuedt = queueBLL.getQueuesbyState(); - if (queuedt == null || queuedt.Rows.Count <= 0) + //DataTable queuedt = queueBLL.getQueuesbyState(); + //if (queuedt == null || queuedt.Rows.Count <= 0) + //{ + if (!string.IsNullOrEmpty(messages)) { - if (!string.IsNullOrEmpty(messages)) + string mms = string.Empty; + LogHelper.WriteLogInfo("======开始处理数据======"); + DataSet set = XmlHelper.GetDataSetStrXml(messages); + if (set != null && set.Tables.Count > 0 && set.Tables[0].Rows.Count > 0) { - LogHelper.WriteLogInfo("======开始处理数据======"); - DataSet set = XmlHelper.GetDataSetStrXml(messages); - if (set != null && set.Tables.Count > 0 && set.Tables[0].Rows.Count > 0) + var ReturnDt = set.Tables["pick"]; + DataTable dtResult = ReturnDt.Clone(); + + foreach (DataRow item in ReturnDt.Rows) { - var ReturnDt = set.Tables["pick"]; - DataTable dtResult = ReturnDt.Clone(); - - foreach (DataRow item in ReturnDt.Rows) + DataTable dt = bll.GetDataIfRepeat(item["transderMid"].ToString(), item["transderDid"].ToString()); + if (dt == null || dt.Rows.Count <= 0) { - DataTable dt = bll.GetDataIfRepeat(item["transderMid"].ToString(), item["transderDid"].ToString()); - if (dt == null || dt.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(); + 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); - } + dtResult.Rows.Add(dataRow); } + else + { + mms += "主键重复 (" + item["transderMid"].ToString() + "-" + item["transderDid"].ToString() + ")，"; + } + } + + + if (!string.IsNullOrEmpty(mms)) + { + mms = mms.Substring(mms.Length - 1, 1); + + msg.Status = "erro"; + msg.Message = "数据异常：" + mms + ""; + main.msg = msg; + resultxml = XmlHelper.ModelToXml(main); + LogHelper.WriteLogInfo("数据异常：" + mms + ""); + } + else + { + + Dictionary diclist = new Dictionary(); diclist.Add("transderMid", "orderid"); diclist.Add("transderDid", "transderDid"); @@ -106,39 +127,40 @@ namespace Epost.DPS.WebService else { msg.Status = "erro"; - msg.Message = "数据异常：数据处理失败，请重试！"; + msg.Message = "数据异常：数据接收失败，请重试！"; main.msg = msg; resultxml = XmlHelper.XmlSerialize(main); - LogHelper.WriteLogInfo("数据异常：数据处理失败，请重试！"); + LogHelper.WriteLogInfo("数据异常：数据接收失败，请重试！"); } } - else - { - msg.Status = "erro"; - msg.Message = "数据异常：解析XML失败，请检查XML格式后再进行推送！"; - main.msg = msg; - resultxml = XmlHelper.ModelToXml(main); - LogHelper.WriteLogInfo("数据异常：解析XML失败，请检查XML格式后再进行推送！"); - } } else { msg.Status = "erro"; - msg.Message = "数据异常：未在XML内获取到数据，请检查后再进行推送！"; + msg.Message = "数据异常：解析XML失败，请检查XML格式后再进行推送！"; main.msg = msg; resultxml = XmlHelper.ModelToXml(main); - LogHelper.WriteLogInfo("数据异常：未在XML内获取到数据，请检查后再进行推送！"); + LogHelper.WriteLogInfo("数据异常：解析XML失败，请检查XML格式后再进行推送！"); } - return resultxml; } else { msg.Status = "erro"; - msg.Message = "数据异常/当前存在拣药任务"; + msg.Message = "数据异常：未在XML内获取到数据，请检查后再进行推送！"; main.msg = msg; - LogHelper.WriteLogInfo("数据异常/当前存在拣药任务"); - return resultxml = XmlHelper.ModelToXml(main); + resultxml = XmlHelper.ModelToXml(main); + LogHelper.WriteLogInfo("数据异常：未在XML内获取到数据，请检查后再进行推送！"); } + return resultxml; + //} + //else + //{ + // msg.Status = "erro"; + // msg.Message = "数据异常/当前存在拣药任务"; + // main.msg = msg; + // LogHelper.WriteLogInfo("数据异常/当前存在拣药任务"); + // return resultxml = XmlHelper.ModelToXml(main); + //} } catch (Exception ex) {