This commit is contained in:
@ -16,12 +16,20 @@ namespace Epost.BLL
|
|||||||
{
|
{
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (sku.Length >= 7)
|
||||||
|
{
|
||||||
|
sku = sku.Substring(1, 6);
|
||||||
|
}
|
||||||
|
}
|
||||||
return dal.GetSkuInfo(sku);
|
return dal.GetSkuInfo(sku);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -211,7 +211,7 @@ namespace Epost.BLL
|
|||||||
//}
|
//}
|
||||||
//else {
|
//else {
|
||||||
|
|
||||||
if (scanStr.Substring(0, 1) == "Y")
|
if (scanStr.Substring(0, 1) == "U")
|
||||||
{
|
{
|
||||||
#region 扫描工号
|
#region 扫描工号
|
||||||
if (ulist.Any())
|
if (ulist.Any())
|
||||||
@ -244,56 +244,60 @@ 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(matchid, scanStr, data.Block);
|
List<AddressstorageModel> Arealist = addrBLL.GetAreaList();
|
||||||
if (skudt != null && skudt.Rows.Count > 0)
|
if (Arealist.Any())
|
||||||
{
|
{
|
||||||
//规格
|
foreach (AddressstorageModel item in Arealist)
|
||||||
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)
|
DataTable skudt = orderbll.GetSumList("", scanStr, item.block, item.area);
|
||||||
|
if (skudt != null && skudt.Rows.Count > 0)
|
||||||
{
|
{
|
||||||
|
//规格
|
||||||
|
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());
|
||||||
|
//if (discount != 1)
|
||||||
|
//{
|
||||||
|
// if (SumQuantity >= discount)
|
||||||
|
// {
|
||||||
|
|
||||||
SumCkQuantity = SumQuantity / discount;
|
// SumCkQuantity = SumQuantity / discount;
|
||||||
SumQuantity = SumQuantity % discount;
|
// SumQuantity = SumQuantity % discount;
|
||||||
|
// }
|
||||||
|
//}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
ShowMessageModel_M show = new ShowMessageModel_M();
|
||||||
|
show.Title = skudt.Rows[0]["sku_goodsname"].ToString();
|
||||||
|
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||||
|
show.Block = item.block;
|
||||||
|
show.Islock = true;
|
||||||
|
show.Contents = data.Parameter + "(" + scanStr + ")\r";// + "规格:" + discount;
|
||||||
|
show.Qty = SumQuantity.ToString();
|
||||||
|
show.Wholeqty = SumCkQuantity;
|
||||||
|
show.Unit = "件";
|
||||||
|
show.Wholeunit = "箱";
|
||||||
|
show.Type = 2;
|
||||||
|
comBLL.ShowBoxMessage_M(show);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ShowMessageModel_M show = new ShowMessageModel_M();
|
||||||
|
show.Title = "SKU" + scanStr + "无任务!";
|
||||||
|
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
||||||
|
show.Block = item.block;
|
||||||
|
show.Islock = true;
|
||||||
|
show.Contents = "请扫描其他商品!";
|
||||||
|
show.Type = 2;
|
||||||
|
comBLL.ShowBoxMessage_M(show);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ShowMessageModel_M show = new ShowMessageModel_M();
|
|
||||||
show.Title = skudt.Rows[0]["goodsname"].ToString();
|
|
||||||
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
|
||||||
show.Block = data.Block;
|
|
||||||
show.Islock = true;
|
|
||||||
show.Contents = data.Parameter + "(" + scanStr + ")\r" + "规格:" + discount + "\r总数量:" + zcount;
|
|
||||||
show.Qty = SumQuantity.ToString();
|
|
||||||
show.Wholeqty = SumCkQuantity;
|
|
||||||
show.Unit = "件";
|
|
||||||
show.Wholeunit = "箱";
|
|
||||||
show.Type = 2;
|
|
||||||
comBLL.ShowBoxMessage_M(show);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ShowMessageModel_M show = new ShowMessageModel_M();
|
|
||||||
show.Title = "SKU" + scanStr + "未完纳!";
|
|
||||||
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
|
|
||||||
show.Block = data.Block;
|
|
||||||
show.Islock = true;
|
|
||||||
show.Contents = "请扫描其他商品!";
|
|
||||||
show.Type = 2;
|
|
||||||
comBLL.ShowBoxMessage_M(show);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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>Release|Any CPU</LastActiveSolutionConfig>
|
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||||
<Use64BitIISExpress />
|
<Use64BitIISExpress />
|
||||||
<IISExpressSSLPort />
|
<IISExpressSSLPort />
|
||||||
<IISExpressAnonymousAuthentication />
|
<IISExpressAnonymousAuthentication />
|
||||||
|
Reference in New Issue
Block a user