From 291558a5ddd495195047a23a27b44ce5b0bbca5a Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 15 十一月 2024 11:06:00 +0800
Subject: [PATCH] 1.T8入库记录(查询、删除) 2.T+入库记录(查询、删除) 3.生产入库记录查询增加部门查询条件 4.看板视图根据配置文件区分T8还是T+
---
VueWebCoreApi/Controllers/ReportManagerController.cs | 145 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 126 insertions(+), 19 deletions(-)
diff --git a/VueWebCoreApi/Controllers/ReportManagerController.cs b/VueWebCoreApi/Controllers/ReportManagerController.cs
index ab85b3c..71e9372 100644
--- a/VueWebCoreApi/Controllers/ReportManagerController.cs
+++ b/VueWebCoreApi/Controllers/ReportManagerController.cs
@@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
+using System.Data;
using System.Linq;
using System.Threading.Tasks;
using VueWebCoreApi.DLL.BLL;
@@ -600,37 +601,72 @@
#endregion
- #region[鍏ュ簱璁板綍]
+ #region[T8鍏ュ簱璁板綍琛ㄥご]
/// <summary>
- /// 鍏ュ簱璁板綍
+ /// T8鍏ュ簱璁板綍琛ㄥご
/// </summary>
/// <param name="page">椤电爜</param>
/// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
/// <param name="prop">鎺掑簭瀛楁</param>
/// <param name="order">鎺掑簭瑙勫垯</param>
/// <param name="hbillno">鍏ュ簱鍗曞彿</param>
- /// <param name="sono">閿�鍞崟鍙�</param>
- /// <param name="mono">璁㈠崟鍙�</param>
- /// <param name="wocode">宸ュ崟鍙�</param>
- /// <param name="partcode">浜у搧缂栫爜</param>
- /// <param name="partname">浜у搧鍚嶇О</param>
- /// <param name="stockcode">浠撳簱缂栫爜</param>
- /// <param name="responddate">鍗曟嵁鏃ユ湡</param>
+ /// <param name="hbdate">鍗曟嵁鏃ユ湡</param>
+ /// <param name="username">鎿嶄綔浜哄憳</param>
+ /// <param name="userdate">鎿嶄綔鏃堕棿</param>
/// <returns></returns>
- [Route(template: "StorageRecordSearch")]
+ [Route(template: "StorageRecordMainSearch")]
[HttpGet]
- public JsonResult StorageRecordSearch(int page, int rows, string prop, string order, string hbillno = null, string sono = null, string mono = null, string wocode = null, string partcode = null,string partname=null, string stockcode=null,string responddate=null)
+ public JsonResult StorageRecordMainSearch(int page, int rows, string prop, string order, string hbillno = null, string hbdate = null, string username = null, string userdate = null)
{
- string respondopendate = ""; //鍗曟嵁寮�濮嬫椂闂�
- string respondclosedate = ""; //鍗曟嵁缁撴潫鏃堕棿
- if (responddate != "" && responddate != null)
+ string hbdateopendate = ""; //鍗曟嵁寮�濮嬫椂闂�
+ string hbdateclosedate = ""; //鍗曟嵁缁撴潫鏃堕棿
+ string userdateopendate = ""; //鎿嶄綔寮�濮嬫椂闂�
+ string userdateclosedate = ""; //鎿嶄綔缁撴潫鏃堕棿
+ if (hbdate != "" && hbdate != null)
{
- respondopendate = responddate.Split('~')[0].ToString();
- respondclosedate = responddate.Split('~')[1].ToString();
+ hbdateopendate = hbdate.Split('~')[0].ToString();
+ hbdateclosedate = hbdate.Split('~')[1].ToString();
+ }
+ if (userdate != "" && userdate != null)
+ {
+ userdateopendate = userdate.Split('~')[0].ToString();
+ userdateclosedate = userdate.Split('~')[1].ToString();
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.StorageRecordSearch(hbillno, sono, mono, wocode, partcode, partname, stockcode, respondopendate, respondclosedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.StorageRecordMainSearch(hbillno, username, hbdateopendate, hbdateclosedate, userdateopendate, userdateclosedate, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[T8鍏ュ簱璁板綍琛ㄤ綋]
+ /// <summary>
+ /// T8鍏ュ簱璁板綍琛ㄤ綋
+ /// </summary>
+ /// <param name="hbillno">鍏ュ簱鍗曞彿</param>
+ /// <returns></returns>
+ [Route(template: "StorageRecordSubSearch")]
+ [HttpGet]
+ public JsonResult StorageRecordSubSearch(string hbillno = null)
+ {
+ mes = ReportManagerBLL.StorageRecordSubSearch(hbillno);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[T8鍏ュ簱璁板綍鍒犻櫎]
+ /// <summary>
+ /// T8鍏ュ簱璁板綍鍒犻櫎
+ /// </summary>
+ /// <param name="dt">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "StorageRecordDelete")]
+ [HttpPost]
+ public JsonResult StorageRecordDelete(DataTable dt)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = ReportManagerBLL.StorageRecordDelete(dt, us);
return Json(mes);
}
#endregion
@@ -643,10 +679,10 @@
/// <returns></returns>
[Route(template: "DeleteStorageRecord")]
[HttpPost]
+ [ApiExplorerSettings(IgnoreApi =true)] //闅愯棌鎺ュ彛
public JsonResult DeleteStorageRecord(List<StorageRecord> json)
{
- //var token = HttpContext.Request.Headers["Token"].ToString();
- var token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyY29kZSI6Ijk5OTkiLCJ1c2VybmFtZSI6Iuezu-e7n-euoeeQhuWRmCIsInN0b3JnX2NvZGUiOiIiLCJzdG9yZ19uYW1lIjoiIiwiaXNfc3lzdGVtX2FkbWluIjoiWSIsInJvbGVfY29kZSI6IiIsInJvbGVfZGF0YXBlcm1pc3Npb25zIjoiIiwidXNlcnR5cGUiOiJQQyIsInJlZGlza2V5IjoiTmV3TUVTTG9naW5Vc2VySURQQzk5OTkiLCJtZXNTZXR0aW5nIjoie1wicm91dGVcIjp0cnVlLFwiaXNPcmRlclwiOnRydWUsXCJkZXZpY2VcIjp0cnVlLFwidGVjaFwiOnRydWUsXCJ3b3JrT3JkZXJcIjp0cnVlLFwiZXZlcnlcIjpmYWxzZSxcImxhc3RcIjpmYWxzZX0iLCJ0aW1lb3V0IjoiMjAyNC0xMC0yNFQxMjozNTo1MC4zNDI1NzE2KzA4OjAwIn0.Nbc-1sXd4QLLsnj8wH9XC7iWEmP0wDG82gwLxIh94e4";
+ var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
mes = ReportManagerBLL.DeleteStorageRecord(json, us);
return Json(mes);
@@ -668,6 +704,7 @@
/// <returns></returns>
[Route(template: "StorageRecordExcelSearch")]
[HttpGet]
+ [ApiExplorerSettings(IgnoreApi = true)] //闅愯棌鎺ュ彛
public JsonResult StorageRecordExcelSearch(string hbillno = null, string sono = null, string mono = null, string wocode = null, string partcode = null,string partname=null, string stockcode = null, string responddate = null)
{
string respondopendate = ""; //鍗曟嵁寮�濮嬫椂闂�
@@ -683,5 +720,75 @@
#endregion
+ #region[T+鍏ュ簱璁板綍琛ㄥご]
+ /// <summary>
+ /// T+鍏ュ簱璁板綍琛ㄥご
+ /// </summary>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <param name="hbillno">鍏ュ簱鍗曞彿</param>
+ /// <param name="hbdate">鍗曟嵁鏃ユ湡</param>
+ /// <param name="username">鎿嶄綔浜哄憳</param>
+ /// <param name="userdate">鎿嶄綔鏃堕棿</param>
+ /// <returns></returns>
+ [Route(template: "InStorageRecordMainSearch")]
+ [HttpGet]
+ public JsonResult InStorageRecordMainSearch(int page, int rows, string prop, string order, string hbillno = null, string hbdate = null, string username = null, string userdate = null)
+ {
+ string hbdateopendate = ""; //鍗曟嵁寮�濮嬫椂闂�
+ string hbdateclosedate = ""; //鍗曟嵁缁撴潫鏃堕棿
+ string userdateopendate = ""; //鎿嶄綔寮�濮嬫椂闂�
+ string userdateclosedate = ""; //鎿嶄綔缁撴潫鏃堕棿
+ if (hbdate != "" && hbdate != null)
+ {
+ hbdateopendate = hbdate.Split('~')[0].ToString();
+ hbdateclosedate = hbdate.Split('~')[1].ToString();
+ }
+ if (userdate != "" && userdate != null)
+ {
+ userdateopendate = userdate.Split('~')[0].ToString();
+ userdateclosedate = userdate.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = ReportManagerBLL.InStorageRecordMainSearch(hbillno, username, hbdateopendate, hbdateclosedate, userdateopendate, userdateclosedate, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[T+鍏ュ簱璁板綍琛ㄤ綋]
+ /// <summary>
+ /// T+鍏ュ簱璁板綍琛ㄤ綋
+ /// </summary>
+ /// <param name="hbillno">鍏ュ簱鍗曞彿</param>
+ /// <returns></returns>
+ [Route(template: "InStorageRecordSubSearch")]
+ [HttpGet]
+ public JsonResult InStorageRecordSubSearch(string hbillno = null)
+ {
+ mes = ReportManagerBLL.InStorageRecordSubSearch(hbillno);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[T+鍏ュ簱璁板綍鍒犻櫎]
+ /// <summary>
+ /// T+鍏ュ簱璁板綍鍒犻櫎
+ /// </summary>
+ /// <param name="dt">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "DeleteInStorageRecord")]
+ [HttpPost]
+ public JsonResult DeleteInStorageRecord(DataTable dt)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ //var token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyY29kZSI6Ijk5OTkiLCJ1c2VybmFtZSI6Iuezu-e7n-euoeeQhuWRmCIsInN0b3JnX2NvZGUiOiIiLCJzdG9yZ19uYW1lIjoiIiwiaXNfc3lzdGVtX2FkbWluIjoiWSIsInJvbGVfY29kZSI6IiIsInJvbGVfZGF0YXBlcm1pc3Npb25zIjoiIiwidXNlcnR5cGUiOiJQQyIsInJlZGlza2V5IjoiTmV3TUVTTG9naW5Vc2VySURQQzk5OTkiLCJtZXNTZXR0aW5nIjoie1wicm91dGVcIjp0cnVlLFwiaXNPcmRlclwiOnRydWUsXCJkZXZpY2VcIjp0cnVlLFwidGVjaFwiOnRydWUsXCJ3b3JrT3JkZXJcIjp0cnVlLFwiZXZlcnlcIjpmYWxzZSxcImxhc3RcIjpmYWxzZX0iLCJ0aW1lb3V0IjoiMjAyNC0xMC0yNFQxMjozNTo1MC4zNDI1NzE2KzA4OjAwIn0.Nbc-1sXd4QLLsnj8wH9XC7iWEmP0wDG82gwLxIh94e4";
+ User us = JwtTools.Denocode(token.ToString());
+ mes = ReportManagerBLL.DeleteInStorageRecord(dt, us);
+ return Json(mes);
+ }
+ #endregion
}
}
--
Gitblit v1.9.3