This commit is contained in:
@ -6,6 +6,7 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Linq;
|
||||
using System.Runtime.Remoting.Metadata.W3cXsd2001;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
@ -161,7 +162,7 @@ namespace Epost.BLL
|
||||
if (finjob.Any())
|
||||
{
|
||||
JobModel finmodel = finjob.FirstOrDefault();
|
||||
qmodel.UserCode = finmodel.UserCode;
|
||||
// qmodel.UserCode = finmodel.UserCode;
|
||||
qmodel.Sku = finmodel.Sku;
|
||||
qmodel.Matchid = finmodel.Matchid;
|
||||
|
||||
@ -275,22 +276,29 @@ namespace Epost.BLL
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
bool shopfinish = orderbll.IsFinishWork(1, block, "", area,"", model.ShopID, model.Matchid);
|
||||
|
||||
bool shopfinish = orderbll.IsFinishWork(1, block, "", area, "", model.ShopID, model.Matchid);
|
||||
if (shopfinish)
|
||||
{
|
||||
LogHelper.WriteLogInfo("门店拣选完成换箱" + model.ShopID);
|
||||
orderbll.ChangeBox(model, 2);
|
||||
orderbll.Updatestate(model.Matchid, model.ShopID);
|
||||
}
|
||||
else {
|
||||
#region 换箱
|
||||
if (type == 2)
|
||||
{
|
||||
LogHelper.WriteLogInfo("开始换箱" + model.ShopID);
|
||||
orderbll.ChangeBox(model);
|
||||
LogHelper.WriteLogInfo("拣选人员操作换箱");
|
||||
orderbll.Updatestate(model.Matchid, model.ShopID);
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
//else {
|
||||
// #region 换箱
|
||||
// if (type == 2)
|
||||
// {
|
||||
// LogHelper.WriteLogInfo("开始换箱" + model.ShopID);
|
||||
// orderbll.ChangeBox(model);
|
||||
// }
|
||||
// #endregion
|
||||
//}
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user