辅助工具-机具信息查询，增加入库时间和循环到期时间

机具管理列表增加入库时间

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1107,6 +1107,8 @@ namespace MySystem.Areas.Admin.Controllers
             string ApplyDate = apply.CreateDate == null ? "" : apply.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string SendDate = applyorder.SendDate == null ? "" : applyorder.SendDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string TransferTime = pos.TransferTime == null ? "" : pos.TransferTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+            string CreateDate = pos.CreateDate == null ? "" : pos.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
+            string RecycEndDate = pos.RecycEndDate == null ? "" : pos.RecycEndDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string ActiveTime = reward.CreateDate == null ? "" : reward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string ActiveTime6 = lisreward.CreateDate == null ? "" : lisreward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string result = "";
@@ -1131,6 +1133,8 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 result += "机具所属小分仓：暂无小分仓\n";
             }
+            result += "入库时间：" + CreateDate + "\n";
+            result += "循环到期时间：" + RecycEndDate + "\n";
             result += "划拨时间：" + TransferTime + "\n";
             result += "绑定状态：" + bindResult + "(绑定时间：" + bindTime + ")\n";
             result += "激活状态：" + activeResult + "(激活时间：" + activeTime + ")\n";

wwwroot/layuiadmin/modules_main/PosMachinesTwo_Admin.js

@@ -141,6 +141,7 @@ layui.config({
             ,{ field: 'ActivationTime', width: 200, title: '激活时间', sort: true }
             ,{ field: 'BindingTime', width: 200, title: '绑定时间', sort: true }
             ,{ field: 'TransferTime', width: 200, title: '划拨时间', sort: true }
+            ,{ field: 'CreateDate', width: 200, title: '入库时间', sort: true }
             ,{ field: 'RecycEndDate', width: 200, title: '循环截止时间', sort: true }
             ,{ field: 'UserInfo', width: 200, title: '大盟主券标记', sort: true }
             ,{ field: 'IsFirst', width: 200, title: '是否第一台机具', sort: true }