From 0c7b13e91cd472e21e4a620355e6fcabc11f695a Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 04 一月 2022 13:56:24 +0800
Subject: [PATCH] 计件登记，汇总，打印
---
zhengcaioa/zhengcaioa/Controllers/admin/AdmPieceCheckController.cs | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/AdmPieceCheckController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/AdmPieceCheckController.cs
index 7d68d85..d682322 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/AdmPieceCheckController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/AdmPieceCheckController.cs
@@ -59,23 +59,48 @@
actionEntity1.PageIco = "fa fa-plus";
actionEntity1.ActionName = "鏂板";
actionlist.Add(actionEntity1);
+
+ ActionEntity actionEntity3 = new ActionEntity();
+ actionEntity3.OpenType = 0;
+ actionEntity3.ActionUrl = "";
+ actionEntity3.ActionFun = "Print";
+ actionEntity3.PageIco = "fa fa-print";
+ actionEntity3.ActionName = "鎵撳嵃";
+ actionlist.Add(actionEntity3);
+
ViewData["ActionInfo"] = actionlist;
- ViewBag.PayType = _liaotianService.GetSYScode("CooperVisit", "jtype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+ //ViewBag.PayType = _liaotianService.GetSYScode("CooperVisit", "jtype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.DeptId = _hrDeptService.GetList().Select(x => new { code = x.Id, label = x.DeptName }).ToList();
return View();
}
-
public IActionResult GetList(AdmPieceCheckDTOSearch search)
{
//JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
return new JsonResult(_admPieceCheckService.SearchByPaging(search));
}
+
+
+ public IActionResult printList(AdmPieceCheckDTOSearch search)
+ {
+ //JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
+ search.rows = 1000;
+ search.page = 1;
+ var resultDataEntity = _admPieceCheckService.SearchByPaging(search);
+ ViewBag.ListCooperOrderDTO = resultDataEntity.DataList as List<AdmPieceCheckDTO>;
+ ViewBag.Heji1 = resultDataEntity.Heji1;
+ ViewBag.Heji2 = resultDataEntity.Heji2;
+
+ return View();
+ }
+
+
+
public IActionResult Edit(string id = null)
{
@@ -101,7 +126,7 @@
ViewData["UserId"] = _userService.GetList();
ViewData["DeptId"] = _hrDeptService.GetList();
- ViewData["WorkPro"] = _fiPiecerateService.GetList();
+ ViewData["WorkPro"] = _fiPiecerateService.GetList().Where(x=>x.Standard == "A").ToList();
ViewData.Model = dto;
return View();
@@ -125,9 +150,12 @@
data.Creater = curentuser.Id;
data.Createtime = DateTime.Now;
}
+ data.DeptId = _userService.GetPltUserEntity(data.UserId).DeptId;
data.Modifier = curentuser.Id;
data.Modifytime = DateTime.Now;
+
+
ResultEntity resultEntity = _admPieceCheckService.save(data);
return new JsonResult(resultEntity);
--
Gitblit v1.9.1