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-11-08 11:54:40 +08:00
parent 7c1ab8ce69
commit 2219cae500
15 changed files with 83 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Epost.BLL/AddressstorageBLL.cs
View File

@ -146,9 +146,9 @@ namespace Epost.BLL
#endregion #endregion
#region 获取控制器列表 #region 获取控制器列表
public DataTable getLabelList(string controlid) public DataTable getLabelList(string controlid,string batchno)
{ {
return dal.getLabelList(controlid); return dal.getLabelList(controlid, batchno);
} }
#endregion #endregion

24
Epost.BLL/CommandBLL.cs
View File

@ -27,7 +27,7 @@ namespace Epost.BLL
string IP = ConfigurationManager.AppSettings["WebAPIUrl"]; string IP = ConfigurationManager.AppSettings["WebAPIUrl"];
#region 初始化数据 #region 初始化数据
public ResultModel Initialization_M(bool isback = true) public ResultModel Initialization_T(bool isback = true)
{ {
ResultModel resultModel = new ResultModel(); ResultModel resultModel = new ResultModel();
List<LabelParamModel> list = new List<LabelParamModel>(); List<LabelParamModel> list = new List<LabelParamModel>();
@ -60,6 +60,12 @@ namespace Epost.BLL
model.Command = "UNLOCK"; model.Command = "UNLOCK";
model.Timeout = "0.5"; model.Timeout = "0.5";
list.Add(model); list.Add(model);
model = new LabelParamModel();
model.ControlIP = item["ControlIP"].ToString();
model.Address = "9999";
model.Command = "LED_OFF";
model.Timeout = "0.5";
list.Add(model);
} }
if (list.Any()) if (list.Any())
@ -84,7 +90,7 @@ namespace Epost.BLL
#endregion #endregion
#region 设备检测 查询所有标签 #region 设备检测 查询所有标签
public ResultModel GetAllLabelList_M() public ResultModel GetAllLabelList_M(string batchno)
{ {
ResultModel model = new ResultModel(); ResultModel model = new ResultModel();
try try
@ -96,11 +102,12 @@ namespace Epost.BLL
{ {
foreach (DataRow item in dt.Rows) foreach (DataRow item in dt.Rows)
{ {
DataTable lableDt = addrBLL.getLabelList(item["id"].ToString()); DataTable lableDt = addrBLL.getLabelList(item["id"].ToString(), batchno);
if (lableDt != null && lableDt.Rows.Count > 0) if (lableDt != null && lableDt.Rows.Count > 0)
{ {
foreach (DataRow labelItem in lableDt.Rows) foreach (DataRow labelItem in lableDt.Rows)
{ {
string shopid = labelItem["address"].ToString();
if (labelItem["addresstype"].ToString() == "2") if (labelItem["addresstype"].ToString() == "2")
{ {
LabelParamModel CNlablemodel = new LabelParamModel(); LabelParamModel CNlablemodel = new LabelParamModel();
@ -115,12 +122,20 @@ namespace Epost.BLL
} }
else else
{ {
if (!string.IsNullOrEmpty(labelItem["shopid"].ToString()))
{
shopid = labelItem["shopid"].ToString();
if (shopid.Length > 4)
{
shopid = shopid.Substring(shopid.Length-4,4);
}
}
LabelParamModel lablemodel = new LabelParamModel(); LabelParamModel lablemodel = new LabelParamModel();
lablemodel.Address = labelItem["address"].ToString(); lablemodel.Address = labelItem["address"].ToString();
lablemodel.ControlIP = item["ControlIP"].ToString(); lablemodel.ControlIP = item["ControlIP"].ToString();
lablemodel.Command = "DISPLAY_JOB"; lablemodel.Command = "DISPLAY_JOB";
lablemodel.Type = "N"; lablemodel.Type = "N";
lablemodel.Quantity = labelItem["address"].ToString(); lablemodel.Quantity = shopid;
lablemodel.Uid = labelItem["address"].ToString(); lablemodel.Uid = labelItem["address"].ToString();
lablemodel.Mode = "10"; lablemodel.Mode = "10";
list.Add(lablemodel); list.Add(lablemodel);
@ -432,6 +447,7 @@ namespace Epost.BLL
LabelParamModel model = new LabelParamModel(); LabelParamModel model = new LabelParamModel();
model.ControlIP = item["ControlIP"].ToString(); model.ControlIP = item["ControlIP"].ToString();
FORMATE_JOB_DATA(model); FORMATE_JOB_DATA(model);
LED_OFF_CLEAR(item["ControlIP"].ToString());
} }

8
Epost.BLL/OrderBLL.cs
View File

@ -707,7 +707,7 @@ namespace Epost.BLL
demodel.BatchId = item["BatchId"].ToString(); demodel.BatchId = item["BatchId"].ToString();
demodel.ID = item["ID"].ToString(); demodel.ID = item["ID"].ToString();
demodel.GoodsName = item["GoodsName"].ToString(); demodel.GoodsName = item["GoodsName"].ToString();
demodel.GoodsType = item["GoodsType"].ToString();
demodel.Quantity = Convert.ToInt32(item["Quantity"].ToString()); demodel.Quantity = Convert.ToInt32(item["Quantity"].ToString());
demodel.CheckQuantity = Convert.ToInt32(item["CheckQuantity"].ToString()); demodel.CheckQuantity = Convert.ToInt32(item["CheckQuantity"].ToString());
demodel.Sku = item["Sku"].ToString(); demodel.Sku = item["Sku"].ToString();
@ -715,13 +715,13 @@ namespace Epost.BLL
demodel.Matchid = item["Matchid"].ToString(); demodel.Matchid = item["Matchid"].ToString();
demodel.ShopID = item["shopid"].ToString(); demodel.ShopID = item["shopid"].ToString();
demodel.BoxCode = item["boxcode"].ToString(); demodel.BoxCode = item["boxcode"].ToString();
demodel.LotNo = item["LotNo"].ToString();
demodel.Discount = item["Discount"].ToString(); demodel.Discount = item["Discount"].ToString();
demodel.ProdArea = item["ProdArea"].ToString();
demodel.ColorCode = item["corlorcode"].ToString(); demodel.ColorCode = item["corlorcode"].ToString();
demodel.WholeUnit = item["WholeUnit"].ToString(); demodel.WholeUnit = item["WholeUnit"].ToString();
demodel.Unit = item["Unit"].ToString(); demodel.Unit = item["Unit"].ToString();
demodel.TrayCode = item["bkbarcode"].ToString();
#region 获取库位信息 #region 获取库位信息
demodel.Block = item["Block"].ToString(); demodel.Block = item["Block"].ToString();
demodel.Area = item["Area"].ToString(); demodel.Area = item["Area"].ToString();

6
Epost.BLL/OrderControlBLL.cs
View File

@ -48,7 +48,7 @@ namespace Epost.BLL
orderbll.UpOrderstate(); orderbll.UpOrderstate();
UserCacheDAL.ClearUserCodeList(); UserCacheDAL.ClearUserCodeList();
boxcache.ClearBoxList(); boxcache.ClearBoxList();
ResultModel resultModel = comBLL.Initialization_M(); ResultModel resultModel = comBLL.Initialization_T();
// GetOrderQueue(); //加载任务显示器信息 // GetOrderQueue(); //加载任务显示器信息
return resultModel; return resultModel;
@ -119,10 +119,10 @@ namespace Epost.BLL
#region 设备检测 #region 设备检测
public ResultModel TestStart() public ResultModel TestStart(string batchno)
{ {
ResultModel result = comBLL.GetAllLabelList_M(); ResultModel result = comBLL.GetAllLabelList_M(batchno);
return result; return result;
} }

2
Epost.BLL/Work_JobDownThread.cs
View File

@ -286,7 +286,7 @@ namespace Epost.BLL
#endregion #endregion
#region 刷新波次信息 #region 刷新波次信息
showSummaryMes(model.Sku, block, area, Convert.ToInt32(block), null, model.Tolocation, model.Matchid); // showSummaryMes(model.Sku, block, area, Convert.ToInt32(block), null, model.Tolocation, model.Matchid);
#endregion #endregion
Thread.Sleep(30); Thread.Sleep(30);

2
Epost.BLL/Work_ScanThread.cs
View File

@ -267,7 +267,7 @@ namespace Epost.BLL
ShowMessageModel_M show = new ShowMessageModel_M(); ShowMessageModel_M show = new ShowMessageModel_M();
show.Title = skudt.Rows[0]["sku_goodsname"].ToString(); show.Title = skudt.Rows[0]["goodsname"].ToString();
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red); show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
show.Block = data.Block; show.Block = data.Block;
show.Islock = true; show.Islock = true;

10
Epost.DAL/AddressstorageDAL.cs
View File

@ -133,6 +133,16 @@ namespace Epost.DAL
return dt; return dt;
} }
#endregion #endregion
#region 查询控制器下所有标签地址
public DataTable getLabelList(string controlid,string batchno)
{
string sql = string.Format(" select distinct address, state, type, ControlID,addresstype,isnull(shopid,'') as shopid,name,batchno from v_storeaddress where type in (1, 2, 8) and Controlid = '{0}' and batchno='{1}' ",
controlid,batchno);
DataTable dt = db.GetsqlForDT(sql);
return dt;
}
#endregion
#region 根据区域 查询显示箱号地址 #region 根据区域 查询显示箱号地址
public DataTable getAddressByBlock(string block) public DataTable getAddressByBlock(string block)
{ {

12
Epost.DAL/OrdersDAL.cs
View File

@ -48,7 +48,7 @@ namespace Epost.DAL
string sql = string.Empty; string sql = string.Empty;
if (!string.IsNullOrEmpty(area)) if (!string.IsNullOrEmpty(area))
{ {
sql = string.Format("select id, ProdArea, LotNo, Matchid, orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, GoodsType, corlorcode, address, ControlIP,area, block,boxcode,bkbarcode,isnull(checkquantity,0) as checkquantity,wholeunit,unit,shopid,wmsboxcode from v_orders where state = 0 and oprationstate <>3 and sku = '{0}' and block = '{1}' and area='{2}' " + strwhere + " order by layer,slist ", sql = string.Format("select id, Matchid, orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, corlorcode, address, ControlIP,area, block,boxcode,isnull(checkquantity,0) as checkquantity,wholeunit,unit,shopid,wmsboxcode,shopname from v_orders where state = 0 and oprationstate <>3 and sku = '{0}' and block = '{1}' and area='{2}' " + strwhere + " order by layer,slist ",
sku, sku,
block, area); block, area);
@ -56,7 +56,7 @@ namespace Epost.DAL
} }
else else
{ {
sql = string.Format("select id,ProdArea, LotNo, Matchid, orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, GoodsType, corlorcode, address, ControlIP, area , block,boxcode,bkbarcode,isnull(checkquantity,0) as checkquantity,wholeunit,unit,shopid,wmsboxcode from v_orders where state = 0 and oprationstate <>3 and sku = '{0}' and block = '{1}' " + strwhere + " order by layer,slist ", sql = string.Format("select id, Matchid, orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, corlorcode, address, ControlIP, area , block,boxcode,isnull(checkquantity,0) as checkquantity,wholeunit,unit,shopid,wmsboxcode ,shopname from v_orders where state = 0 and oprationstate <>3 and sku = '{0}' and block = '{1}' " + strwhere + " order by layer,slist ",
sku, sku,
block); block);
@ -90,7 +90,7 @@ namespace Epost.DAL
string sql = string.Empty; string sql = string.Empty;
if (!string.IsNullOrEmpty(area)) if (!string.IsNullOrEmpty(area))
{ {
sql = string.Format("select id,ProdArea, LotNo, Matchid, orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, GoodsType, corlorcode, address, ControlIP,area, block,boxcode,bkbarcode,isnull(checkquantity,0) as checkquantity,wholeunit,unit,shopid,wmsboxcode from v_orders where state = 0 and sku = '{0}' and block = '{1}' and area='{2}' " + strwhere + " order by layer,slist ", sql = string.Format("select id, Matchid, orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, corlorcode, address, ControlIP,area, block,boxcode,isnull(checkquantity,0) as checkquantity,wholeunit,unit,shopid,wmsboxcode from v_orders where state = 0 and sku = '{0}' and block = '{1}' and area='{2}' " + strwhere + " order by layer,slist ",
sku, sku,
block, area); block, area);
@ -98,7 +98,7 @@ namespace Epost.DAL
} }
else else
{ {
sql = string.Format("select id,ProdArea, LotNo, Matchid, orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, GoodsType, corlorcode, address, ControlIP, area , block,boxcode,bkbarcode,isnull(checkquantity,0) as checkquantity,wholeunit,unit,shopid,wmsboxcode from v_orders where state = 0 and sku = '{0}' and block = '{1}' " + strwhere + " order by layer,slist ", sql = string.Format("select id, Matchid, orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, corlorcode, address, ControlIP, area , block,boxcode,isnull(checkquantity,0) as checkquantity,wholeunit,unit,shopid,wmsboxcode from v_orders where state = 0 and sku = '{0}' and block = '{1}' " + strwhere + " order by layer,slist ",
sku, sku,
block); block);
@ -106,7 +106,7 @@ namespace Epost.DAL
} }
LogHelper.WriteLogInfo("获取订单信息location-" + sql); LogHelper.WriteLogInfo("获取回显订单信息location-" + sql);
return db.GetsqlForDT(sql); return db.GetsqlForDT(sql);
} }
catch (Exception ex) catch (Exception ex)
@ -158,7 +158,7 @@ namespace Epost.DAL
strwhere += " and matchid = '" + matchid + "'"; strwhere += " and matchid = '" + matchid + "'";
} }
string sql = string.Format("select sum(Quantity) as SumQuantity, Sum(checkquantity) as SumCkQuantity,boxweight, Discount,unit,wholeunit,matchid ,goodscode,goodsname from v_orders where sku='{0}' and block='{1}' " + strwhere + " group by sku,boxweight, Discount,goodsname,unit,wholeunit,matchid ,goodscode", string sql = string.Format("select sum(Quantity) as SumQuantity, Sum(checkquantity) as SumCkQuantity, Discount,unit,wholeunit,matchid ,goodscode,goodsname from v_orders where sku='{0}' and block='{1}' " + strwhere + " group by sku, Discount,goodsname,unit,wholeunit,matchid ,goodscode",
sku, sku,
block); block);
LogHelper.WriteLogInfo("获取订单信息-中分" + sql); LogHelper.WriteLogInfo("获取订单信息-中分" + sql);

6
Epost.Model/ResultModel.cs
View File

@ -37,4 +37,10 @@ namespace Epost.Model
} }
} }
} }
public class BatchModel {
string _batchno = string.Empty;
public string batchno { get => _batchno; set => _batchno = value; }
}
} }

86
Epost.TestToolsWeb/Controllers/HomeController.cs
View File

@ -47,91 +47,5 @@ namespace Epost.TestToolsWeb.Controllers
return View(); return View();
} }
#region 初始化
public ActionResult ClearALL()
{
bool result = false;
isShow = true;
try
{
ResultModel resultModel = contrbll.ClearALL();
return Json(new { Success = resultModel.result, Message = resultModel.msg });
}
catch (Exception)
{
return Json(new { Success = result, Message = "失败" });
}
}
#endregion
#region 开始作业
public ActionResult StartWork()
{
isShow = true;
contrbll.StartWork();
isWork = 1;
return Json(new { Success = true, Message = "成功" });
}
#endregion
#region 设备检测
public ActionResult TestStart()
{
ResultModel result = contrbll.TestStart();
if (result.result == "1")
{
return Json(new { Success = result, Message = result.msg });
}
else
{
return Json(new { Success = result, Message = result.msg });
}
}
#endregion
#region 停止检测
public ActionResult TestEnd()
{
contrbll.TestEnd();
return Json(new { Success = true, Message = "成功" });
}
#endregion
#region 结束作业
public ActionResult EndWork()
{
try
{
isShow = false;
isWork = 0;
isClear = 0;
contrbll.EndWork();
return Json(new { Success = true, Message = "成功" });
}
catch (Exception ex)
{
LogHelper.WriteLogInfo("结束作业异常" + ex.Message);
return Json(new { Success = false, Message = "失败" });
}
}
#endregion
} }
} }

6
Epost.TestToolsWeb/Controllers/ServerController.cs
View File

@ -104,21 +104,21 @@ namespace Epost.DPS.Controllers
#region 设备检测 #region 设备检测
[Route("TestStart")] [Route("TestStart")]
[HttpPost] [HttpPost]
public ResultModel TestStart() public ResultModel TestStart(BatchModel model)
{ {
lock (lockinit) lock (lockinit)
{ {
ResultModel res = new ResultModel(); ResultModel res = new ResultModel();
try try
{ {
ResultModel result = contrbll.TestStart(); ResultModel result = contrbll.TestStart(model.batchno);
return result; return result;
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.WriteLogInfo("GetDataList异常：" + ex.Message); LogHelper.WriteLogInfo("TestStart异常：" + ex.Message);
res.msg = "请求异常！"; res.msg = "请求异常！";
res.result = "-1"; res.result = "-1";
return res; return res;

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

@ -11,7 +11,7 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected> <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth> <WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
<NameOfLastUsedPublishProfile>E:\WORK\代码管理\T系列\播种\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>E:\WORK\代码管理\T系列\播种\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />
<IISExpressAnonymousAuthentication /> <IISExpressAnonymousAuthentication />

14
Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml
View File

@ -9,13 +9,13 @@
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration> <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform> <LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish /> <SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish> <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<ExcludeApp_Data>False</ExcludeApp_Data> <ExcludeApp_Data>false</ExcludeApp_Data>
<publishUrl>D:\驿传\T系列</publishUrl> <publishUrl>D:\驿传\Wuxidingshi_DAS</publishUrl>
<DeleteExistingFiles>True</DeleteExistingFiles> <DeleteExistingFiles>true</DeleteExistingFiles>
<PrecompileBeforePublish>True</PrecompileBeforePublish> <PrecompileBeforePublish>true</PrecompileBeforePublish>
<EnableUpdateable>True</EnableUpdateable> <EnableUpdateable>true</EnableUpdateable>
<DebugSymbols>False</DebugSymbols> <DebugSymbols>false</DebugSymbols>
<WDPMergeOption>DonotMerge</WDPMergeOption> <WDPMergeOption>DonotMerge</WDPMergeOption>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

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

@ -6,8 +6,8 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile /> <TimeStampOfAssociatedLegacyPublishXmlFile />
<_PublishTargetUrl>D:\驿传\T系列</_PublishTargetUrl> <_PublishTargetUrl>D:\驿传\Wuxidingshi_DAS</_PublishTargetUrl>
<History>True|2024-09-01T02:13:37.1598955Z;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>False|2024-11-04T09:48:25.2781696Z;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>09/01/2024 13:28:03</publishTime> <publishTime>11/08/2024 11:47:18</publishTime>
</File> </File>
<File Include="bin/App_global.asax.dll"> <File Include="bin/App_global.asax.dll">
<publishTime>09/01/2024 13:28:02</publishTime> <publishTime>11/08/2024 11:47:17</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>09/01/2024 10:13:03</publishTime> <publishTime>11/06/2024 10:26:56</publishTime>
</File> </File>
<File Include="bin/Common.pdb"> <File Include="bin/Common.pdb">
<publishTime>09/01/2024 10:13:03</publishTime> <publishTime>11/06/2024 10:26:56</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>09/01/2024 13:27:54</publishTime> <publishTime>11/08/2024 11:47:07</publishTime>
</File> </File>
<File Include="bin/Epost.BLL.pdb"> <File Include="bin/Epost.BLL.pdb">
<publishTime>09/01/2024 13:27:54</publishTime> <publishTime>11/08/2024 11:47:07</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>09/01/2024 11:27:24</publishTime> <publishTime>11/08/2024 11:47:06</publishTime>
</File> </File>
<File Include="bin/Epost.DAL.pdb"> <File Include="bin/Epost.DAL.pdb">
<publishTime>09/01/2024 11:27:24</publishTime> <publishTime>11/08/2024 11:47:06</publishTime>
</File> </File>
<File Include="bin/Epost.DPS.dll"> <File Include="bin/Epost.DPS.dll">
<publishTime>09/01/2024 13:27:56</publishTime> <publishTime>11/08/2024 11:47:09</publishTime>
</File> </File>
<File Include="bin/Epost.DPS.pdb"> <File Include="bin/Epost.DPS.pdb">
<publishTime>09/01/2024 13:27:56</publishTime> <publishTime>11/08/2024 11:47:09</publishTime>
</File> </File>
<File Include="bin/Epost.Model.dll"> <File Include="bin/Epost.Model.dll">
<publishTime>08/31/2024 17:27:44</publishTime> <publishTime>11/06/2024 10:26:56</publishTime>
</File> </File>
<File Include="bin/Epost.Model.pdb"> <File Include="bin/Epost.Model.pdb">
<publishTime>08/31/2024 17:27:44</publishTime> <publishTime>11/06/2024 10:26:56</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>
@ -5652,7 +5652,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>09/01/2024 13:27:58</publishTime> <publishTime>11/08/2024 11:47:11</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>
@ -7572,7 +7572,7 @@
<publishTime>07/04/2022 14:22:38</publishTime> <publishTime>07/04/2022 14:22:38</publishTime>
</File> </File>
<File Include="Web.config"> <File Include="Web.config">
<publishTime>08/31/2024 19:13:15</publishTime> <publishTime>11/01/2024 16:24:56</publishTime>
</File> </File>
</ItemGroup> </ItemGroup>
</Project> </Project>

6
Epost.TestToolsWeb/Web.config
View File

@ -11,7 +11,7 @@
</configSections> </configSections>
<connectionStrings> <connectionStrings>
<add name="weijie_dpsEntities" connectionString="metadata=res://*/WJDB.csdl|res://*/WJDB.ssdl|res://*/WJDB.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=.;initial catalog=weijie_dps;user id=sa;password=123456;min pool size=4;max pool size=4;packet size=3072;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" /> <add name="weijie_dpsEntities" connectionString="metadata=res://*/WJDB.csdl|res://*/WJDB.ssdl|res://*/WJDB.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=.;initial catalog=weijie_dps;user id=sa;password=123456;min pool size=4;max pool size=4;packet size=3072;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
<add name="SqlLocDPSConnection" connectionString="server=139.196.36.200;user id=EpostTest;password=antion;database=BJ_ZhongLiang_DAS;min pool size=512;max pool size=512;packet size=3072" providerName="System.Data.SqlClient" /> <add name="SqlLocDPSConnection" connectionString="server=139.196.36.200;user id=EpostTest;password=antion;database=WuXi_DingShi_DAS;min pool size=512;max pool size=512;packet size=3072" providerName="System.Data.SqlClient" />
<add name="MysqlLocDPSConnection" connectionString="Server=localhost;Port=3306;Database=world;User=root; Password=antion;SslMode=None;Pooling=true;Allow User Variables=True;" /> <add name="MysqlLocDPSConnection" connectionString="Server=localhost;Port=3306;Database=world;User=root; Password=antion;SslMode=None;Pooling=true;Allow User Variables=True;" />
<add name="WMSConnection" connectionString="data source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=139.196.36.200)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=EpostDB)));user id=C##Test;password=test" /> <add name="WMSConnection" connectionString="data source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=139.196.36.200)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=EpostDB)));user id=C##Test;password=test" />
@ -27,11 +27,11 @@
<add key="ControlXML" value="/App_Data/EpostController.xml" /> <add key="ControlXML" value="/App_Data/EpostController.xml" />
<add key="LabelXML" value="/App_Data/AddressStorage.xml" /> <add key="LabelXML" value="/App_Data/AddressStorage.xml" />
<add key="ResultsXML" value="/App_Data/Results.xml" /> <add key="ResultsXML" value="/App_Data/Results.xml" />
<add key="WebAPIUrl" value="http://192.168.3.65:8051/api/WebAPI/ProcessingResult"/> <add key="WebAPIUrl" value="http://192.168.0.20:8045/api/WebAPI/ProcessingResult"/>
<add key="ShowMode" value="1" /> <add key="ShowMode" value="1" />
<add key="SetupMode" value="\Epost_P\Epost.TestToolsWeb\App_Data\SetupMode.txt" /> <add key="SetupMode" value="\Epost_P\Epost.TestToolsWeb\App_Data\SetupMode.txt" />
<add key="CARID" value="HT01" /> <add key="CARID" value="HT01" />
<add key="ServerAPIURL" value="http://192.168.3.65:8051/api/WebAPI" /> <add key="ServerAPIURL" value="http://192.168.0.20:8045/api/WebAPI" />
<add key="SleepTime" value="1" /> <add key="SleepTime" value="1" />
</appSettings> </appSettings>
<!-- <!--