This commit is contained in:
@ -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);
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user