暂存

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -3934,6 +3934,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else
             {
+                var ChangeRecordNo = "HBJJ" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8); //变更记录单号
                 foreach (int SnId in SnIds)
                 {
                     var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.Id == SnId) ?? new PosMachinesTwo();
@@ -3957,7 +3958,8 @@ namespace MySystem.Areas.Admin.Controllers
                         CreateDate = DateTime.Now,
                         UserId = fUserId.Id, //创客
                         BrandId = posInfo.BrandId,//产品类型
-                        ChangeRecordNo = "HBJJ" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8), //变更记录单号
+                        // ChangeRecordNo = "HBJJ" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8), //变更记录单号
+                        ChangeRecordNo = ChangeRecordNo, //变更记录单号
                         TransType = 1, //交易类型
                         SnNo = posInfo.PosSn, //SN编号
                         SnType = posInfo.PosSnType, //SN机具类型
@@ -3971,6 +3973,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;
                 }
                 var query = SnIds + ";" + FromMakerCode + ";" + ToMakerCode;
                 function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + query + ":" + SysUserName + "-" + SysRealName, "划拨创客机具");
@@ -4257,23 +4282,23 @@ namespace MySystem.Areas.Admin.Controllers
                     PosCouponId = item.Id,
                 }).Entity;
             }
-            // int CouponCount = CouponIdList.Length;
-            // PosCouponOrders stat = db.PosCouponOrders.Add(new PosCouponOrders()
-            // {
-            //     QueryCount = 3,
-            //     CreateDate = DateTime.Now,
-            //     ChangeKind = 3,//类型(0购买，1划拨，2使⽤，3申请机具循环驳回)
-            //     ChangeCount = CouponCount,
-            //     AfterOut = AfterOut,
-            //     AfterTotal = AfterTotal,
-            //     AfterStock = AfterStock,
-            //     BeforeOut = BeforeOut,
-            //     BeforeTotal = BeforeTotal,
-            //     BeforeStock = BeforeStock,
-            //     OrderNo = ChangeRecordNo,
-            //     ToUserId = orders.UserId,
-            //     FromUserId = orders.UserId,
-            // }).Entity;
+            int CouponCount = PosCouponList.Length;
+            PosCouponOrders stat = db.PosCouponOrders.Add(new PosCouponOrders()
+            {
+                QueryCount = 3,
+                CreateDate = DateTime.Now,
+                ChangeKind = 3,//类型(0购买，1划拨，2使⽤，3申请机具循环驳回)
+                ChangeCount = CouponCount,
+                // AfterOut = AfterOut,
+                // AfterTotal = AfterTotal,
+                // AfterStock = AfterStock,
+                // BeforeOut = BeforeOut,
+                // BeforeTotal = BeforeTotal,
+                // BeforeStock = BeforeStock,
+                OrderNo = ChangeRecordNo,
+                ToUserId = tUserId.Id,
+                FromUserId = fUserId.Id,
+            }).Entity;
             db.SaveChanges();
             db.Dispose();