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

Browse Source
This commit is contained in:
jl
2024-01-17 15:56:28 +08:00
parent 9d5221ba0d
commit ae55e77ef8
4 changed files with 66 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@ using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Security.Policy;
using System.Text.RegularExpressions;
using System.Web;
using System.Web.Helpers;
using System.Web.Razor.Tokenizer.Symbols;
@ -68,38 +69,44 @@ namespace Epost.DPS.WebService
if (dt == null || dt.Rows.Count <= 0)
{
DataTable locdt = bll.GetlocationInfo(item["areaId"].ToString());
if (locdt != null && locdt.Rows.Count > 0)
{
locdt.Columns.Add("strinfo", typeof(string));
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["Unit"] = item["Unit"].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["strinfo"] = dataRow["strinfo"] + str;
dtResult.Rows.Add(dataRow);
}
else
if (!Regex.IsMatch(item["areaId"].ToString(), @"[\u4e00-\u9fa5]"))
{
LogHelper.WriteLogInfo("" + item["areaId"].ToString() + "，该货位不存在");
str = str + item["areaId"].ToString() + "|";
if (locdt != null && locdt.Rows.Count > 0)
{
locdt.Columns.Add("strinfo", typeof(string));
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["Unit"] = item["Unit"].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["strinfo"] = dataRow["strinfo"] + str;
dtResult.Rows.Add(dataRow);
}
else
{
LogHelper.WriteLogInfo("" + item["areaId"].ToString() + "，该货位不存在");
str = str + item["areaId"].ToString() + "|";
}
}
else { LogHelper.WriteLogInfo("" + item["areaId"].ToString() + "，货位包含中文"); }
}
else
{
@ -142,9 +149,7 @@ namespace Epost.DPS.WebService
diclist.Add("lookListen", "looklisten");
diclist.Add("labelIP", "labelIP");
diclist.Add("labelNo", "labelno");
diclist.Add("strinfo", "clientcode");
diclist.Add("strinfo", "clientcode");
bool b = bll.ImportOrderinfo(dtResult, diclist);
if (b)
{
@ -205,5 +210,7 @@ namespace Epost.DPS.WebService
}
}
}
}
}