Преглед изворни кода

增加机具查询项:小分仓

lichunlei пре 4 година
родитељ
комит
b47388592f
1 измењених фајлова са 3 додато и 0 уклоњено
  1. 3 0
      Areas/Admin/Controllers/MainServer/SysToolsController.cs

+ 3 - 0
Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -952,6 +952,8 @@ namespace MySystem.Areas.Admin.Controllers
             Orders applyorder = db.Orders.FirstOrDefault(m => m.Id == apply.QueryCount) ?? new Orders();
             Orders applyorder = db.Orders.FirstOrDefault(m => m.Id == apply.QueryCount) ?? new Orders();
             MachineChangeDetail change = db.MachineChangeDetail.FirstOrDefault(m => m.OutSnNo == pos.PosSn) ?? new MachineChangeDetail();
             MachineChangeDetail change = db.MachineChangeDetail.FirstOrDefault(m => m.OutSnNo == pos.PosSn) ?? new MachineChangeDetail();
 
 
+            Users smallStoreUser = db.Users.FirstOrDefault(m => m.Id == pos.PreUserId) ?? new Users();
+
             string RecycFlag = pos.IsPurchase == 1 ? "已申请循环" : "未申请循环";
             string RecycFlag = pos.IsPurchase == 1 ? "已申请循环" : "未申请循环";
             string SendStatus = applyorder.SendStatus == 1 ? "已发货" : "未发货";
             string SendStatus = applyorder.SendStatus == 1 ? "已发货" : "未发货";
             string ApplyDate = apply.CreateDate == null ? "" : apply.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string ApplyDate = apply.CreateDate == null ? "" : apply.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
@@ -970,6 +972,7 @@ namespace MySystem.Areas.Admin.Controllers
             result += "机具所属人:创客编号:" + posUser.MakerCode + ",姓名:" + posUser.RealName + ",手机号:" + posUser.Mobile + "\n";
             result += "机具所属人:创客编号:" + posUser.MakerCode + ",姓名:" + posUser.RealName + ",手机号:" + posUser.Mobile + "\n";
             result += "机器持有人顶级:创客编号:" + posTopUser.MakerCode + ",姓名:" + posTopUser.RealName + ",手机号:" + posTopUser.Mobile + "\n";
             result += "机器持有人顶级:创客编号:" + posTopUser.MakerCode + ",姓名:" + posTopUser.RealName + ",手机号:" + posTopUser.Mobile + "\n";
             result += "机器所属仓库:仓库编号:" + store.StoreNo + ",仓库名称:" + store.StoreName + "\n";
             result += "机器所属仓库:仓库编号:" + store.StoreNo + ",仓库名称:" + store.StoreName + "\n";
+            result += "机具所属小分仓:创客编号:" + smallStoreUser.MakerCode + ",姓名:" + smallStoreUser.RealName + ",手机号:" + smallStoreUser.Mobile + "\n";
             result += "划拨时间:" + TransferTime + "\n";
             result += "划拨时间:" + TransferTime + "\n";
             result += "绑定状态:" + bindResult + "(绑定时间:" + bindTime + ")\n";
             result += "绑定状态:" + bindResult + "(绑定时间:" + bindTime + ")\n";
             result += "激活状态:" + activeResult + "(激活时间:" + activeTime + ")\n";
             result += "激活状态:" + activeResult + "(激活时间:" + activeTime + ")\n";