From c60a7d7b29faba465969555e2a9c69acb8510f90 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 25 二月 2022 09:11:41 +0800
Subject: [PATCH] 如果客户资料中有“*”的内容，生产文书时自动填上，质疑单位默认填写客户名称，可修改
---
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs | 149 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 131 insertions(+), 18 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
index 0d3c1e3..ad1521f 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
@@ -29,10 +29,12 @@
private readonly IOrderBanciDtlService _orderBanciDtlService;
private readonly IOrderBanciOrderService _orderBanciOrderService;
private readonly IFiOrderrecievemoneyService _fiOrderrecievemoneyService;
+ private readonly ICooperOrderService _cooperOrderService;
public OrderBanciOrderController(ILogger<OrderBanciOrderController> logger, ILiaotianService liaotianService, IOrderBanciService orderBanciService, IOrderBanciDtlService orderBanciDtlService
,IOrderBanciOrderService orderBanciOrderService
- , IFiOrderrecievemoneyService fiOrderrecievemoneyService)
+ , IFiOrderrecievemoneyService fiOrderrecievemoneyService
+ , ICooperOrderService cooperOrderService)
{
_logger = logger;
_liaotianService = liaotianService;
@@ -40,6 +42,7 @@
_orderBanciDtlService = orderBanciDtlService;
_fiOrderrecievemoneyService = fiOrderrecievemoneyService;
_orderBanciOrderService = orderBanciOrderService;
+ _cooperOrderService = cooperOrderService;
}
[CheckLogin]
@@ -81,9 +84,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 +99,76 @@
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 Printhetong(string id = null)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+
+ //鎶曡瘔涔�
+ var orderBanciOrderDTO = _orderBanciOrderService.Get(id);
+
+
+ var frameworkUser = _cooperOrderService.GetFrameworkUsers(orderBanciOrderDTO.PersonId);
+ if (frameworkUser != null)
+ {
+ orderBanciOrderDTO.Xingming = frameworkUser.Name;
+ orderBanciOrderDTO.Lianxidianhua = frameworkUser.Itcode;
+ }
+
+
+
+ ViewData.Model = orderBanciOrderDTO;
+ return View();
+ }
[CheckLogin]
public IActionResult print(OrderBanciOrderDTOSearch search)
@@ -160,7 +233,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 +282,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 +395,7 @@
{
search.page = 1;
- search.rows = 1;
+ search.rows = 10000;
search.Fkzt = "03";
ResultDataEntity<FiOrderrecievemoneyDTO> resultDataEntity = _fiOrderrecievemoneyService.SearchByPaging(search);
@@ -341,5 +414,45 @@
return new JsonResult(returnMsg);
}
+
+ /// <summary>
+ /// 淇濆瓨
+ /// </summary>
+ /// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
+ /// <returns></returns>
+ ///
+ public IActionResult Delete(string OrderId)
+ {
+ //var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ //ViewData["curentuser"] = curentuser;
+ ReturnMsg<OrderBanciOrderDTO> returnMsg = new ReturnMsg<OrderBanciOrderDTO>();
+ returnMsg.code = 2;
+ try
+ {
+
+ ResultEntity resultEntity = _orderBanciOrderService.DeleteStatus(OrderId);
+ if (resultEntity.Result)
+ {
+ returnMsg.code = 1;
+ returnMsg.count = 1;
+ returnMsg.returnObj = null;
+ }
+ else
+ {
+ returnMsg.error = resultEntity.Message;
+ }
+
+ }
+ catch (Exception ex)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁鑾峰彇鍒皌oken";
+ returnMsg.count = 0;
+
+ }
+
+ return new JsonResult(returnMsg);
+ }
+
}
}
--
Gitblit v1.9.1