划拨创客机具或券添加记录

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -4479,29 +4479,29 @@ namespace MySystem.Areas.Admin.Controllers
                         SourceStoreId = posInfo.SourceStoreId, //源仓库
                         ToUserId = tUserId.Id,//收货创客
                     });
-                    // UserStoreChange userstore = db.UserStoreChange.Add(new UserStoreChange()
-                    // {
-                    //     CreateDate = DateTime.Now,
-                    //     UserId = fUserId.Id, //创客
-                    //     BrandId = posInfo.BrandId, //产品类型
-                    //     ChangeRecordNo = ChangeRecordNo, //变更记录单号
-                    //     TransType = 0, //交易类型
-                    //     SnNo = posInfo.PosSn, //SN编号
-                    //     SnType = posInfo.PosSnType, //SN机具类型
-                    //     StockOpDirect = 0, //库存操作方向
-                    //     DeviceVendor = posInfo.DeviceName, //设备厂商
-                    //     DeviceType = posInfo.DeviceKind, //设备类型
-                    //     DeviceModel = posInfo.DeviceType, //设备型号
-                    //     ToUserId = tUserId.Id, //收货创客
-                    //     ToDate = DateTime.Now, //入库时间
-                    //     SourceStoreId = posInfo.SourceStoreId, //源仓库
-                    //     SnStatus = 1, //SN状态
-                    //     BindStatus = (int)posInfo.BindingState, //绑定状态
-                    //     BindMerchantId = posInfo.BindMerchantId, //绑定商户
-                    //     ActiveStatus = (int)posInfo.ActivationState, //激活状态
-                    //     ActRewardUserId = posInfo.BuyUserId, //激活奖励创客
-                    //     BrandType = posInfo.DeviceType, //品牌类型
-                    // }).Entity;
+                    UserStoreChange userstore = db.UserStoreChange.Add(new UserStoreChange()
+                    {
+                        CreateDate = DateTime.Now,
+                        UserId = fUserId.Id, //创客
+                        BrandId = posInfo.BrandId, //产品类型
+                        ChangeRecordNo = ChangeRecordNo, //变更记录单号
+                        TransType = 0, //交易类型
+                        SnNo = posInfo.PosSn, //SN编号
+                        SnType = posInfo.PosSnType, //SN机具类型
+                        StockOpDirect = 0, //库存操作方向
+                        DeviceVendor = posInfo.DeviceName, //设备厂商
+                        DeviceType = posInfo.DeviceKind, //设备类型
+                        DeviceModel = posInfo.DeviceType, //设备型号
+                        ToUserId = tUserId.Id, //收货创客
+                        ToDate = DateTime.Now, //入库时间
+                        SourceStoreId = posInfo.SourceStoreId, //源仓库
+                        SnStatus = 1, //SN状态
+                        BindStatus = (int)posInfo.BindingState, //绑定状态
+                        BindMerchantId = posInfo.BindMerchantId, //绑定商户
+                        ActiveStatus = (int)posInfo.ActivationState, //激活状态
+                        ActRewardUserId = posInfo.BuyUserId, //激活奖励创客
+                        BrandType = posInfo.DeviceType, //品牌类型
+                    }).Entity;
                 }
                 var query = SnIds + ";" + FromMakerCode + ";" + ToMakerCode;
                 function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + query + ":" + SysUserName + "-" + SysRealName, "划拨创客机具");
@@ -4776,39 +4776,59 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     return "机具券" + PosCouponCode + "已使用";
                 }
+                if (item.QueryCount != int.Parse(Kind))
+                {
+                    return "机具券" + PosCouponCode + "类型和您选择的类型不同";
+                }
                 item.UserId = tUserId.Id;
                 if (LeaderUserId > 0 && item.LeaderUserId == 0)
                 {
                     item.LeaderUserId = LeaderUserId;
                 }
-                // PosCouponRecord posCouponRecord = db.PosCouponRecord.Add(new PosCouponRecord()
-                // {
-                //     QueryCount = item.QueryCount,//券类型(1 电签 2 大POS)
-                //     CreateDate = DateTime.Now,
-                //     ChangeKind = 1,//类型(0购买，1划拨，2使⽤，3申请机具循环驳回)
-                //     OrderNo = ChangeRecordNo,
-                //     ToUserId = tUserId.Id,
-                //     FromUserId = fUserId.Id,
-                //     PosCouponId = item.Id,
-                // }).Entity;
-            }
-            // int CouponCount = PosCouponList.Length;
-            // PosCouponOrders stat = db.PosCouponOrders.Add(new PosCouponOrders()
-            // {
-            //     QueryCount = 2,
-            //     CreateDate = DateTime.Now,
-            //     ChangeKind = 2,
-            //     ChangeCount = CouponCount,
-            //     // AfterOut = AfterOut,
-            //     // AfterTotal = AfterTotal,
-            //     // AfterStock = AfterStock,
-            //     // BeforeOut = BeforeOut,
-            //     // BeforeTotal = BeforeTotal,
-            //     // BeforeStock = BeforeStock,
-            //     OrderNo = ChangeRecordNo,
-            //     ToUserId = tUserId.Id,
-            //     FromUserId = fUserId.Id,
-            // }).Entity;
+                PosCouponRecord posCouponRecord = db.PosCouponRecord.Add(new PosCouponRecord()
+                {
+                    QueryCount = item.QueryCount,//券类型(1 电签 2 大POS)
+                    CreateDate = DateTime.Now,
+                    ChangeKind = 1,//类型(0购买，1划拨，2使⽤，3申请机具循环驳回)
+                    OrderNo = ChangeRecordNo,
+                    ToUserId = tUserId.Id,
+                    FromUserId = fUserId.Id,
+                    PosCouponId = item.Id,
+                }).Entity;
+            }
+            int CouponCount = PosCouponList.Length;
+            PosCouponOrders stat = db.PosCouponOrders.Add(new PosCouponOrders()
+            {
+                QueryCount = int.Parse(Kind),
+                CreateDate = DateTime.Now,
+                ChangeKind = 2,
+                ChangeCount = CouponCount,
+                // AfterOut = AfterOut,
+                // AfterTotal = AfterTotal,
+                // AfterStock = AfterStock,
+                // BeforeOut = BeforeOut,
+                // BeforeTotal = BeforeTotal,
+                // BeforeStock = BeforeStock,
+                OrderNo = ChangeRecordNo,
+                ToUserId = tUserId.Id,
+                FromUserId = fUserId.Id,
+            }).Entity;
+            PosCouponOrders tostat = db.PosCouponOrders.Add(new PosCouponOrders()
+            {
+                QueryCount = int.Parse(Kind),
+                CreateDate = DateTime.Now,
+                ChangeKind = 1,
+                ChangeCount = CouponCount,
+                // AfterOut = AfterOut,
+                // AfterTotal = AfterTotal,
+                // AfterStock = AfterStock,
+                // BeforeOut = BeforeOut,
+                // BeforeTotal = BeforeTotal,
+                // BeforeStock = BeforeStock,
+                OrderNo = ChangeRecordNo,
+                ToUserId = fUserId.Id,
+                FromUserId = tUserId.Id,
+            }).Entity;
             db.SaveChanges();
             db.Dispose();