查询循环机具加上大盟主归属人

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -2200,12 +2200,30 @@ namespace MySystem.Areas.Admin.Controllers
                     data["RealName"] = user.RealName;
                     if(SnNoList.Length > i)
                     {
+                        string SourceSn = SnNoList[i].Split(':')[0];
                         data["ComeSn"] = SnNoList[i];
-                        data["ComeSnParam"] = SnNoList[i].Split(':')[0];
+                        data["ComeSnParam"] = SourceSn;
+                        MachineForSnNo machineFor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SourceSn) ?? new MachineForSnNo();
+                        PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineFor.SnId) ?? new PosMachinesTwo();
+                        if(pos.LeaderUserId > 0)
+                        {
+                            Users leader = db.Users.FirstOrDefault(m => m.Id == pos.LeaderUserId) ?? new Users();
+                            data["ComeSnMakerCode"] = leader.MakerCode;
+                            data["ComeSnRealName"] = leader.MakerCode;
+                        }
                     }
                     if(OrderSnNo.Length > i)
                     {
+                        string SendSn = OrderSnNo[i];
                         data["SendSn"] = OrderSnNo[i];
+                        MachineForSnNo machineFor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SendSn) ?? new MachineForSnNo();
+                        PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineFor.SnId) ?? new PosMachinesTwo();
+                        if(pos.LeaderUserId > 0)
+                        {
+                            Users leader = db.Users.FirstOrDefault(m => m.Id == pos.LeaderUserId) ?? new Users();
+                            data["SendSnMakerCode"] = leader.MakerCode;
+                            data["SendSnRealName"] = leader.MakerCode;
+                        }
                     }
                     data["CreateDate"] = apply.CreateDate == null ? "" : apply.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
                     data["Status"] = order.Status == 2 ? "已发货" : "未发货";
@@ -2228,12 +2246,30 @@ namespace MySystem.Areas.Admin.Controllers
                     data["RealName"] = user.RealName;
                     if(SnNoList.Length > i)
                     {
+                        string SourceSn = SnNoList[i].Split(':')[0];
                         data["ComeSn"] = SnNoList[i];
-                        data["ComeSnParam"] = SnNoList[i].Split(':')[0];
+                        data["ComeSnParam"] = SourceSn;
+                        MachineForSnNo machineFor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SourceSn) ?? new MachineForSnNo();
+                        PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineFor.SnId) ?? new PosMachinesTwo();
+                        if(pos.LeaderUserId > 0)
+                        {
+                            Users leader = db.Users.FirstOrDefault(m => m.Id == pos.LeaderUserId) ?? new Users();
+                            data["ComeSnMakerCode"] = leader.MakerCode;
+                            data["ComeSnRealName"] = leader.MakerCode;
+                        }
                     }
                     if(OrderSnNo.Length > i)
                     {
+                        string SendSn = OrderSnNo[i];
                         data["SendSn"] = OrderSnNo[i];
+                        MachineForSnNo machineFor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SendSn) ?? new MachineForSnNo();
+                        PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineFor.SnId) ?? new PosMachinesTwo();
+                        if(pos.LeaderUserId > 0)
+                        {
+                            Users leader = db.Users.FirstOrDefault(m => m.Id == pos.LeaderUserId) ?? new Users();
+                            data["SendSnMakerCode"] = leader.MakerCode;
+                            data["SendSnRealName"] = leader.MakerCode;
+                        }
                     }
                     data["CreateDate"] = apply.CreateDate == null ? "" : apply.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
                     data["Status"] = order.Status == 2 ? "已发货" : "未发货";

wwwroot/layuiadmin/modules_main/Loop_Admin.js

@@ -135,7 +135,11 @@ layui.config({
             , { field: 'ApplyNo', width: 200, title: '申请订单号', sort: true }
             , { field: 'OrderNo', width: 200, title: '订单号', sort: true }
             , { field: 'ComeSn', width: 300, title: '来源机具SN', sort: true, templet: '#ComeSnLoop' }
+            , { field: 'ComeSnMakerCode', width: 200, title: '来源机具大盟主编号', sort: true }
+            , { field: 'ComeSnRealName', width: 200, title: '来源机具大盟主姓名', sort: true }
             , { field: 'SendSn', width: 300, title: '发货SN', sort: true, templet: '#SendSnLoop' }
+            , { field: 'SendSnMakerCode', width: 200, title: '发货机具大盟主编号', sort: true }
+            , { field: 'SendSnRealName', width: 200, title: '发货机具大盟主姓名', sort: true }
             , { field: 'MakerCode', width: 200, title: '创客编号', sort: true }
             , { field: 'RealName', width: 200, title: '创客姓名', sort: true }
             , { field: 'CreateDate', width: 200, title: '申请时间', sort: true }