调拨和机具审核发货，判断品牌是否一致

AppStart/ExcelHelper.cs

@@ -289,108 +289,115 @@ namespace MySystem
                                                     PosMachinesTwo machine = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machinefor.SnId && m.StoreId != tostore.Id && m.BuyUserId == 0 && m.UserId == 0) ?? new PosMachinesTwo();
                                                     if (machine.Id > 0)
                                                     {
-                                                        StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
+                                                        if(machine.BrandId == BrandId)
                                                         {
-                                                            CreateDate = DateTime.Now,
-                                                            CreateMan = Operator,
-                                                            StoreId = storefor.StoreId, //仓库
-                                                            BrandId = BrandId, //产品类型
-                                                            ProductName = RelationClass.GetKqProductBrandInfo(BrandId), //产品名称
-                                                            BizBatchNo = BatchNo, //业务批次号
-                                                            TransType = 1, //交易类型
-                                                            SnNo = SnNo, //SN编号
-                                                            StockOpDirect = 1, //库存操作方向
-                                                            SnStatus = 1, //SN状态
-                                                            DeviceVendor = machine.DeviceName, //设备厂商
-                                                            DeviceModel = machine.DeviceKind, //设备型号
-                                                            DeviceType = machine.DeviceType, //设备类型
-                                                            FromUserId = store.UserId, //出货人
-                                                            FromDate = DateTime.Now, //出库时间
-                                                            FromRemark = OutNote, //出库备注
-                                                            ToUserId = tostore.UserId, //收货人
-                                                            ToStoreId = tostorefor.StoreId, //退货收货仓库                        
-                                                            SourceStoreId = machine.SourceStoreId, //源仓库编号
-                                                            BrandType = machine.DeviceType, //品牌类型
-                                                        }).Entity;
-                                                        db.SaveChanges();
-                                                        string ChangeNo = "SC";
-                                                        int StoreStockChangeId = stockchange.Id;
-                                                        string StoreStockChangeIdString = StoreStockChangeId.ToString();
-                                                        for (int j = 0; j < 18 - StoreStockChangeId.ToString().Length; j++)
-                                                        {
-                                                            StoreStockChangeIdString = "0" + StoreStockChangeIdString;
-                                                        }
-                                                        ChangeNo += StoreStockChangeIdString;
-                                                        stockchange.ChangeNo = ChangeNo; //交易流水编号
-                                                        machine.StoreId = tostorefor.StoreId;
+                                                            StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
+                                                            {
+                                                                CreateDate = DateTime.Now,
+                                                                CreateMan = Operator,
+                                                                StoreId = storefor.StoreId, //仓库
+                                                                BrandId = BrandId, //产品类型
+                                                                ProductName = RelationClass.GetKqProductBrandInfo(BrandId), //产品名称
+                                                                BizBatchNo = BatchNo, //业务批次号
+                                                                TransType = 1, //交易类型
+                                                                SnNo = SnNo, //SN编号
+                                                                StockOpDirect = 1, //库存操作方向
+                                                                SnStatus = 1, //SN状态
+                                                                DeviceVendor = machine.DeviceName, //设备厂商
+                                                                DeviceModel = machine.DeviceKind, //设备型号
+                                                                DeviceType = machine.DeviceType, //设备类型
+                                                                FromUserId = store.UserId, //出货人
+                                                                FromDate = DateTime.Now, //出库时间
+                                                                FromRemark = OutNote, //出库备注
+                                                                ToUserId = tostore.UserId, //收货人
+                                                                ToStoreId = tostorefor.StoreId, //退货收货仓库                        
+                                                                SourceStoreId = machine.SourceStoreId, //源仓库编号
+                                                                BrandType = machine.DeviceType, //品牌类型
+                                                            }).Entity;
+                                                            db.SaveChanges();
+                                                            string ChangeNo = "SC";
+                                                            int StoreStockChangeId = stockchange.Id;
+                                                            string StoreStockChangeIdString = StoreStockChangeId.ToString();
+                                                            for (int j = 0; j < 18 - StoreStockChangeId.ToString().Length; j++)
+                                                            {
+                                                                StoreStockChangeIdString = "0" + StoreStockChangeIdString;
+                                                            }
+                                                            ChangeNo += StoreStockChangeIdString;
+                                                            stockchange.ChangeNo = ChangeNo; //交易流水编号
+                                                            machine.StoreId = tostorefor.StoreId;
 
-                                                        db.StoreChangeHistory.Add(new StoreChangeHistory()
-                                                        {
-                                                            CreateDate = DateTime.Now,
-                                                            CreateMan = Operator,
-                                                            UserId = store.UserId, //创客
-                                                            BrandId = BrandId, //产品类型
-                                                            ChangeRecordNo = ChangeNo, //变更记录单号
-                                                            BizBatchNo = BatchNo, //业务批次号
-                                                            TransType = 1, //交易类型
-                                                            SnNo = SnNo, //SN编号
-                                                            SnType = machine.PosSnType, //SN机具类型
-                                                            StockOpDirect = 1, //库存操作方向
-                                                            DeviceVendor = machine.DeviceName, //设备厂商
-                                                            DeviceModel = machine.DeviceKind, //设备型号
-                                                            DeviceType = machine.DeviceType, //设备类型
-                                                            FromUserId = store.UserId, //出货创客
-                                                            FromDate = DateTime.Now, //出库时间
-                                                            FromRemark = OutNote, //出库备注
-                                                            SourceStoreId = machine.SourceStoreId, //源仓库
-                                                            StoreId = store.Id, //仓库
-                                                        });
+                                                            db.StoreChangeHistory.Add(new StoreChangeHistory()
+                                                            {
+                                                                CreateDate = DateTime.Now,
+                                                                CreateMan = Operator,
+                                                                UserId = store.UserId, //创客
+                                                                BrandId = BrandId, //产品类型
+                                                                ChangeRecordNo = ChangeNo, //变更记录单号
+                                                                BizBatchNo = BatchNo, //业务批次号
+                                                                TransType = 1, //交易类型
+                                                                SnNo = SnNo, //SN编号
+                                                                SnType = machine.PosSnType, //SN机具类型
+                                                                StockOpDirect = 1, //库存操作方向
+                                                                DeviceVendor = machine.DeviceName, //设备厂商
+                                                                DeviceModel = machine.DeviceKind, //设备型号
+                                                                DeviceType = machine.DeviceType, //设备类型
+                                                                FromUserId = store.UserId, //出货创客
+                                                                FromDate = DateTime.Now, //出库时间
+                                                                FromRemark = OutNote, //出库备注
+                                                                SourceStoreId = machine.SourceStoreId, //源仓库
+                                                                StoreId = store.Id, //仓库
+                                                            });
 
-                                                        db.StoreChangeHistory.Add(new StoreChangeHistory()
-                                                        {
-                                                            CreateDate = DateTime.Now,
-                                                            CreateMan = Operator,
-                                                            UserId = tostore.UserId, //创客
-                                                            BrandId = BrandId, //产品类型
-                                                            ChangeRecordNo = ChangeNo, //变更记录单号
-                                                            BizBatchNo = BatchNo, //业务批次号
-                                                            TransType = 1, //交易类型
-                                                            SnNo = SnNo, //SN编号
-                                                            SnType = machine.PosSnType, //SN机具类型
-                                                            StockOpDirect = 0, //库存操作方向
-                                                            DeviceVendor = machine.DeviceName, //设备厂商
-                                                            DeviceModel = machine.DeviceKind, //设备型号
-                                                            DeviceType = machine.DeviceType, //设备类型
-                                                            ToUserId = tostore.UserId, //收货创客
-                                                            ToStoreId = tostore.Id, //创客退货收货仓库
-                                                            ToDate = DateTime.Now, //入库时间
-                                                            ToRemark = OutNote, //入库备注
-                                                            SourceStoreId = machine.SourceStoreId, //源仓库
-                                                            StoreId = tostore.Id, //仓库
-                                                        });
-                                                        db.SaveChanges();
+                                                            db.StoreChangeHistory.Add(new StoreChangeHistory()
+                                                            {
+                                                                CreateDate = DateTime.Now,
+                                                                CreateMan = Operator,
+                                                                UserId = tostore.UserId, //创客
+                                                                BrandId = BrandId, //产品类型
+                                                                ChangeRecordNo = ChangeNo, //变更记录单号
+                                                                BizBatchNo = BatchNo, //业务批次号
+                                                                TransType = 1, //交易类型
+                                                                SnNo = SnNo, //SN编号
+                                                                SnType = machine.PosSnType, //SN机具类型
+                                                                StockOpDirect = 0, //库存操作方向
+                                                                DeviceVendor = machine.DeviceName, //设备厂商
+                                                                DeviceModel = machine.DeviceKind, //设备型号
+                                                                DeviceType = machine.DeviceType, //设备类型
+                                                                ToUserId = tostore.UserId, //收货创客
+                                                                ToStoreId = tostore.Id, //创客退货收货仓库
+                                                                ToDate = DateTime.Now, //入库时间
+                                                                ToRemark = OutNote, //入库备注
+                                                                SourceStoreId = machine.SourceStoreId, //源仓库
+                                                                StoreId = tostore.Id, //仓库
+                                                            });
+                                                            db.SaveChanges();
 
-                                                        // RemoveClass.DeletePosMachineList("PosMachineTwoList:" + storefor.StoreId, machine.Id);
-                                                        // RedisDbconn.Instance.AddList("PosMachineTwoList:" + tostorefor.StoreId, machine);
+                                                            // RemoveClass.DeletePosMachineList("PosMachineTwoList:" + storefor.StoreId, machine.Id);
+                                                            // RedisDbconn.Instance.AddList("PosMachineTwoList:" + tostorefor.StoreId, machine);
 
-                                                        if (!storeData.ContainsKey(storefor.StoreId + "_" + BrandId))
-                                                        {
-                                                            storeData.Add(storefor.StoreId + "_" + BrandId, 1);
-                                                        }
-                                                        else
-                                                        {
-                                                            storeData[storefor.StoreId + "_" + BrandId] += 1;
-                                                        }
-                                                        if (!toStoreData.ContainsKey(tostorefor.StoreId + "_" + BrandId))
-                                                        {
-                                                            toStoreData.Add(tostorefor.StoreId + "_" + BrandId, 1);
+                                                            if (!storeData.ContainsKey(storefor.StoreId + "_" + BrandId))
+                                                            {
+                                                                storeData.Add(storefor.StoreId + "_" + BrandId, 1);
+                                                            }
+                                                            else
+                                                            {
+                                                                storeData[storefor.StoreId + "_" + BrandId] += 1;
+                                                            }
+                                                            if (!toStoreData.ContainsKey(tostorefor.StoreId + "_" + BrandId))
+                                                            {
+                                                                toStoreData.Add(tostorefor.StoreId + "_" + BrandId, 1);
+                                                            }
+                                                            else
+                                                            {
+                                                                toStoreData[tostorefor.StoreId + "_" + BrandId] += 1;
+                                                            }
+                                                            SuccessCount += 1;
+                                                            RedisDbconn.Instance.Set("CheckImport:" + checkKey, SuccessCount + " / " + TotalCount);
                                                         }
                                                         else
                                                         {
-                                                            toStoreData[tostorefor.StoreId + "_" + BrandId] += 1;
+                                                            RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "与表格里填写的品牌不一致");
                                                         }
-                                                        SuccessCount += 1;
-                                                        RedisDbconn.Instance.Set("CheckImport:" + checkKey, SuccessCount + " / " + TotalCount);
                                                     }
                                                     else
                                                     {
@@ -569,153 +576,160 @@ namespace MySystem
                                                     PosMachinesTwo machine = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machinefor.SnId && m.BuyUserId == 0 && m.UserId == 0) ?? new PosMachinesTwo();
                                                     if (machine.Id > 0)
                                                     {
-                                                        StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
-                                                        {
-                                                            CreateDate = DateTime.Now,
-                                                            CreateMan = Operator,
-                                                            StoreId = storefor.StoreId, //仓库
-                                                            BrandId = BrandId, //产品类型
-                                                            ProductName = RelationClass.GetKqProductBrandInfo(BrandId), //产品名称
-                                                            BizBatchNo = BatchNo, //业务批次号
-                                                            TransType = 2, //交易类型
-                                                            SnNo = SnNo, //SN编号
-                                                            SnType = machine.PosSnType, //SN机具类型
-                                                            StockOpDirect = 1, //库存操作方向
-                                                            SnStatus = 1, //SN状态
-                                                            BindStatus = machine.BindingState, //绑定状态
-                                                            BindMerchant = machine.BindMerchantId, //绑定商户
-                                                            ActiveStatus = machine.ActivationState, //激活状态
-                                                            ActRewardUserId = machine.BuyUserId, //激活奖励人
-                                                            DeviceVendor = machine.DeviceName, //设备厂商
-                                                            DeviceModel = machine.DeviceKind, //设备型号
-                                                            DeviceType = machine.DeviceType, //设备类型
-                                                            FromUserId = store.UserId, //出货人
-                                                            FromDate = DateTime.Now, //出库时间
-                                                            FromRemark = OutNote, //出库备注
-                                                            ToUserId = userfor.UserId, //收货人
-                                                            SourceStoreId = machine.SourceStoreId, //源仓库编号
-                                                            BrandType = machine.DeviceType, //品牌类型
-                                                        }).Entity;
-                                                        db.SaveChanges();
-                                                        string ChangeNo = "SC";
-                                                        int StoreStockChangeId = stockchange.Id;
-                                                        string StoreStockChangeIdString = StoreStockChangeId.ToString();
-                                                        for (int j = 0; j < 18 - StoreStockChangeId.ToString().Length; j++)
+                                                        if(machine.BrandId == BrandId)
                                                         {
-                                                            StoreStockChangeIdString = "0" + StoreStockChangeIdString;
-                                                        }
-                                                        ChangeNo += StoreStockChangeIdString;
-                                                        stockchange.ChangeNo = ChangeNo; //交易流水编号
-                                                        db.SaveChanges();
+                                                            StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
+                                                            {
+                                                                CreateDate = DateTime.Now,
+                                                                CreateMan = Operator,
+                                                                StoreId = storefor.StoreId, //仓库
+                                                                BrandId = BrandId, //产品类型
+                                                                ProductName = RelationClass.GetKqProductBrandInfo(BrandId), //产品名称
+                                                                BizBatchNo = BatchNo, //业务批次号
+                                                                TransType = 2, //交易类型
+                                                                SnNo = SnNo, //SN编号
+                                                                SnType = machine.PosSnType, //SN机具类型
+                                                                StockOpDirect = 1, //库存操作方向
+                                                                SnStatus = 1, //SN状态
+                                                                BindStatus = machine.BindingState, //绑定状态
+                                                                BindMerchant = machine.BindMerchantId, //绑定商户
+                                                                ActiveStatus = machine.ActivationState, //激活状态
+                                                                ActRewardUserId = machine.BuyUserId, //激活奖励人
+                                                                DeviceVendor = machine.DeviceName, //设备厂商
+                                                                DeviceModel = machine.DeviceKind, //设备型号
+                                                                DeviceType = machine.DeviceType, //设备类型
+                                                                FromUserId = store.UserId, //出货人
+                                                                FromDate = DateTime.Now, //出库时间
+                                                                FromRemark = OutNote, //出库备注
+                                                                ToUserId = userfor.UserId, //收货人
+                                                                SourceStoreId = machine.SourceStoreId, //源仓库编号
+                                                                BrandType = machine.DeviceType, //品牌类型
+                                                            }).Entity;
+                                                            db.SaveChanges();
+                                                            string ChangeNo = "SC";
+                                                            int StoreStockChangeId = stockchange.Id;
+                                                            string StoreStockChangeIdString = StoreStockChangeId.ToString();
+                                                            for (int j = 0; j < 18 - StoreStockChangeId.ToString().Length; j++)
+                                                            {
+                                                                StoreStockChangeIdString = "0" + StoreStockChangeIdString;
+                                                            }
+                                                            ChangeNo += StoreStockChangeIdString;
+                                                            stockchange.ChangeNo = ChangeNo; //交易流水编号
+                                                            db.SaveChanges();
 
-                                                        UserStoreChange userstore = db.UserStoreChange.Add(new UserStoreChange()
-                                                        {
-                                                            CreateDate = DateTime.Now,
-                                                            CreateMan = Operator,
-                                                            UserId = store.UserId, //创客
-                                                            BrandId = BrandId, //产品类型
-                                                            ChangeRecordNo = ChangeNo, //变更记录单号
-                                                            TransType = 0, //交易类型
-                                                            SnNo = SnNo, //SN编号
-                                                            SnType = machine.PosSnType, //SN机具类型
-                                                            StockOpDirect = 0, //库存操作方向
-                                                            DeviceVendor = machine.DeviceName, //设备厂商
-                                                            DeviceType = machine.DeviceKind, //设备类型
-                                                            DeviceModel = machine.DeviceType, //设备型号
-                                                            ToUserId = userfor.UserId, //收货创客
-                                                            ToDate = DateTime.Now, //入库时间
-                                                            ToRemark = OutNote, //入库备注
-                                                            SourceStoreId = machine.SourceStoreId, //源仓库
-                                                            SnStatus = 1, //SN状态
-                                                            BizBatchNo = BatchNo, //业务批次号
-                                                            BindStatus = (int)machine.BindingState, //绑定状态
-                                                            BindMerchantId = machine.BindMerchantId, //绑定商户
-                                                            ActiveStatus = (int)machine.ActivationState, //激活状态
-                                                            ActRewardUserId = machine.BuyUserId, //激活奖励创客
-                                                            BrandType = machine.DeviceType, //品牌类型
-                                                        }).Entity;
+                                                            UserStoreChange userstore = db.UserStoreChange.Add(new UserStoreChange()
+                                                            {
+                                                                CreateDate = DateTime.Now,
+                                                                CreateMan = Operator,
+                                                                UserId = store.UserId, //创客
+                                                                BrandId = BrandId, //产品类型
+                                                                ChangeRecordNo = ChangeNo, //变更记录单号
+                                                                TransType = 0, //交易类型
+                                                                SnNo = SnNo, //SN编号
+                                                                SnType = machine.PosSnType, //SN机具类型
+                                                                StockOpDirect = 0, //库存操作方向
+                                                                DeviceVendor = machine.DeviceName, //设备厂商
+                                                                DeviceType = machine.DeviceKind, //设备类型
+                                                                DeviceModel = machine.DeviceType, //设备型号
+                                                                ToUserId = userfor.UserId, //收货创客
+                                                                ToDate = DateTime.Now, //入库时间
+                                                                ToRemark = OutNote, //入库备注
+                                                                SourceStoreId = machine.SourceStoreId, //源仓库
+                                                                SnStatus = 1, //SN状态
+                                                                BizBatchNo = BatchNo, //业务批次号
+                                                                BindStatus = (int)machine.BindingState, //绑定状态
+                                                                BindMerchantId = machine.BindMerchantId, //绑定商户
+                                                                ActiveStatus = (int)machine.ActivationState, //激活状态
+                                                                ActRewardUserId = machine.BuyUserId, //激活奖励创客
+                                                                BrandType = machine.DeviceType, //品牌类型
+                                                            }).Entity;
 
-                                                        db.StoreChangeHistory.Add(new StoreChangeHistory()
-                                                        {
-                                                            CreateDate = DateTime.Now,
-                                                            CreateMan = Operator,
-                                                            UserId = store.UserId, //创客
-                                                            BrandId = BrandId, //产品类型
-                                                            ChangeRecordNo = ChangeNo, //变更记录单号
-                                                            BizBatchNo = BatchNo, //业务批次号
-                                                            TransType = 2, //交易类型
-                                                            SnNo = SnNo, //SN编号
-                                                            SnType = machine.PosSnType, //SN机具类型
-                                                            StockOpDirect = 1, //库存操作方向
-                                                            DeviceVendor = machine.DeviceName, //设备厂商
-                                                            DeviceModel = machine.DeviceKind, //设备型号
-                                                            DeviceType = machine.DeviceType, //设备类型
-                                                            FromUserId = store.UserId, //出货创客
-                                                            FromDate = DateTime.Now, //出库时间
-                                                            FromRemark = OutNote, //出库备注
-                                                            SourceStoreId = machine.SourceStoreId, //源仓库
-                                                            StoreId = store.Id, //仓库
-                                                        });
+                                                            db.StoreChangeHistory.Add(new StoreChangeHistory()
+                                                            {
+                                                                CreateDate = DateTime.Now,
+                                                                CreateMan = Operator,
+                                                                UserId = store.UserId, //创客
+                                                                BrandId = BrandId, //产品类型
+                                                                ChangeRecordNo = ChangeNo, //变更记录单号
+                                                                BizBatchNo = BatchNo, //业务批次号
+                                                                TransType = 2, //交易类型
+                                                                SnNo = SnNo, //SN编号
+                                                                SnType = machine.PosSnType, //SN机具类型
+                                                                StockOpDirect = 1, //库存操作方向
+                                                                DeviceVendor = machine.DeviceName, //设备厂商
+                                                                DeviceModel = machine.DeviceKind, //设备型号
+                                                                DeviceType = machine.DeviceType, //设备类型
+                                                                FromUserId = store.UserId, //出货创客
+                                                                FromDate = DateTime.Now, //出库时间
+                                                                FromRemark = OutNote, //出库备注
+                                                                SourceStoreId = machine.SourceStoreId, //源仓库
+                                                                StoreId = store.Id, //仓库
+                                                            });
 
-                                                        db.StoreChangeHistory.Add(new StoreChangeHistory()
-                                                        {
-                                                            CreateDate = DateTime.Now,
-                                                            CreateMan = Operator,
-                                                            UserId = touser.Id, //创客
-                                                            BrandId = BrandId, //产品类型
-                                                            ChangeRecordNo = ChangeNo, //变更记录单号
-                                                            BizBatchNo = BatchNo, //业务批次号
-                                                            TransType = 0, //交易类型
-                                                            SnNo = SnNo, //SN编号
-                                                            SnType = machine.PosSnType, //SN机具类型
-                                                            StockOpDirect = 0, //库存操作方向
-                                                            DeviceVendor = machine.DeviceName, //设备厂商
-                                                            DeviceModel = machine.DeviceKind, //设备型号
-                                                            DeviceType = machine.DeviceType, //设备类型
-                                                            ToUserId = touser.Id, //收货创客
-                                                            ToDate = DateTime.Now, //入库时间
-                                                            ToRemark = OutNote, //入库备注
-                                                            SourceStoreId = machine.SourceStoreId, //源仓库
-                                                        });
-                                                        machine.BuyUserId = touser.Id;
-                                                        machine.UserId = touser.Id;
-                                                        machine.TransferTime = DateTime.Now;
-                                                        machine.RecycEndDate = DateTime.Now.AddDays(180); // 循环结束时间
-                                                        db.SaveChanges();
-                                                        string IdBrand = touser.Id + "_" + BrandId;
-                                                        UserMachineData MachineData = db.UserMachineData.FirstOrDefault(m => m.IdBrand == IdBrand);
-                                                        if (MachineData == null)
-                                                        {
-                                                            MachineData = db.UserMachineData.Add(new UserMachineData()
+                                                            db.StoreChangeHistory.Add(new StoreChangeHistory()
                                                             {
-                                                                IdBrand = IdBrand,
-                                                            }).Entity;
+                                                                CreateDate = DateTime.Now,
+                                                                CreateMan = Operator,
+                                                                UserId = touser.Id, //创客
+                                                                BrandId = BrandId, //产品类型
+                                                                ChangeRecordNo = ChangeNo, //变更记录单号
+                                                                BizBatchNo = BatchNo, //业务批次号
+                                                                TransType = 0, //交易类型
+                                                                SnNo = SnNo, //SN编号
+                                                                SnType = machine.PosSnType, //SN机具类型
+                                                                StockOpDirect = 0, //库存操作方向
+                                                                DeviceVendor = machine.DeviceName, //设备厂商
+                                                                DeviceModel = machine.DeviceKind, //设备型号
+                                                                DeviceType = machine.DeviceType, //设备类型
+                                                                ToUserId = touser.Id, //收货创客
+                                                                ToDate = DateTime.Now, //入库时间
+                                                                ToRemark = OutNote, //入库备注
+                                                                SourceStoreId = machine.SourceStoreId, //源仓库
+                                                            });
+                                                            machine.BuyUserId = touser.Id;
+                                                            machine.UserId = touser.Id;
+                                                            machine.TransferTime = DateTime.Now;
+                                                            machine.RecycEndDate = DateTime.Now.AddDays(180); // 循环结束时间
                                                             db.SaveChanges();
-                                                        }
-                                                        MachineData.IdBrand = IdBrand;
-                                                        MachineData.TotalMachineCount += 1;
-                                                        MachineData.UnBindCount += 1;
-                                                        db.SaveChanges();
-                                                        RedisDbconn.Instance.Set("UserMachineData:" + IdBrand, MachineData);
+                                                            string IdBrand = touser.Id + "_" + BrandId;
+                                                            UserMachineData MachineData = db.UserMachineData.FirstOrDefault(m => m.IdBrand == IdBrand);
+                                                            if (MachineData == null)
+                                                            {
+                                                                MachineData = db.UserMachineData.Add(new UserMachineData()
+                                                                {
+                                                                    IdBrand = IdBrand,
+                                                                }).Entity;
+                                                                db.SaveChanges();
+                                                            }
+                                                            MachineData.IdBrand = IdBrand;
+                                                            MachineData.TotalMachineCount += 1;
+                                                            MachineData.UnBindCount += 1;
+                                                            db.SaveChanges();
+                                                            RedisDbconn.Instance.Set("UserMachineData:" + IdBrand, MachineData);
 
-                                                        RemoveClass.DeletePosMachineList("PosMachineTwoList:" + storefor.StoreId, machine.Id);
-                                                        RedisDbconn.Instance.AddList("PosMachinesTwo:" + userfor.UserId + ":" + BrandId, new PosMachineList()
-                                                        {
-                                                            Id = machine.Id,
-                                                            SnNo = SnNo,
-                                                            IsBind = machine.BindingState == 1 ? true : false,
-                                                        });
+                                                            RemoveClass.DeletePosMachineList("PosMachineTwoList:" + storefor.StoreId, machine.Id);
+                                                            RedisDbconn.Instance.AddList("PosMachinesTwo:" + userfor.UserId + ":" + BrandId, new PosMachineList()
+                                                            {
+                                                                Id = machine.Id,
+                                                                SnNo = SnNo,
+                                                                IsBind = machine.BindingState == 1 ? true : false,
+                                                            });
 
-                                                        if (!storeData.ContainsKey(storefor.StoreId + "_" + BrandId))
-                                                        {
-                                                            storeData.Add(storefor.StoreId + "_" + BrandId, 1);
+                                                            if (!storeData.ContainsKey(storefor.StoreId + "_" + BrandId))
+                                                            {
+                                                                storeData.Add(storefor.StoreId + "_" + BrandId, 1);
+                                                            }
+                                                            else
+                                                            {
+                                                                storeData[storefor.StoreId + "_" + BrandId] += 1;
+                                                            }
+                                                            SuccessCount += 1;
+                                                            RedisDbconn.Instance.Set("CheckImport:" + checkKey, SuccessCount + " / " + TotalCount);
                                                         }
                                                         else
                                                         {
-                                                            storeData[storefor.StoreId + "_" + BrandId] += 1;
+                                                            RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "与表格里填写的品牌不一致");
                                                         }
-                                                        SuccessCount += 1;
-                                                        RedisDbconn.Instance.Set("CheckImport:" + checkKey, SuccessCount + " / " + TotalCount);
                                                     }
                                                     else
                                                     {

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -485,6 +485,7 @@ namespace MySystem.Areas.Admin.Controllers
                         StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
                         {
                             CreateDate = DateTime.Now,
+                            CreateMan = SysUserName,
                             StoreId = storehouse.Id, //出货 仓库
                             BrandId = Convert.ToInt32(BrandId), //产品类型
                             ProductName = RelationClass.GetKqProductBrandInfo(Convert.ToInt32(BrandId)), //产品名称

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -751,6 +751,7 @@ namespace MySystem.Areas.Admin.Controllers
                         StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
                         {
                             CreateDate = DateTime.Now,
+                            CreateMan = SysUserName,
                             StoreId = storehouse.Id, //出货 仓库
                             BrandId = Convert.ToInt32(BrandId), //产品类型
                             ProductName = RelationClass.GetKqProductBrandInfo(Convert.ToInt32(BrandId)), //产品名称

Areas/Admin/Controllers/MainServer/StoreMachineApplyController.cs

@@ -564,66 +564,74 @@ namespace MySystem.Areas.Admin.Controllers
                 PosMachinesTwo machine = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machinefor.SnId && m.BuyUserId == 0 && m.UserId == 0) ?? new PosMachinesTwo();
                 if (machine.Id > 0)
                 {
-                    StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
+                    if(machine.BrandId != BrandId)
                     {
-                        CreateDate = DateTime.Now,
-                        Sort = data.Id,//库存变动关联申请记录表
-                        StoreId = FromStoreId, //出货仓库
-                        BrandId = BrandId, //产品类型
-                        ProductName = RelationClass.GetKqProductBrandInfo(BrandId), //产品名称
-                        BizBatchNo = BatchNo, //业务批次号
-                        TransType = 1, //交易类型
-                        SnNo = SnNo, //SN编号
-                        StockOpDirect = 1, //库存操作方向
-                        SnStatus = 1, //SN状态
-                        DeviceVendor = machine.DeviceName, //设备厂商
-                        DeviceModel = machine.DeviceKind, //设备型号
-                        DeviceType = machine.DeviceType, //设备类型
-                        FromUserId = fromstore.UserId, //出货人
-                        FromDate = DateTime.Now, //出库时间
-                        FromRemark = OutNote, //出库备注
-                        ToUserId = tostore.UserId, //收货人
-                        ToStoreId = fromstore.Id, //退货收货仓库                        
-                        SourceStoreId = machine.SourceStoreId, //源仓库编号
-                        BrandType = machine.DeviceType, //品牌类型
-                    }).Entity;
-
-                    string ChangeNo = "CS";
-                    int StoreStockChangeId = stockchange.Id;
-                    string StoreStockChangeIdString = StoreStockChangeId.ToString();
-                    for (int j = 0; j < 18 - StoreStockChangeId.ToString().Length; j++)
-                    {
-                        StoreStockChangeIdString = "0" + StoreStockChangeIdString;
+                        return machine.PosSn + "与表格里填写的品牌不一致";
                     }
-                    ChangeNo += StoreStockChangeIdString;
-                    stockchange.ChangeNo = ChangeNo; //交易流水编号
-                    machine.StoreId = tostore.Id;
-
-                    db.StoreChangeHistory.Add(new StoreChangeHistory()
+                    else
                     {
-                        CreateDate = DateTime.Now,
-                        UserId = fromstore.UserId, //创客
-                        BrandId = BrandId, //产品类型
-                        ChangeRecordNo = ChangeNo, //变更记录单号
-                        BizBatchNo = BatchNo, //业务批次号
-                        TransType = 1, //交易类型
-                        SnNo = SnNo, //SN编号
-                        SnType = machine.PosSnType, //SN机具类型
-                        StockOpDirect = 1, //库存操作方向
-                        DeviceVendor = machine.DeviceName, //设备厂商
-                        DeviceModel = machine.DeviceKind, //设备型号
-                        DeviceType = machine.DeviceType, //设备类型
-                        FromUserId = fromstore.UserId, //出货创客
-                        FromDate = DateTime.Now, //出库时间
-                        FromRemark = OutNote, //出库备注
-                        SourceStoreId = machine.SourceStoreId, //源仓库
-                        StoreId = fromstore.Id, //仓库
-                        ToUserId = tostore.UserId,//收货创客
-                    });
-
-                    //修改机具所属仓库
-                    machine.StoreId = tostore.Id;
-                    machine.UpdateDate = DateTime.Now;
+                        StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
+                        {
+                            CreateDate = DateTime.Now,
+                            CreateMan = SysUserName,
+                            Sort = data.Id,//库存变动关联申请记录表
+                            StoreId = FromStoreId, //出货仓库
+                            BrandId = BrandId, //产品类型
+                            ProductName = RelationClass.GetKqProductBrandInfo(BrandId), //产品名称
+                            BizBatchNo = BatchNo, //业务批次号
+                            TransType = 1, //交易类型
+                            SnNo = SnNo, //SN编号
+                            StockOpDirect = 1, //库存操作方向
+                            SnStatus = 1, //SN状态
+                            DeviceVendor = machine.DeviceName, //设备厂商
+                            DeviceModel = machine.DeviceKind, //设备型号
+                            DeviceType = machine.DeviceType, //设备类型
+                            FromUserId = fromstore.UserId, //出货人
+                            FromDate = DateTime.Now, //出库时间
+                            FromRemark = OutNote, //出库备注
+                            ToUserId = tostore.UserId, //收货人
+                            ToStoreId = fromstore.Id, //退货收货仓库                        
+                            SourceStoreId = machine.SourceStoreId, //源仓库编号
+                            BrandType = machine.DeviceType, //品牌类型
+                        }).Entity;
+
+                        string ChangeNo = "CS";
+                        int StoreStockChangeId = stockchange.Id;
+                        string StoreStockChangeIdString = StoreStockChangeId.ToString();
+                        for (int j = 0; j < 18 - StoreStockChangeId.ToString().Length; j++)
+                        {
+                            StoreStockChangeIdString = "0" + StoreStockChangeIdString;
+                        }
+                        ChangeNo += StoreStockChangeIdString;
+                        stockchange.ChangeNo = ChangeNo; //交易流水编号
+                        machine.StoreId = tostore.Id;
+
+                        db.StoreChangeHistory.Add(new StoreChangeHistory()
+                        {
+                            CreateDate = DateTime.Now,
+                            UserId = fromstore.UserId, //创客
+                            BrandId = BrandId, //产品类型
+                            ChangeRecordNo = ChangeNo, //变更记录单号
+                            BizBatchNo = BatchNo, //业务批次号
+                            TransType = 1, //交易类型
+                            SnNo = SnNo, //SN编号
+                            SnType = machine.PosSnType, //SN机具类型
+                            StockOpDirect = 1, //库存操作方向
+                            DeviceVendor = machine.DeviceName, //设备厂商
+                            DeviceModel = machine.DeviceKind, //设备型号
+                            DeviceType = machine.DeviceType, //设备类型
+                            FromUserId = fromstore.UserId, //出货创客
+                            FromDate = DateTime.Now, //出库时间
+                            FromRemark = OutNote, //出库备注
+                            SourceStoreId = machine.SourceStoreId, //源仓库
+                            StoreId = fromstore.Id, //仓库
+                            ToUserId = tostore.UserId,//收货创客
+                        });
+
+                        //修改机具所属仓库
+                        machine.StoreId = tostore.Id;
+                        machine.UpdateDate = DateTime.Now;
+                    }
                 }
                 else
                 {