Просмотр исходного кода

Merge branch 'feature-dgy-广电卡入库添加信息' into DuGuYang

DuGuYang 2 лет назад
Родитель
Сommit
7ebc8bf6b9
2 измененных файлов с 95 добавлено и 85 удалено
  1. 95 85
      AppStart/ExcelHelper.cs
  2. BIN
      wwwroot/users/客小爽入库模版.xlsx

+ 95 - 85
AppStart/ExcelHelper.cs

@@ -77,97 +77,107 @@ namespace MySystem
                                         KqProducts kqProduct = db.KqProducts.FirstOrDefault(m => m.Id == BrandId) ?? new KqProducts();
                                         if (kqProduct.Id > 0)
                                         {
-                                            StoreForCode storefor = db.StoreForCode.FirstOrDefault(m => m.Code == StoreNo) ?? new StoreForCode();
-                                            StoreHouse store = db.StoreHouse.FirstOrDefault(m => m.Id == storefor.StoreId) ?? new StoreHouse();
-                                            PosMachinesTwo pos = db.PosMachinesTwo.Add(new PosMachinesTwo()
+                                            var Areas = dr[9].ToString(); // 广电卡所属地区
+                                            if (kqProduct.Id == 14 && string.IsNullOrEmpty(Areas))
                                             {
-                                                CreateDate = DateTime.Now,
-                                                PosSn = SnNo, //SN编号
-                                                BrandId = BrandId, //产品类型
-                                                StoreId = storefor.StoreId, //所在仓库
-                                                DeviceType = DeviceType, //设备类型
-                                                BatchNo = BatchNo,
-                                                DeviceName = DeviceName,
-                                                DeviceKind = DeviceKind,
-                                                SourceStoreId = storefor.StoreId, //源仓库
-                                                CardType = CardType,
-                                            }).Entity;
-                                            store.ProductName = kqProduct.Name;
-                                            store.BrandId = BrandId.ToString();
-
-                                            StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
-                                            {
-                                                CreateDate = DateTime.Now,
-                                                CreateMan = Operator,
-                                                StoreId = storefor.StoreId, //仓库
-                                                BrandId = BrandId, //产品类型
-                                                ProductName = RelationClass.GetKqProductBrandInfo(BrandId), //产品名称
-                                                BizBatchNo = BatchNo, //业务批次号
-                                                TransType = 0, //交易类型
-                                                SnNo = SnNo, //SN编号
-                                                StockOpDirect = 0, //库存操作方向
-                                                SnStatus = 0, //SN状态
-                                                DeviceVendor = DeviceName, //设备厂商
-                                                DeviceModel = DeviceKind, //设备型号
-                                                DeviceType = DeviceType, //设备类型
-                                                ToDate = DateTime.Now, //入库时间
-                                                ToRemark = InputNote, //入库备注
-                                                BrandType = DeviceType, //品牌类型
-                                                SourceStoreId = storefor.StoreId, //源仓库
-                                            }).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;
+                                                RedisDbconn.Instance.AddList("ErrList" + checkKey, "广电卡必填归属地区信息");
                                             }
-                                            ChangeNo += StoreStockChangeIdString;
-                                            stockchange.ChangeNo = ChangeNo; //交易流水编号
-
-                                            db.StoreChangeHistory.Add(new StoreChangeHistory()
-                                            {
-                                                CreateDate = DateTime.Now,
-                                                CreateMan = Operator,
-                                                UserId = store.UserId, //创客
-                                                BrandId = BrandId, //产品类型
-                                                ChangeRecordNo = ChangeNo, //变更记录单号
-                                                BizBatchNo = BatchNo, //业务批次号
-                                                TransType = 0, //交易类型
-                                                SnNo = SnNo, //SN编号
-                                                StockOpDirect = 0, //库存操作方向
-                                                DeviceVendor = DeviceName, //设备厂商
-                                                DeviceType = DeviceType, //设备类型
-                                                DeviceModel = DeviceKind, //设备型号
-                                                ToUserId = store.UserId, //收货创客
-                                                ToStoreId = store.Id, //创客退货收货仓库
-                                                ToDate = DateTime.Now, //入库时间
-                                                ToRemark = InputNote, //入库备注
-                                                SourceStoreId = storefor.StoreId, //源仓库
-                                                StoreId = storefor.StoreId, //仓库
-                                            });
-                                            machinefor = db.MachineForSnNo.Add(new MachineForSnNo()
+                                            else
                                             {
-                                                SnNo = SnNo,
-                                                SnId = pos.Id
-                                            }).Entity;
-                                            RedisDbconn.Instance.Set("MachineForSnNo:" + SnNo, machinefor);
-                                            db.SaveChanges();
+                                                if (kqProduct.Id != 14) Areas = null;
+                                                StoreForCode storefor = db.StoreForCode.FirstOrDefault(m => m.Code == StoreNo) ?? new StoreForCode();
+                                                StoreHouse store = db.StoreHouse.FirstOrDefault(m => m.Id == storefor.StoreId) ?? new StoreHouse();
+                                                PosMachinesTwo pos = db.PosMachinesTwo.Add(new PosMachinesTwo()
+                                                {
+                                                    CreateDate = DateTime.Now,
+                                                    PosSn = SnNo, //SN编号
+                                                    BrandId = BrandId, //产品类型
+                                                    StoreId = storefor.StoreId, //所在仓库
+                                                    DeviceType = DeviceType, //设备类型
+                                                    BatchNo = BatchNo,
+                                                    DeviceName = DeviceName,
+                                                    DeviceKind = DeviceKind,
+                                                    SourceStoreId = storefor.StoreId, //源仓库
+                                                    CardType = CardType,
+                                                    OutBatchNo = Areas,
+                                                }).Entity;
+                                                store.ProductName = kqProduct.Name;
+                                                store.BrandId = BrandId.ToString();
 
-                                            RedisDbconn.Instance.AddList("PosMachineList:" + storefor.StoreId, pos);
+                                                StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
+                                                {
+                                                    CreateDate = DateTime.Now,
+                                                    CreateMan = Operator,
+                                                    StoreId = storefor.StoreId, //仓库
+                                                    BrandId = BrandId, //产品类型
+                                                    ProductName = RelationClass.GetKqProductBrandInfo(BrandId), //产品名称
+                                                    BizBatchNo = BatchNo, //业务批次号
+                                                    TransType = 0, //交易类型
+                                                    SnNo = SnNo, //SN编号
+                                                    StockOpDirect = 0, //库存操作方向
+                                                    SnStatus = 0, //SN状态
+                                                    DeviceVendor = DeviceName, //设备厂商
+                                                    DeviceModel = DeviceKind, //设备型号
+                                                    DeviceType = DeviceType, //设备类型
+                                                    ToDate = DateTime.Now, //入库时间
+                                                    ToRemark = InputNote, //入库备注
+                                                    BrandType = DeviceType, //品牌类型
+                                                    SourceStoreId = storefor.StoreId, //源仓库
+                                                }).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; //交易流水编号
 
-                                            if (!storeData.ContainsKey(storefor.StoreId + "_" + BrandId))
-                                            {
-                                                storeData.Add(storefor.StoreId + "_" + BrandId, 1);
-                                            }
-                                            else
-                                            {
-                                                storeData[storefor.StoreId + "_" + BrandId] += 1;
-                                            }
+                                                db.StoreChangeHistory.Add(new StoreChangeHistory()
+                                                {
+                                                    CreateDate = DateTime.Now,
+                                                    CreateMan = Operator,
+                                                    UserId = store.UserId, //创客
+                                                    BrandId = BrandId, //产品类型
+                                                    ChangeRecordNo = ChangeNo, //变更记录单号
+                                                    BizBatchNo = BatchNo, //业务批次号
+                                                    TransType = 0, //交易类型
+                                                    SnNo = SnNo, //SN编号
+                                                    StockOpDirect = 0, //库存操作方向
+                                                    DeviceVendor = DeviceName, //设备厂商
+                                                    DeviceType = DeviceType, //设备类型
+                                                    DeviceModel = DeviceKind, //设备型号
+                                                    ToUserId = store.UserId, //收货创客
+                                                    ToStoreId = store.Id, //创客退货收货仓库
+                                                    ToDate = DateTime.Now, //入库时间
+                                                    ToRemark = InputNote, //入库备注
+                                                    SourceStoreId = storefor.StoreId, //源仓库
+                                                    StoreId = storefor.StoreId, //仓库
+                                                });
+                                                machinefor = db.MachineForSnNo.Add(new MachineForSnNo()
+                                                {
+                                                    SnNo = SnNo,
+                                                    SnId = pos.Id
+                                                }).Entity;
+                                                RedisDbconn.Instance.Set("MachineForSnNo:" + SnNo, machinefor);
+                                                db.SaveChanges();
 
-                                            SuccessCount += 1;
-                                            RedisDbconn.Instance.Set("CheckImport:" + checkKey, SuccessCount + " / " + TotalCount);
+                                                RedisDbconn.Instance.AddList("PosMachineList:" + storefor.StoreId, pos);
+
+                                                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
                                         {

BIN
wwwroot/users/客小爽入库模版.xlsx