|
|
@@ -643,6 +643,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
if (BrandId == 10) FromStoreId = 5512;
|
|
|
if (BrandId == 11) FromStoreId = 5513;
|
|
|
if (BrandId == 12) FromStoreId = 5907;
|
|
|
+ if (BrandId == 13) FromStoreId = 6381;
|
|
|
CheckSendInfo items = checksendInfos.FirstOrDefault(m => m.BrandId == BrandId);
|
|
|
if (items == null)
|
|
|
{
|
|
|
@@ -674,6 +675,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
if (BrandId == 10) FromStoreId = 5512;
|
|
|
if (BrandId == 11) FromStoreId = 5513;
|
|
|
if (BrandId == 12) FromStoreId = 5907;
|
|
|
+ if (BrandId == 13) FromStoreId = 6381;
|
|
|
var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == BrandIds);
|
|
|
CheckSendInfo items = checksendInfos.FirstOrDefault(m => m.BrandId == BrandIds) ?? new CheckSendInfo();
|
|
|
if (items.Num > num)
|
|
|
@@ -706,6 +708,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
if (BrandId == 10) FromStoreId = 5512;
|
|
|
if (BrandId == 11) FromStoreId = 5513;
|
|
|
if (BrandId == 12) FromStoreId = 5907;
|
|
|
+ if (BrandId == 13) FromStoreId = 6381;
|
|
|
Models.MachineForSnNo posInfo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SnNo) ?? new Models.MachineForSnNo();
|
|
|
var pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == posInfo.SnId && m.StoreId == FromStoreId && m.UserId == 0 && m.BuyUserId == 0 && m.PreUserId == 0) ?? new Models.PosMachinesTwo();
|
|
|
if (pos.BindingState == 1 || pos.ActivationState == 1)
|
|
|
@@ -774,6 +777,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
if (BrandId == 10) FromStoreId = 5512;
|
|
|
if (BrandId == 11) FromStoreId = 5513;
|
|
|
if (BrandId == 12) FromStoreId = 5907;
|
|
|
+ if (BrandId == 13) FromStoreId = 6381;
|
|
|
tostore = db.StoreHouse.FirstOrDefault(m => m.Sort > 0 && m.UserId == apply.UserId && m.BrandId == BrandId.ToString() && m.Status == 1);
|
|
|
SendInfo item = sendInfos.FirstOrDefault(m => m.FromStoreId == FromStoreId && m.ToStoreId == tostore.Id && m.BrandId == BrandId);
|
|
|
if (item == null)
|