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

14
Epost.BLL/OrderBLL.cs
View File

@ -689,12 +689,12 @@ namespace Epost.BLL
{
string usercode = string.Empty;
string lightcolor = string.Empty;
DataTable udt = dal.GetOrderUseerXCode(matchid, sku, area, block);
if (udt != null && udt.Rows.Count > 0)
{
usercode = udt.Rows[0]["usercode"].ToString();
lightcolor = udt.Rows[0]["lightcolor"].ToString();
}
//DataTable udt = dal.GetOrderUseerXCode(matchid, sku, area, block);
//if (udt != null && udt.Rows.Count > 0)
//{
// usercode = udt.Rows[0]["usercode"].ToString();
// lightcolor = udt.Rows[0]["lightcolor"].ToString();
//}
if (string.IsNullOrEmpty(lightcolor))
{
lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
@ -717,8 +717,6 @@ namespace Epost.BLL
demodel.BoxCode = item["boxcode"].ToString();
demodel.Discount = item["Discount"].ToString();
demodel.ColorCode = item["corlorcode"].ToString();
demodel.WholeUnit = item["WholeUnit"].ToString();
demodel.Unit = item["Unit"].ToString();

36
Epost.BLL/Work_DisplayJobThread.cs
View File

@ -6,7 +6,8 @@ using Epost.Model.resource;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Linq;
using System.Runtime.InteropServices.WindowsRuntime;
using System.Threading;
@ -99,17 +100,42 @@ namespace Epost.BLL
showmodel.Area = shelfid;
showmodel.Block = nblock;
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.Islock = true;
if (queueDT.Rows[0]["lightcolor"].ToString() == "1")
{
showmodel.Islock = false;
}
showmodel.IsTwinkle = 0;
showmodel.Type = 8;
DataTable sudt = orderbll.GetSumList("", queueDT.Rows[0]["sku"].ToString(), nblock);
if (sudt != null && sudt.Rows.Count > 0)
DataTable skudt = orderbll.GetSumList(queueDT.Rows[0]["matchid"].ToString(), queueDT.Rows[0]["sku"].ToString(), nblock, shelfid);
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);//点亮显示标签
#endregion
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);
}
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())
{
LogHelper.WriteLogInfo("显示器拍下=="+rejob.Count);
JobModel model = rejob.FirstOrDefault();
comBLL.ClearArea_M(rejob);
//熄灭通道灯
@ -269,6 +272,7 @@ namespace Epost.BLL
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Green);
show.Type = 8;
show.Block = block;
show.Area = area;
show.Islock = false;
show.IsTwinkle = 1;
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.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
@ -243,8 +244,11 @@ namespace Epost.BLL
scanStr = sinfodt.Rows[0]["sku"].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);
DataTable skudt = orderbll.GetSumList("", scanStr, data.Block);
DataTable skudt = orderbll.GetSumList(matchid, scanStr, data.Block);
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 SumQuantity = Convert.ToInt32(skudt.Rows[0]["SumQuantity"].ToString());
int zcount = Convert.ToInt32(skudt.Rows[0]["SumQuantity"].ToString());
if (discount != 1)
{
if (SumQuantity >= discount)
@ -270,7 +275,7 @@ namespace Epost.BLL
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
show.Block = data.Block;
show.Islock = true;
show.Contents = data.Parameter + "(" + scanStr + ")\r" + "规格：" + discount;
show.Contents = data.Parameter + "(" + scanStr + ")\r" + "规格：" + discount + "\r总数量：" + zcount;
show.Qty = SumQuantity.ToString();
show.Wholeqty = SumCkQuantity;
show.Unit = "件";
@ -458,7 +463,7 @@ namespace Epost.BLL
// qmodel.Location = location;
qmodel.Shopid = echoDt.Rows[0]["GoodsName"].ToString();
qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Green);
qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Blue);
queueBLL.insertQueueOrders(qmodel);