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-27 15:44:15 +08:00
parent a934f48c74
commit 5ac2c1b77c
7 changed files with 70 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Epost.BLL/CommandBLL.cs
View File

@ -247,7 +247,7 @@ namespace Epost.BLL
LabelParamModel lockModel = new LabelParamModel(); LabelParamModel lockModel = new LabelParamModel();
lockModel.Address = model.Address; lockModel.Address = model.Address;
lockModel.ControlIP = model.ControlIP; lockModel.ControlIP = model.ControlIP;
lockModel.Parameter = "11101000"; lockModel.Parameter = "11111000";
lockModel.Command = "LOCK"; lockModel.Command = "LOCK";
lockModel.Timeout = "0.5"; lockModel.Timeout = "0.5";
lockModel.Type = model.Type; lockModel.Type = model.Type;
@ -259,7 +259,7 @@ namespace Epost.BLL
LabelParamModel lockModel = new LabelParamModel(); LabelParamModel lockModel = new LabelParamModel();
lockModel.Address = model.Address; lockModel.Address = model.Address;
lockModel.ControlIP = model.ControlIP; lockModel.ControlIP = model.ControlIP;
lockModel.Parameter = "00011000"; lockModel.Parameter = "11111000";
lockModel.Command = "UNLOCK"; lockModel.Command = "UNLOCK";
lockModel.Timeout = "0.5"; lockModel.Timeout = "0.5";
lockModel.Type = model.Type; lockModel.Type = model.Type;
@ -501,7 +501,7 @@ namespace Epost.BLL
model.ControlIP = item.ControlIP; model.ControlIP = item.ControlIP;
model.Address = item.Address; model.Address = item.Address;
model.Command = "REMOVE_JOB"; model.Command = "REMOVE_JOB";
model.Uid = item.ID; model.Uid = "U" + item.ID;
model.Type = "N"; model.Type = "N";
list.Add(model); list.Add(model);
LabelParamModel Unlockmodel = new LabelParamModel(); LabelParamModel Unlockmodel = new LabelParamModel();

14
Epost.BLL/OrderBLL.cs
View File

@ -689,12 +689,12 @@ namespace Epost.BLL
{ {
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)
{ //{
usercode = udt.Rows[0]["usercode"].ToString(); // usercode = udt.Rows[0]["usercode"].ToString();
lightcolor = udt.Rows[0]["lightcolor"].ToString(); // lightcolor = udt.Rows[0]["lightcolor"].ToString();
} //}
if (string.IsNullOrEmpty(lightcolor)) if (string.IsNullOrEmpty(lightcolor))
{ {
lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Red); lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
@ -717,8 +717,6 @@ namespace Epost.BLL
demodel.BoxCode = item["boxcode"].ToString(); demodel.BoxCode = item["boxcode"].ToString();
demodel.Discount = item["Discount"].ToString(); demodel.Discount = item["Discount"].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();

34
Epost.BLL/Work_DisplayJobThread.cs
View File

@ -7,6 +7,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.InteropServices.WindowsRuntime;
using System.Threading; using System.Threading;
@ -99,17 +100,42 @@ namespace Epost.BLL
showmodel.Area = shelfid; showmodel.Area = shelfid;
showmodel.Block = nblock; showmodel.Block = nblock;
showmodel.Color = queueDT.Rows[0]["lightcolor"].ToString();//EnumHelper.EMToDescriptionString(LightColor.Color.Red); showmodel.Color = queueDT.Rows[0]["lightcolor"].ToString();//EnumHelper.EMToDescriptionString(LightColor.Color.Red);
showmodel.Contents = queueDT.Rows[0]["sku"].ToString();
showmodel.Title = queueDT.Rows[0]["Shopid"].ToString(); showmodel.Title = queueDT.Rows[0]["Shopid"].ToString();
showmodel.Islock = true; showmodel.Islock = true;
if (queueDT.Rows[0]["lightcolor"].ToString() == "1")
{
showmodel.Islock = false;
}
showmodel.IsTwinkle = 0; showmodel.IsTwinkle = 0;
showmodel.Type = 8; showmodel.Type = 8;
DataTable sudt = orderbll.GetSumList("", queueDT.Rows[0]["sku"].ToString(), nblock); DataTable skudt = orderbll.GetSumList(queueDT.Rows[0]["matchid"].ToString(), queueDT.Rows[0]["sku"].ToString(), nblock, shelfid);
if (sudt != null && sudt.Rows.Count > 0) if (skudt != null && skudt.Rows.Count > 0)
{ {
showmodel.Qty = sudt.Rows[0]["SumQuantity"].ToString(); showmodel.Qty = skudt.Rows[0]["SumQuantity"].ToString();
int discount = Convert.ToInt32(skudt.Rows[0]["discount"].ToString());
//整件总数
int SumCkQuantity = 0;//= Convert.ToInt32(skudt.Rows[0]["SumCkQuantity"].ToString());
//散件总数
int SumQuantity = Convert.ToInt32(skudt.Rows[0]["SumQuantity"].ToString());
int zcount = Convert.ToInt32(skudt.Rows[0]["SumQuantity"].ToString());
if (discount != 1)
{
if (SumQuantity >= discount)
{
SumCkQuantity = SumQuantity / discount;
SumQuantity = SumQuantity % discount;
} }
}
showmodel.Qty = SumQuantity.ToString();
showmodel.Wholeqty = SumCkQuantity;
showmodel.Unit = "件";
showmodel.Wholeunit = "箱";
showmodel.Contents = queueDT.Rows[0]["sku"].ToString()+"\r规格： "+ discount + " \r总数量：" + zcount;;
}
comBLL.ShowBoxMessage_M(showmodel);//点亮显示标签 comBLL.ShowBoxMessage_M(showmodel);//点亮显示标签
#endregion #endregion
displayOrder(queueDT, nblock, item.area, model); displayOrder(queueDT, nblock, item.area, model);

8
Epost.BLL/Work_JobDownThread.cs
View File

@ -172,11 +172,14 @@ namespace Epost.BLL
LogHelper.WriteLogInfo("=======" + qmodel.UserCode + "=====" + area + "区===sku=" + skulist); LogHelper.WriteLogInfo("=======" + qmodel.UserCode + "=====" + area + "区===sku=" + skulist);
} }
if (data.Loc == "check")//任意回显标签拍下 熄灭回显设备 if (type == "8")// 订单显示器熄灭回显设备
{ {
List<JobModel> rejob = jobList.FindAll(m => m.Block == block && m.Area == area && m.State == 1 && m.Sku == queueDT.Rows[0]["sku"].ToString()); LogHelper.WriteLogInfo("显示器拍下");
List<JobModel> rejob = jobList.FindAll(m => m.Block == block && m.Area == area && m.State == 1 && m.Sku == queueDT.Rows[0]["sku"].ToString()&&m.ColorCode=="1");
if (rejob.Any()) if (rejob.Any())
{ {
LogHelper.WriteLogInfo("显示器拍下=="+rejob.Count);
JobModel model = rejob.FirstOrDefault(); JobModel model = rejob.FirstOrDefault();
comBLL.ClearArea_M(rejob); comBLL.ClearArea_M(rejob);
//熄灭通道灯 //熄灭通道灯
@ -269,6 +272,7 @@ namespace Epost.BLL
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Green); show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Green);
show.Type = 8; show.Type = 8;
show.Block = block; show.Block = block;
show.Area = area;
show.Islock = false; show.Islock = false;
show.IsTwinkle = 1; show.IsTwinkle = 1;
comBLL.ShowBoxMessage_M(show); comBLL.ShowBoxMessage_M(show);

11
Epost.BLL/Work_ScanThread.cs
View File

@ -7,6 +7,7 @@ using System.Collections.Generic;
using System.Data; using System.Data;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -243,8 +244,11 @@ namespace Epost.BLL
scanStr = sinfodt.Rows[0]["sku"].ToString(); scanStr = sinfodt.Rows[0]["sku"].ToString();
// location = data.Parameter;// sinfodt.Rows[0]["tolocation"].ToString(); // location = data.Parameter;// sinfodt.Rows[0]["tolocation"].ToString();
} }
string matchid = string.Empty;
if (ulist.Any())
{ matchid = ulist.FirstOrDefault().Matchid; }
LogHelper.WriteLogInfo("中分" + data.Parameter + "===SKU" + scanStr); LogHelper.WriteLogInfo("中分" + data.Parameter + "===SKU" + scanStr);
DataTable skudt = orderbll.GetSumList("", scanStr, data.Block); DataTable skudt = orderbll.GetSumList(matchid, scanStr, data.Block);
if (skudt != null && skudt.Rows.Count > 0) if (skudt != null && skudt.Rows.Count > 0)
{ {
//规格 //规格
@ -253,6 +257,7 @@ namespace Epost.BLL
int SumCkQuantity = 0;//= Convert.ToInt32(skudt.Rows[0]["SumCkQuantity"].ToString()); int SumCkQuantity = 0;//= Convert.ToInt32(skudt.Rows[0]["SumCkQuantity"].ToString());
//散件总数 //散件总数
int SumQuantity = Convert.ToInt32(skudt.Rows[0]["SumQuantity"].ToString()); int SumQuantity = Convert.ToInt32(skudt.Rows[0]["SumQuantity"].ToString());
int zcount = Convert.ToInt32(skudt.Rows[0]["SumQuantity"].ToString());
if (discount != 1) if (discount != 1)
{ {
if (SumQuantity >= discount) if (SumQuantity >= discount)
@ -270,7 +275,7 @@ namespace Epost.BLL
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;
show.Contents = data.Parameter + "(" + scanStr + ")\r" + "规格：" + discount; show.Contents = data.Parameter + "(" + scanStr + ")\r" + "规格：" + discount + "\r总数量：" + zcount;
show.Qty = SumQuantity.ToString(); show.Qty = SumQuantity.ToString();
show.Wholeqty = SumCkQuantity; show.Wholeqty = SumCkQuantity;
show.Unit = "件"; show.Unit = "件";
@ -458,7 +463,7 @@ namespace Epost.BLL
// qmodel.Location = location; // qmodel.Location = location;
qmodel.Shopid = echoDt.Rows[0]["GoodsName"].ToString(); qmodel.Shopid = echoDt.Rows[0]["GoodsName"].ToString();
qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Green); qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Blue);
queueBLL.insertQueueOrders(qmodel); queueBLL.insertQueueOrders(qmodel);

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 />

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

@ -7,7 +7,7 @@
<PropertyGroup> <PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile /> <TimeStampOfAssociatedLegacyPublishXmlFile />
<_PublishTargetUrl>D:\驿传\Wuxidingshi_DAS</_PublishTargetUrl> <_PublishTargetUrl>D:\驿传\Wuxidingshi_DAS</_PublishTargetUrl>
<History>True|2024-11-23T12:50:04.5476409Z;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|2024-11-27T06:27:33.0840789Z;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>11/23/2024 20:50:01</publishTime> <publishTime>11/27/2024 14:27:29</publishTime>
</File> </File>
<File Include="bin/App_global.asax.dll"> <File Include="bin/App_global.asax.dll">
<publishTime>11/23/2024 20:50:01</publishTime> <publishTime>11/27/2024 14:27:29</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/23/2024 20:49:42</publishTime> <publishTime>11/27/2024 11:31:33</publishTime>
</File> </File>
<File Include="bin/Common.pdb"> <File Include="bin/Common.pdb">
<publishTime>11/23/2024 20:49:42</publishTime> <publishTime>11/27/2024 11:31:33</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/23/2024 20:49:43</publishTime> <publishTime>11/27/2024 14:27:17</publishTime>
</File> </File>
<File Include="bin/Epost.BLL.pdb"> <File Include="bin/Epost.BLL.pdb">
<publishTime>11/23/2024 20:49:43</publishTime> <publishTime>11/27/2024 14:27:17</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/23/2024 20:49:43</publishTime> <publishTime>11/27/2024 11:31:34</publishTime>
</File> </File>
<File Include="bin/Epost.DAL.pdb"> <File Include="bin/Epost.DAL.pdb">
<publishTime>11/23/2024 20:49:43</publishTime> <publishTime>11/27/2024 11:31:34</publishTime>
</File> </File>
<File Include="bin/Epost.DPS.dll"> <File Include="bin/Epost.DPS.dll">
<publishTime>11/23/2024 20:49:46</publishTime> <publishTime>11/27/2024 14:27:21</publishTime>
</File> </File>
<File Include="bin/Epost.DPS.pdb"> <File Include="bin/Epost.DPS.pdb">
<publishTime>11/23/2024 20:49:46</publishTime> <publishTime>11/27/2024 14:27:21</publishTime>
</File> </File>
<File Include="bin/Epost.Model.dll"> <File Include="bin/Epost.Model.dll">
<publishTime>11/23/2024 20:49:41</publishTime> <publishTime>11/27/2024 11:31:32</publishTime>
</File> </File>
<File Include="bin/Epost.Model.pdb"> <File Include="bin/Epost.Model.pdb">
<publishTime>11/23/2024 20:49:41</publishTime> <publishTime>11/27/2024 11:31:32</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/23/2024 20:49:48</publishTime> <publishTime>11/27/2024 14:27:22</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/23/2024 20:49:47</publishTime> <publishTime>11/27/2024 11:31:40</publishTime>
</File> </File>
</ItemGroup> </ItemGroup>
</Project> </Project>