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/BusinessOrder/OrderBanciOrderController.cs | 81 ++++++++++++++++++++++++++++++++--------
1 files changed, 64 insertions(+), 17 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
index 0d3c1e3..3c940aa 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
@@ -81,9 +81,10 @@
ViewData["ActionInfo"] = actionlist;
- ViewBag.kechengleixing = _liaotianService.GetSYScode("order_banci_order", "kechengleixing_id").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+ ViewBag.kechengleixing = _liaotianService.GetSYScode("order_banci_order", "kechengleixing_id").Where(x=>x.CodeSn=="3").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
-
+ ViewBag.Baomingtimebegin = DateTime.Now.AddYears(-1).ToString("yyyy-MM-dd");
+ ViewBag.Baomingtimeend = DateTime.Now.ToString("yyyy-MM-dd");
return View();
@@ -95,7 +96,53 @@
return new JsonResult(_orderBanciOrderService.SearchByPaging(search));
}
+ [CheckLogin]
+ public IActionResult Indexzhuanjia()
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ List<ActionEntity> actionlist = new List<ActionEntity>();
+ ActionEntity actionEntity = new ActionEntity();
+ actionEntity.OpenType = 0;
+ actionEntity.ActionUrl = "";
+ actionEntity.ActionFun = "Search";
+ actionEntity.PageIco = "fa fa-search";
+ actionEntity.ActionName = "鏌ヨ";
+ actionlist.Add(actionEntity);
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Add";
+ //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);
+
+ ActionEntity actionEntity4 = new ActionEntity();
+ actionEntity4.OpenType = 0;
+ actionEntity4.ActionUrl = "";
+ actionEntity4.ActionFun = "Duanxin";
+ actionEntity4.PageIco = "";
+ actionEntity4.ActionName = "鍙戦�佺煭淇�";
+ actionlist.Add(actionEntity4);
+
+ ViewData["ActionInfo"] = actionlist;
+
+ ViewBag.kechengleixing = _liaotianService.GetSYScode("order_banci_order", "kechengleixing_id").Where(x => x.CodeSn != "3").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+
+ ViewBag.Baomingtimebegin = DateTime.Now.AddYears(-1).ToString("yyyy-MM-dd");
+ ViewBag.Baomingtimeend = DateTime.Now.ToString("yyyy-MM-dd");
+
+ return View();
+
+ }
[CheckLogin]
public IActionResult print(OrderBanciOrderDTOSearch search)
@@ -160,7 +207,7 @@
resultEntity.Message = "鏃犺仈绯讳汉";
}
- string sss = SMSHelper.PushWToUserMES(number.ToString(), neirong);
+ string sss = SMSHelper.PushWToUserMES(number.ToString(), neirong );
if (int.Parse(sss) <= 0)
{
resultEntity.Result = false;
@@ -209,25 +256,25 @@
if (data.Baomingrenshu.HasValue)
{
- if (resultDataEntity.DataList.Count > 0)
- {
- var orderBanciOrderDTO = resultDataEntity.DataList.OrderByDescending(x => x.Baomingrenshu).FirstOrDefault();
+ //if (resultDataEntity.DataList.Count > 0)
+ //{
+ // var orderBanciOrderDTO = resultDataEntity.DataList.OrderByDescending(x => x.Baomingrenshu).FirstOrDefault();
- data.Baomingrenshu += orderBanciOrderDTO.Baomingrenshu;
- }
+ // data.Baomingrenshu += orderBanciOrderDTO.Baomingrenshu;
+ //}
}
else
{
- if (resultDataEntity.DataList.Count > 0)
- {
- var orderBanciOrderDTO = resultDataEntity.DataList.OrderByDescending(x => x.Baomingrenshu).FirstOrDefault();
+ //if (resultDataEntity.DataList.Count > 0)
+ //{
+ // var orderBanciOrderDTO = resultDataEntity.DataList.OrderByDescending(x => x.Baomingrenshu).FirstOrDefault();
- data.Baomingrenshu = orderBanciOrderDTO.Baomingrenshu+1;
- }
- else
- {
+ // data.Baomingrenshu = orderBanciOrderDTO.Baomingrenshu+1;
+ //}
+ //else
+ //{
data.Baomingrenshu = 1;
- }
+ //}
}
data.Jine = resultDataEntity.DataList.Sum(x => x.Xuefei);
data.Jine += data.Xuefei;
@@ -322,7 +369,7 @@
{
search.page = 1;
- search.rows = 1;
+ search.rows = 10000;
search.Fkzt = "03";
ResultDataEntity<FiOrderrecievemoneyDTO> resultDataEntity = _fiOrderrecievemoneyService.SearchByPaging(search);
--
Gitblit v1.9.1