|
|
@@ -103,7 +103,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
dic.Remove("UserId");
|
|
|
|
|
|
int OpId = int.Parse(function.CheckInt(dic["QueryCount"].ToString()));
|
|
|
- var opInfo = opdb.SysAdmin.FirstOrDefault( m => m.UserId == OpId && m.QueryCount == 1 && m.Status > -1) ?? new OpModels.SysAdmin();
|
|
|
+ var opInfo = opdb.SysAdmin.FirstOrDefault(m => m.UserId == OpId && m.QueryCount == 1 && m.Status > -1) ?? new OpModels.SysAdmin();
|
|
|
dic["OpCode"] = opInfo.OpCode;
|
|
|
|
|
|
}
|
|
|
@@ -527,6 +527,8 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
if (BrandId == 7) FromStoreId = 1047;
|
|
|
if (BrandId == 8) FromStoreId = 4831;
|
|
|
if (BrandId == 9) FromStoreId = 4832;
|
|
|
+ if (BrandId == 10) FromStoreId = 5512;
|
|
|
+ if (BrandId == 11) FromStoreId = 5513;
|
|
|
CheckSendInfo items = checksendInfos.FirstOrDefault(m => m.BrandId == BrandId);
|
|
|
if (items == null)
|
|
|
{
|
|
|
@@ -555,6 +557,8 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
if (BrandIds == 7) FromStoreId = 1047;
|
|
|
if (BrandIds == 8) FromStoreId = 4831;
|
|
|
if (BrandIds == 9) FromStoreId = 4832;
|
|
|
+ if (BrandId == 10) FromStoreId = 5512;
|
|
|
+ if (BrandId == 11) FromStoreId = 5513;
|
|
|
var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == BrandIds);
|
|
|
CheckSendInfo items = checksendInfos.FirstOrDefault(m => m.BrandId == BrandIds) ?? new CheckSendInfo();
|
|
|
if (items.Num > num)
|
|
|
@@ -596,6 +600,8 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
if (BrandId == 7) FromStoreId = 1047;
|
|
|
if (BrandId == 8) FromStoreId = 4831;
|
|
|
if (BrandId == 9) FromStoreId = 4832;
|
|
|
+ if (BrandId == 10) FromStoreId = 5512;
|
|
|
+ if (BrandId == 11) FromStoreId = 5513;
|
|
|
if (PosSnList.Contains(SnNo))
|
|
|
{
|
|
|
error += "以下操作失败" + SnNo + ',' + "该机具重复发货" + '\n';
|
|
|
@@ -633,6 +639,8 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
if (BrandId == 7) FromStoreId = 1047;
|
|
|
if (BrandId == 8) FromStoreId = 4831;
|
|
|
if (BrandId == 9) FromStoreId = 4832;
|
|
|
+ if (BrandId == 10) FromStoreId = 5512;
|
|
|
+ if (BrandId == 11) FromStoreId = 5513;
|
|
|
tostore = db.StoreHouse.FirstOrDefault(m => m.UserId == apply.UserId && m.BrandId == BrandId.ToString() && m.Status > -1 && m.Sort == 0);
|
|
|
SendInfo item = sendInfos.FirstOrDefault(m => m.FromStoreId == FromStoreId && m.ToStoreId == tostore.Id && m.BrandId == BrandId);
|
|
|
if (item == null)
|
|
|
@@ -817,7 +825,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
public int Num { get; set; }
|
|
|
}
|
|
|
|
|
|
- //检查发货信息实体类
|
|
|
+ //检查发货信息实体类
|
|
|
private class CheckSendInfo
|
|
|
{
|
|
|
public int BrandId { get; set; }
|
DuGuYang