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-29 11:19:47 +08:00
parent 0f7cc10d25
commit f4b525c564
7 changed files with 65 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Epost.BLL/SkuInfoBLL.cs
View File

@ -14,26 +14,20 @@ namespace Epost.BLL
WmsTaskBLL taskbll = new WmsTaskBLL(); WmsTaskBLL taskbll = new WmsTaskBLL();
public DataTable GetSkuInfoList(string sku) public DataTable GetSkuInfoList(string sku)
{ {
//if (sku.Substring(0, 1) == "2") if (sku.Substring(0, 1) == "2")
//{ {
// if (sku.Substring(1, 1) == "5")
// { if (sku.Length >= 8)
// if (sku.Length >= 7) {
// { sku = sku.Substring(0, 8);
// sku = sku.Substring(2, 6); }
// }
// } return dal.GetSkuInfo(sku);
// else { }
// if (sku.Length >= 7) else
// { {
// sku = sku.Substring(1, 6);
// }
// }
// return dal.GetSkuInfo(sku);
//}
//else {
return dal.GetSkuInfoList(sku); return dal.GetSkuInfoList(sku);
// } }
} }

2
Epost.BLL/Work_JobDownThread.cs
View File

@ -248,7 +248,7 @@ namespace Epost.BLL
//修改订单状态 //修改订单状态
orderbll.UpdateOrderState_Car(downlist, model, truequantity, checkquantity); orderbll.UpdateOrderState_Car(downlist, model, truequantity, checkquantity);
LogHelper.WriteLogInfo(data.Address + "=========------------------" + data.Parameter); LogHelper.WriteLogInfo(data.Address + "=========------------------" + data.Parameter);
bool skuInish = orderbll.IsFinishWork(1, block, "", area, model.Sku); bool skuInish = orderbll.IsFinishWork(1, block, "", area, model.Sku,"", model.Matchid);
model.State = 3; model.State = 3;
if (skuInish) if (skuInish)
{ {

4
Epost.DAL/OrdersQueueDAL.cs
View File

@ -290,10 +290,10 @@ namespace Epost.DAL
{ {
strwhere += "and Taskarea='" + model.Taskarea + "'"; strwhere += "and Taskarea='" + model.Taskarea + "'";
} }
string sql = string.Format("update OrdersQueue set state='{0}' where state<>3 and sku = '{1}' and matchid='{2}' and usercode='{3}'"+ strwhere, string sql = string.Format("update OrdersQueue set state='{0}' where state<>3 and sku = '{1}' and matchid='{2}' "+ strwhere,
model.State model.State
,model.Sku, ,model.Sku,
model.Matchid,model.UserCode model.Matchid
); );
LogHelper.WriteLogInfo("修改作业区段"+sql); LogHelper.WriteLogInfo("修改作业区段"+sql);

4
Epost.DAL/SkuInfoDAL.cs
View File

@ -29,8 +29,8 @@ namespace Epost.DAL
// sku); // sku);
//string sql = string.Format(" SELECT * FROM skuinfo WHERE (CHARINDEX('{0}',location)>0) or sku='{1}'", //string sql = string.Format(" SELECT * FROM skuinfo WHERE (CHARINDEX('{0}',location)>0) or sku='{1}'",
// sku, sku); // sku, sku);
string sql = string.Format(" SELECT * FROM skuinfo WHERE sku='{0}'", string sql = string.Format(" SELECT * FROM skuinfo WHERE (CHARINDEX('{0}',location)>0) or sku='{1}'",
sku); sku, sku);
return db.GetsqlForDT(sql); return db.GetsqlForDT(sql);
} }

12
Epost.TestToolsWeb.Tests/Controllers/UnitTest1.cs
View File

@ -9,6 +9,7 @@ using Epost.Common;
using System.Web.Helpers; using System.Web.Helpers;
using System.Data; using System.Data;
using System.Configuration; using System.Configuration;
using System.Windows.Forms;
namespace Epost.TestToolsWeb.Tests.Controllers namespace Epost.TestToolsWeb.Tests.Controllers
{ {
@ -19,13 +20,16 @@ namespace Epost.TestToolsWeb.Tests.Controllers
[TestMethod] [TestMethod]
public void d() public void d()
{ {
string sku = "211100"; string sku = "2509267236248";
if (sku.Substring(0, 1) == "2" && sku.Substring(1, 1) != "5") if (sku.Substring(0, 1) == "2")
{ {
if (sku.Length >= 7)
if (sku.Length >= 8)
{ {
sku = sku.Substring(1, 6); sku = sku.Substring(0, 8);
} }
} }
} }
} }

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

@ -21,5 +21,29 @@
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID> <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath> <Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
</PropertyGroup> </PropertyGroup>
<ProjectExtensions /> <ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<StartPageUrl>
</StartPageUrl>
<StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
<SQLDebugging>False</SQLDebugging>
<ExternalProgram>
</ExternalProgram>
<StartExternalURL>
</StartExternalURL>
<StartCmdLineArguments>
</StartCmdLineArguments>
<StartWorkingDirectory>
</StartWorkingDirectory>
<EnableENC>True</EnableENC>
<AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project> </Project>

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

@ -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>11/27/2024 18:53:46</publishTime> <publishTime>11/28/2024 15:05:51</publishTime>
</File> </File>
<File Include="bin/App_global.asax.dll"> <File Include="bin/App_global.asax.dll">
<publishTime>11/27/2024 18:53:45</publishTime> <publishTime>11/28/2024 15:05:51</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>11/27/2024 18:53:33</publishTime> <publishTime>11/28/2024 11:43:05</publishTime>
</File> </File>
<File Include="bin/Common.pdb"> <File Include="bin/Common.pdb">
<publishTime>11/27/2024 18:53:33</publishTime> <publishTime>11/28/2024 11:43:05</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>11/27/2024 18:53:34</publishTime> <publishTime>11/28/2024 15:05:39</publishTime>
</File> </File>
<File Include="bin/Epost.BLL.pdb"> <File Include="bin/Epost.BLL.pdb">
<publishTime>11/27/2024 18:53:34</publishTime> <publishTime>11/28/2024 15:05:39</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>11/27/2024 18:53:33</publishTime> <publishTime>11/28/2024 15:05:39</publishTime>
</File> </File>
<File Include="bin/Epost.DAL.pdb"> <File Include="bin/Epost.DAL.pdb">
<publishTime>11/27/2024 18:53:33</publishTime> <publishTime>11/28/2024 15:05:39</publishTime>
</File> </File>
<File Include="bin/Epost.DPS.dll"> <File Include="bin/Epost.DPS.dll">
<publishTime>11/27/2024 18:53:37</publishTime> <publishTime>11/28/2024 15:05:42</publishTime>
</File> </File>
<File Include="bin/Epost.DPS.pdb"> <File Include="bin/Epost.DPS.pdb">
<publishTime>11/27/2024 18:53:37</publishTime> <publishTime>11/28/2024 15:05:42</publishTime>
</File> </File>
<File Include="bin/Epost.Model.dll"> <File Include="bin/Epost.Model.dll">
<publishTime>11/27/2024 18:53:33</publishTime> <publishTime>11/28/2024 11:43:04</publishTime>
</File> </File>
<File Include="bin/Epost.Model.pdb"> <File Include="bin/Epost.Model.pdb">
<publishTime>11/27/2024 18:53:33</publishTime> <publishTime>11/28/2024 11:43:04</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>11/27/2024 18:53:39</publishTime> <publishTime>11/28/2024 15:05:44</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>11/27/2024 18:53:38</publishTime> <publishTime>11/28/2024 11:43:10</publishTime>
</File> </File>
</ItemGroup> </ItemGroup>
</Project> </Project>