划拨记录加备注

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -4645,71 +4645,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         [HttpPost]
-        // public string TransferPosDo(string PosSn, string FromMakerCode, string ToMakerCode)
-        // {
-        //     if (string.IsNullOrEmpty(PosSn))
-        //     {
-        //         return "请输入机具SN";
-        //     }
-        //     if (string.IsNullOrEmpty(FromMakerCode))
-        //     {
-        //         return "请输入机具来源创客编号";
-        //     }
-        //     if (string.IsNullOrEmpty(ToMakerCode))
-        //     {
-        //         return "请输入划拨对象创客编号";
-        //     }
-        //     var query = PosSn + "," + FromMakerCode + "," + ToMakerCode;
-        //     var machineForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == PosSn) ?? new MachineForSnNo();
-        //     var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineForSnNo.SnId) ?? new PosMachinesTwo();
-        //     if (posInfo.Id == 0)
-        //     {
-        //         return "机具" + PosSn + "不存在";
-        //     }
-        //     var user = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == FromMakerCode) ?? new UserForMakerCode();
-        //     var tuser = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == ToMakerCode) ?? new UserForMakerCode();
-        //     var fUserId = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
-        //     if (fUserId.Id == 0)
-        //     {
-        //         return "来源创客" + FromMakerCode + "不存在";
-        //     }
-        //     var tUserId = db.Users.FirstOrDefault(m => m.Id == tuser.UserId) ?? new Users();
-        //     if (tUserId.Id == 0)
-        //     {
-        //         return "划拨创客" + ToMakerCode + "不存在";
-        //     }
-        //     if (posInfo.BindingState == 0)
-        //     {
-        //         if (posInfo.UserId == 0 || posInfo.BuyUserId == posInfo.UserId)
-        //         {
-        //             posInfo.BuyUserId = tUserId.Id;
-        //             posInfo.UserId = tUserId.Id;
-        //         }
-        //         else
-        //         {
-        //             posInfo.BuyUserId = tUserId.Id;
-        //         }
-        //         var fUserPos = db.UserMachineData.FirstOrDefault(m => m.IdBrand == fUserId.Id + "_" + posInfo.BrandId) ?? new UserMachineData();
-        //         var tUserPos = db.UserMachineData.FirstOrDefault(m => m.IdBrand == tUserId.Id + "_" + posInfo.BrandId) ?? new UserMachineData();
-        //         fUserPos.TotalMachineCount -= 1;
-        //         fUserPos.UnBindCount -= 1;
-        //         tUserPos.TotalMachineCount += 1;
-        //         tUserPos.UnBindCount += 1;
-        //         db.SaveChanges();
-        //         function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + query + ":" + SysUserName + "-" + SysRealName, "划拨创客机具");
-        //     }
-        //     else
-        //     {
-        //         return "机具" + PosSn + "已使用";
-        //     }
-
-        //     return "success";
-        // }
-        // #endregion
-
-
-
-        public string TransferPosDo(string PosSn, string FromMakerCode, string ToMakerCode)
+        public string TransferPosDo(string PosSn, string FromMakerCode, string ToMakerCode, string Note)
         {
             AddSysLog("PosSn：" + PosSn + "FromMakerCode：" + FromMakerCode + "ToMakerCode：" + ToMakerCode, "SysTools", "TransferPosDo");
             if (string.IsNullOrEmpty(PosSn))
@@ -4818,6 +4754,7 @@ namespace MySystem.Areas.Admin.Controllers
                         ActiveStatus = (int)posInfo.ActivationState, //激活状态
                         ActRewardUserId = posInfo.BuyUserId, //激活奖励创客
                         BrandType = posInfo.DeviceType, //品牌类型
+                        SeoKeyword = Note,
                     }).Entity;
                 }
                 var query = SnIds + ";" + FromMakerCode + ";" + ToMakerCode;
@@ -5086,7 +5023,7 @@ namespace MySystem.Areas.Admin.Controllers
             return View();
         }
 
-        public string TransferPosCouponDo(string Kind, string PosCouponCodes, string FromMakerCode, string ToMakerCode, string LeaderMakerCode = "")
+        public string TransferPosCouponDo(string Kind, string PosCouponCodes, string FromMakerCode, string ToMakerCode, string Note, string LeaderMakerCode = "")
         {
             AddSysLog("Kind：" + Kind + "PosCouponCodes：" + PosCouponCodes + "FromMakerCode：" + FromMakerCode + "ToMakerCode：" + ToMakerCode + "LeaderMakerCode：" + LeaderMakerCode, "SysTools", "TransferPosCouponDo");
             if (string.IsNullOrEmpty(Kind))
@@ -5183,6 +5120,7 @@ namespace MySystem.Areas.Admin.Controllers
                 OrderNo = ChangeRecordNo,
                 ToUserId = tUserId.Id,
                 FromUserId = fUserId.Id,
+                SeoKeyword = Note,
             }).Entity;
             PosCouponOrders tostat = db.PosCouponOrders.Add(new PosCouponOrders()
             {
@@ -5199,6 +5137,7 @@ namespace MySystem.Areas.Admin.Controllers
                 OrderNo = ChangeRecordNo,
                 ToUserId = fUserId.Id,
                 FromUserId = tUserId.Id,
+                SeoKeyword = Note,
             }).Entity;
             db.SaveChanges();
             db.Dispose();

Areas/Admin/Views/MainServer/SysTools/TransferPos.cshtml

@@ -60,6 +60,14 @@
                                             placeholder="请输入划拨创客编号">
                                     </div>
                                 </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">备注</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" type="text" id="Note" name="Note"
+                                            maxlength="200" autocomplete="off"
+                                            placeholder="请输入备注">
+                                    </div>
+                                </div>
                             </div>
                         </div>
                     </div>

Areas/Admin/Views/MainServer/SysTools/TransferPosCoupon.cshtml

@@ -69,6 +69,14 @@
                                             placeholder="大盟主创客编号,不填不设置">
                                     </div>
                                 </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">备注</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" type="text" id="Note" name="Note"
+                                            maxlength="200" autocomplete="off"
+                                            placeholder="请输入备注">
+                                    </div>
+                                </div>
                             </div>
                         </div>
                     </div>

wwwroot/layuiadmin/modules_main/PosCouponOrders_Admin.js

@@ -106,6 +106,7 @@ $('#CreateDate').val(value);
             // ,{field:'AfterOut', width: 200, title:'变更后机具券使用数', sort: true}
             ,{field:'ChangeCount', width: 200, title:'变更数量', sort: true}
             ,{field:'ChangeKind', width: 200, title:'变更类型', sort: true}
+            ,{field:'SeoKeyword', width: 300, title:'备注', sort: true}
 
             , { title: '操作', width:280, align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]