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
2025-06-24 21:27:13 +08:00
parent 7ed7a8cd88
commit cc38437359
10 changed files with 55 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Epost.BLL/OrderBLL.cs
View File

@ -660,7 +660,7 @@ namespace Epost.BLL
//} //}
if (OrderDt != null && OrderDt.Rows.Count > 0) if (OrderDt != null && OrderDt.Rows.Count > 0)
{ {
string usercode = string.Empty; // string usercode = string.Empty;
string lightcolor = string.Empty; string lightcolor = string.Empty;
//DataTable udt = dal.GetOrderUseerXCode(matchid, sku, area, block); //DataTable udt = dal.GetOrderUseerXCode(matchid, sku, area, block);
//if (udt != null && udt.Rows.Count > 0) //if (udt != null && udt.Rows.Count > 0)
@ -697,7 +697,7 @@ namespace Epost.BLL
demodel.Block = item["Block"].ToString(); demodel.Block = item["Block"].ToString();
demodel.Area = item["Area"].ToString(); demodel.Area = item["Area"].ToString();
demodel.Address = item["address"].ToString(); demodel.Address = item["address"].ToString();
demodel.UserCode = usercode; demodel.UserCode = UserCode;
demodel.ColorCode = lightcolor; demodel.ColorCode = lightcolor;
demodel.Bkaddress = "0"; demodel.Bkaddress = "0";
demodel.Addresstype = "1"; demodel.Addresstype = "1";
@ -718,6 +718,7 @@ namespace Epost.BLL
// demodel.No = "04"; // demodel.No = "04";
// demodel.ColorCode = EnumHelper.EMToDescriptionString(LightColor.Color.Blue); // demodel.ColorCode = EnumHelper.EMToDescriptionString(LightColor.Color.Blue);
//} //}
demodel.UserCode = UserCode;
list.Add(demodel); list.Add(demodel);
if (!isecho) { if (!isecho) {
//修改数据为已读 //修改数据为已读
@ -835,9 +836,9 @@ namespace Epost.BLL
#endregion #endregion
#region 修改订单信息 #region 修改订单信息
public bool Updatestate(string matchid,string readdate) public bool Updatestate(string matchid,string shopid)
{ {
return dal.Updatestate(matchid,readdate); return dal.Updatestate(matchid, shopid);
} }
#endregion #endregion

4
Epost.BLL/OrdersQueueBLL.cs
View File

@ -141,10 +141,10 @@ namespace Epost.BLL
} }
#endregion #endregion
#region 获取sku是否正在作业 #region 获取sku是否正在作业
public DataTable GetOrderQueue(string block,string area, string state) public DataTable GetOrderQueue(string block,string area, string state,string sku)
{ {
return dal.GetOrderQueue(block,area, state); return dal.GetOrderQueue(block,area, state,sku);
} }
#endregion #endregion

20
Epost.BLL/Work_JobDownThread.cs
View File

@ -6,6 +6,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Linq; using System.Linq;
using System.Runtime.Remoting.Metadata.W3cXsd2001;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -161,7 +162,7 @@ namespace Epost.BLL
if (finjob.Any()) if (finjob.Any())
{ {
JobModel finmodel = finjob.FirstOrDefault(); JobModel finmodel = finjob.FirstOrDefault();
qmodel.UserCode = finmodel.UserCode; // qmodel.UserCode = finmodel.UserCode;
qmodel.Sku = finmodel.Sku; qmodel.Sku = finmodel.Sku;
qmodel.Matchid = finmodel.Matchid; qmodel.Matchid = finmodel.Matchid;
@ -280,17 +281,24 @@ namespace Epost.BLL
if (shopfinish) if (shopfinish)
{ {
LogHelper.WriteLogInfo("门店拣选完成换箱" + model.ShopID); LogHelper.WriteLogInfo("门店拣选完成换箱" + model.ShopID);
orderbll.ChangeBox(model, 2); orderbll.Updatestate(model.Matchid, model.ShopID);
} }
else { else {
#region 换箱
if (type == 2) if (type == 2)
{ {
LogHelper.WriteLogInfo("开始换箱" + model.ShopID); LogHelper.WriteLogInfo("拣选人员操作换箱");
orderbll.ChangeBox(model); orderbll.Updatestate(model.Matchid, model.ShopID);
} }
#endregion
} }
//else {
// #region 换箱
// if (type == 2)
// {
// LogHelper.WriteLogInfo("开始换箱" + model.ShopID);
// orderbll.ChangeBox(model);
// }
// #endregion
//}
} }

4
Epost.BLL/Work_ScanThread.cs
View File

@ -417,7 +417,7 @@ namespace Epost.BLL
location = data.Parameter;// sinfodt.Rows[0]["tolocation"].ToString(); location = data.Parameter;// sinfodt.Rows[0]["tolocation"].ToString();
} }
data.Parameter = scanStr; data.Parameter = scanStr;
DataTable skudt = queueBLL.GetOrderQueue(data.Block, data.Area, "2"); DataTable skudt = queueBLL.GetOrderQueue(data.Block, data.Area, "2", scanStr);
List<ResultMessageModel> scanlist = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Address == data.Address && m.Parameter == scanStr && m.Parameter != "888888" && m.Block == data.Block && m.Area == data.Area); List<ResultMessageModel> scanlist = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Address == data.Address && m.Parameter == scanStr && m.Parameter != "888888" && m.Block == data.Block && m.Area == data.Area);
if (scanlist.Count > 1 || (skudt != null && skudt.Rows.Count > 0)) if (scanlist.Count > 1 || (skudt != null && skudt.Rows.Count > 0))
@ -429,12 +429,14 @@ namespace Epost.BLL
//show.Area = sarea; //show.Area = sarea;
//show.Type = 8; //show.Type = 8;
//comBLL.ShowBoxMessage_M(show); //comBLL.ShowBoxMessage_M(show);
logBLL.SaveShowMesError("商品重复扫描或正在拣配！", "商品重复扫描或正在拣配");
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute); downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
} }
else else
{ {
DataTable OrderDt = orderbll.GetOrderList_Car(matchid, scanStr, data.Area, data.Block); DataTable OrderDt = orderbll.GetOrderList_Car(matchid, scanStr, data.Area, data.Block);
if (OrderDt != null && OrderDt.Rows.Count > 0) if (OrderDt != null && OrderDt.Rows.Count > 0)
{ {

7
Epost.DAL/OrdersDAL.cs
View File

@ -2419,15 +2419,16 @@ namespace Epost.DAL
} }
#endregion #endregion
#region 修改订单信息 #region 修改订单信息
public bool Updatestate(string matchid, string readdate) public bool Updatestate(string matchid, string shopid)
{ {
try try
{ {
string sql = string.Format(" update orders set state =0 where matchid='{0}' and readtime='{1}' and state=99", string sql = string.Format(" update orders set state =3 where matchid='{0}' and shopid='{1}' and state = 0 and oprationstate=3",
matchid, matchid,
readdate); shopid);
long x = db.UpdateSql(sql); long x = db.UpdateSql(sql);
LogHelper.WriteLogInfo(x + "换箱"+sql);
if (x > 0) if (x > 0)
return true; return true;
return false; return false;

6
Epost.DAL/OrdersQueueDAL.cs
View File

@ -211,11 +211,11 @@ namespace Epost.DAL
#endregion #endregion
#region 获取sku是否正在作业 #region 获取sku是否正在作业
public DataTable GetOrderQueue(string block,string area,string state) public DataTable GetOrderQueue(string block,string area,string state,string sku)
{ {
string sql = string.Format("select * from OrdersQueue where state ='{0}' and taskblock='{1}' and taskarea='{2}'", string sql = string.Format("select * from OrdersQueue where state ='{0}' or (state = 1 and sku='{3}') and taskblock='{1}' and taskarea='{2}'",
state, state,
block,area); block,area,sku);
LogHelper.WriteLogInfo("获取sku是否正在作业" + sql); LogHelper.WriteLogInfo("获取sku是否正在作业" + sql);
return db.GetsqlForDT(sql); return db.GetsqlForDT(sql);

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

@ -7,7 +7,7 @@
<PropertyGroup> <PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile /> <TimeStampOfAssociatedLegacyPublishXmlFile />
<_PublishTargetUrl>D:\驿传\GuangzhouHuiFeng_DAS</_PublishTargetUrl> <_PublishTargetUrl>D:\驿传\GuangzhouHuiFeng_DAS</_PublishTargetUrl>
<History>True|2025-06-24T06:58:06.2128620Z||;False|2025-06-24T14:57:07.8710970+08:00||;True|2025-06-24T14:54:53.0047658+08:00||;True|2025-06-24T14:21:21.1147627+08:00||;False|2025-06-24T14:20:37.2040902+08:00||;True|2025-06-24T13:14:08.5696828+08:00||;True|2025-06-24T11:28:41.9414169+08:00||;False|2025-06-24T11:28:18.5427055+08:00||;True|2025-06-23T18:49:19.8150434+08:00||;False|2025-06-23T18:47:53.8200239+08:00||;True|2025-06-23T18:13:17.9954519+08:00||;True|2025-06-16T16:39:46.1896351+08:00||;True|2025-06-04T15:01:49.8008687+08:00||;True|2025-01-16T15:37:40.8814043+08:00||;True|2024-12-19T15:11:44.2536385+08:00||;True|2024-12-10T19:10:26.6514077+08:00||;True|2024-12-10T18:30:34.7211512+08:00||;True|2024-12-09T14:06:46.4112259+08:00||;True|2024-12-03T14:23:26.2134334+08:00||;True|2024-11-27T18:53:48.7373661+08:00||;True|2024-11-27T14:27:33.0840789+08:00||;True|2024-11-27T14:08:15.6442660+08:00||;True|2024-11-27T12:10:03.9412549+08:00||;True|2024-11-27T11:45:31.3775097+08:00||;True|2024-11-27T11:32:00.8297320+08:00||;True|2024-11-23T20:50:04.5476409+08:00||;False|2024-11-04T17:48:25.2781696+08:00||;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> <History>True|2025-06-24T11:52:28.3640036Z||;True|2025-06-24T19:41:27.8431415+08:00||;True|2025-06-24T19:02:20.3384315+08:00||;True|2025-06-24T14:58:06.2128620+08:00||;False|2025-06-24T14:57:07.8710970+08:00||;True|2025-06-24T14:54:53.0047658+08:00||;True|2025-06-24T14:21:21.1147627+08:00||;False|2025-06-24T14:20:37.2040902+08:00||;True|2025-06-24T13:14:08.5696828+08:00||;True|2025-06-24T11:28:41.9414169+08:00||;False|2025-06-24T11:28:18.5427055+08:00||;True|2025-06-23T18:49:19.8150434+08:00||;False|2025-06-23T18:47:53.8200239+08:00||;True|2025-06-23T18:13:17.9954519+08:00||;True|2025-06-16T16:39:46.1896351+08:00||;True|2025-06-04T15:01:49.8008687+08:00||;True|2025-01-16T15:37:40.8814043+08:00||;True|2024-12-19T15:11:44.2536385+08:00||;True|2024-12-10T19:10:26.6514077+08:00||;True|2024-12-10T18:30:34.7211512+08:00||;True|2024-12-09T14:06:46.4112259+08:00||;True|2024-12-03T14:23:26.2134334+08:00||;True|2024-11-27T18:53:48.7373661+08:00||;True|2024-11-27T14:27:33.0840789+08:00||;True|2024-11-27T14:08:15.6442660+08:00||;True|2024-11-27T12:10:03.9412549+08:00||;True|2024-11-27T11:45:31.3775097+08:00||;True|2024-11-27T11:32:00.8297320+08:00||;True|2024-11-23T20:50:04.5476409+08:00||;False|2024-11-04T17:48:25.2781696+08:00||;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>06/24/2025 14:54:49</publishTime> <publishTime>06/24/2025 19:52:24</publishTime>
</File> </File>
<File Include="bin/App_global.asax.dll"> <File Include="bin/App_global.asax.dll">
<publishTime>06/24/2025 14:54:49</publishTime> <publishTime>06/24/2025 19:52:24</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>06/24/2025 11:28:02</publishTime> <publishTime>06/24/2025 19:02:01</publishTime>
</File> </File>
<File Include="bin/Common.pdb"> <File Include="bin/Common.pdb">
<publishTime>06/24/2025 11:28:02</publishTime> <publishTime>06/24/2025 19:02:01</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>06/24/2025 14:54:36</publishTime> <publishTime>06/24/2025 19:52:12</publishTime>
</File> </File>
<File Include="bin/Epost.BLL.pdb"> <File Include="bin/Epost.BLL.pdb">
<publishTime>06/24/2025 14:54:36</publishTime> <publishTime>06/24/2025 19:52:12</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>06/24/2025 14:54:36</publishTime> <publishTime>06/24/2025 19:02:02</publishTime>
</File> </File>
<File Include="bin/Epost.DAL.pdb"> <File Include="bin/Epost.DAL.pdb">
<publishTime>06/24/2025 14:54:36</publishTime> <publishTime>06/24/2025 19:02:02</publishTime>
</File> </File>
<File Include="bin/Epost.DPS.dll"> <File Include="bin/Epost.DPS.dll">
<publishTime>06/24/2025 14:54:40</publishTime> <publishTime>06/24/2025 19:52:15</publishTime>
</File> </File>
<File Include="bin/Epost.DPS.pdb"> <File Include="bin/Epost.DPS.pdb">
<publishTime>06/24/2025 14:54:40</publishTime> <publishTime>06/24/2025 19:52:15</publishTime>
</File> </File>
<File Include="bin/Epost.Model.dll"> <File Include="bin/Epost.Model.dll">
<publishTime>06/24/2025 11:28:01</publishTime> <publishTime>06/24/2025 15:55:11</publishTime>
</File> </File>
<File Include="bin/Epost.Model.pdb"> <File Include="bin/Epost.Model.pdb">
<publishTime>06/24/2025 11:28:01</publishTime> <publishTime>06/24/2025 15:55:11</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>
@ -105,13 +105,13 @@
<publishTime>04/29/2020 16:50:14</publishTime> <publishTime>04/29/2020 16:50:14</publishTime>
</File> </File>
<File Include="bin/FastReport.Bars.dll"> <File Include="bin/FastReport.Bars.dll">
<publishTime>06/24/2025 09:50:48</publishTime> <publishTime>06/24/2025 15:50:35</publishTime>
</File> </File>
<File Include="bin/FastReport.dll"> <File Include="bin/FastReport.dll">
<publishTime>06/24/2025 09:50:48</publishTime> <publishTime>06/24/2025 15:50:35</publishTime>
</File> </File>
<File Include="bin/FastReport.Editor.dll"> <File Include="bin/FastReport.Editor.dll">
<publishTime>06/24/2025 09:50:48</publishTime> <publishTime>06/24/2025 15:50:35</publishTime>
</File> </File>
<File Include="bin/Google.Protobuf.dll"> <File Include="bin/Google.Protobuf.dll">
<publishTime>08/10/2018 18:51:54</publishTime> <publishTime>08/10/2018 18:51:54</publishTime>
@ -5661,7 +5661,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>06/24/2025 14:54:41</publishTime> <publishTime>06/24/2025 19:52:17</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>
@ -7581,7 +7581,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>06/24/2025 11:28:07</publishTime> <publishTime>06/24/2025 19:02:07</publishTime>
</File> </File>
</ItemGroup> </ItemGroup>
</Project> </Project>

40
PrintBoxFormsApp/Form1.Designer.cs generated
View File

@ -1,40 +0,0 @@
namespace PrintBoxFormsApp
{
partial class Form1
{
/// <summary>
/// 必需的设计器变量。
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// 清理所有正在使用的资源。
/// </summary>
/// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows 窗体设计器生成的代码
/// <summary>
/// 设计器支持所需的方法 - 不要修改
/// 使用代码编辑器修改此方法的内容。
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 450);
this.Text = "Form1";
}
#endregion
}
}

20
PrintBoxFormsApp/Form1.cs
View File

@ -1,20 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace PrintBoxFormsApp
{
public partial class Form1 : Form
{
public Form1()
{
InitializeComponent();
}
}
}

6
PrintBoxFormsApp/PrintBoxFormsApp.csproj
View File

@ -50,12 +50,6 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Form1.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Form1.Designer.cs">
<DependentUpon>Form1.cs</DependentUpon>
</Compile>
<Compile Include="PrintList.cs"> <Compile Include="PrintList.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>