From 94d0b18fa47a92a1cb4d1fef4520d35ef2c2c322 Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期二, 16 十二月 2025 21:56:49 +0800
Subject: [PATCH] 产能排产相关后端更新
---
WebApi/Gs.Report/ReportController.cs | 113 +++++++++++++++++++++++---------------------------------
1 files changed, 46 insertions(+), 67 deletions(-)
diff --git a/WebApi/Gs.Report/ReportController.cs b/WebApi/Gs.Report/ReportController.cs
index dead00f..8a27b27 100644
--- a/WebApi/Gs.Report/ReportController.cs
+++ b/WebApi/Gs.Report/ReportController.cs
@@ -14,10 +14,9 @@
[ApiGroup(ApiGroupNames.Report)]
public class ReportController : IRomteService
{
- private readonly string _customTag = "瀹㈡埛妯℃澘";
private readonly IHttpContextAccessor _http;
private readonly string _userCode, _userGuid, _orgFids;
-
+ private readonly string _customTag = "瀹㈡埛妯℃澘";
public ReportController(IHttpContextAccessor httpContextAccessor)
{
_http = httpContextAccessor;
@@ -37,24 +36,21 @@
var rptParameter = _ary[0];
return rptParameter;
}
-
return str;
}
-
/// <summary>
- /// 鏍规嵁鎶ヨ〃鍙傛暟璇诲彇鎶ヨ〃鍙傛暟
+ /// 鏍规嵁鎶ヨ〃鍙傛暟璇诲彇鎶ヨ〃鍙傛暟
/// </summary>
/// <param name=""></param>
/// <returns></returns>
- public static (string?, string?, string?, string?, string?, string?)
- _rptGetParameterP(string str)
+ public static (string?, string?, string?, string?, string?, string?) _rptGetParameterP(string str)
{
string s0 = "", s1 = "", s2 = "", s3 = "", s4 = "", s5 = "";
var _ary = str.Split('{');
if (_ary.Length > 0)
{
var rptParameter = _ary[1].Replace("}", "");
- var _pAry = rptParameter.Split(',');
+ string[] _pAry = rptParameter.Split(',');
if (_pAry.Length > 0)
s0 = _pAry[0];
if (_pAry.Length > 1)
@@ -68,7 +64,6 @@
if (_pAry.Length > 5)
s5 = _pAry[5];
}
-
return (s0, s1, s2, s3, s4, s5);
}
@@ -83,7 +78,7 @@
string guid = model.guid;
int isDesign = model.isDesign;
string _rptParameter = model.rptParameter;
- var rptParameterName = _rptGetParameterName(_rptParameter);
+ string rptParameterName = _rptGetParameterName(_rptParameter);
string p1, p2, p3, p4, p5, p6;
(p1, p2, p3, p4, p5, p6) = _rptGetParameterP(_rptParameter);
dynamic m = new ExpandoObject();
@@ -110,17 +105,16 @@
m.reportTemplateData = buffer;
_blDate = true;
}
-
reader.Close();
}
-
- if (!_blDate)
+ if (_blDate == false)
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
"璇诲彇澶辫触锛屾病鏈夊垵濮嬪寲妯℃澘锛�");
//濡傛灉鏄璁℃ā寮忥紝閫�鍑�
if (isDesign == 1)
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
- "璇诲彇鎴愬姛锛�");
+ {
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
+ }
//璇婚渶瑕佹墦鍗扮殑鏁版嵁锛岀敤鏉ュ～鍏呮ā鏉�
if (_rptParameter.StartsWith(_customTag))
rptParameterName = "rpt_hgm";
@@ -133,16 +127,15 @@
comm.CommandType = CommandType.StoredProcedure;
SqlParameter[] parameters =
{
- new("@inEdtUserGuid", _userGuid),
- new("@inOrderGuid", guid),
- new("@isDesign", isDesign),
- new("@in1", p1),
- new("@in2", p2),
- new("@in3",
- string.IsNullOrEmpty(p3) ? DBNull.Value : p3),
- new("@in4", p4),
- new("@in5", p5),
- new("@in6", p6)
+ new("@inEdtUserGuid", _userGuid),
+ new("@inOrderGuid",guid),
+ new("@isDesign",isDesign),
+ new("@in1", p1),
+ new("@in2", p2),
+ new("@in3", string.IsNullOrEmpty(p3)?DBNull.Value:p3),
+ new("@in4", p4),
+ new("@in5", p5),
+ new("@in6", p6)
};
foreach (var parameter in parameters)
comm.Parameters.Add(parameter);
@@ -151,22 +144,20 @@
dt.Fill(dset, "0");
}
}
-
conn.Close();
}
-
//0鏄姸鎬侊紝1鏄富琛紝2鏄槑缁嗚〃锛�3鏄槑缁嗚〃
if (dset.Tables[0].Rows[0]["msgState"].ToString() == "-1")
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
- dset.Tables[0].Rows[0]["msgTxt"].ToString());
+ {
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, dset.Tables[0].Rows[0]["msgTxt"].ToString());
+ }
var _zb1 = dset.Tables[1].TableToDynamicList();
var _mx1 = dset.Tables[2].TableToDynamicList();
var _mx2 = dset.Tables[3].TableToDynamicList();
m.zb = _zb1;
m.mx1 = _mx1;
m.mx2 = _mx2;
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
- "璇诲彇鎴愬姛锛�");
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
}
catch (Exception ex)
{
@@ -235,8 +226,8 @@
#region MyRegion
-
/// <summary>
+ ///
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -245,22 +236,15 @@
{
string keyType = model.keyType;
- var lst = new List<dynamic>();
- var sbSql = new StringBuilder();
+ List<dynamic> lst = new List<dynamic>();
+ System.Text.StringBuilder sbSql = new StringBuilder();
if (keyType == "瀹㈡埛妯℃澘")
{
- sbSql.Append(
- "select [GUID],[REPORT_TYPE],[REPORT_NAME] from [dbo].[SYS_REPORT_TEMPLATE] where REPORT_TYPE like '" +
- _customTag + "%' ");
- sbSql.Append(
- " union all select [GUID],[REPORT_TYPE],[REPORT_NAME] from [dbo].[SYS_REPORT_TEMPLATE] where REPORT_TYPE='rpt_hgm' order by REPORT_TYPE asc");
+ sbSql.Append("select [GUID],[REPORT_TYPE],[REPORT_NAME] from [dbo].[SYS_REPORT_TEMPLATE] where REPORT_TYPE like '" + _customTag + "%' ");
+ sbSql.Append(" union all select [GUID],[REPORT_TYPE],[REPORT_NAME] from [dbo].[SYS_REPORT_TEMPLATE] where REPORT_TYPE='rpt_hgm' order by REPORT_TYPE asc");
}
else
- {
- sbSql.Append(
- "select [GUID],[REPORT_TYPE],[REPORT_NAME] from [dbo].[SYS_REPORT_TEMPLATE] order by [REPORT_TYPE] desc");
- }
-
+ sbSql.Append("select [GUID],[REPORT_TYPE],[REPORT_NAME] from [dbo].[SYS_REPORT_TEMPLATE] order by [REPORT_TYPE] desc");
var dset = new DataSet();
try
{
@@ -273,13 +257,12 @@
return ReturnDto<List<dynamic>>.QuickReturn(lst,
ReturnCode.Exception, "璇诲彇澶辫触锛�");
}
-
return ReturnDto<List<dynamic>>.QuickReturn(lst, ReturnCode.Success,
"璇诲彇鎴愬姛锛�");
}
/// <summary>
- /// 鍔犲叆
+ /// 鍔犲叆
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -287,8 +270,8 @@
public ReturnDto<int?> AddModel([FromBody] dynamic model)
{
string reportName = model.reportName;
- var reportType = _customTag + DateTime.Now.ToString("MMddHHmmff");
- var rtnInt = (int)ReturnCode.Default;
+ string reportType = _customTag + DateTime.Now.ToString("MMddHHmmff");
+ int rtnInt = (int)ReturnCode.Default;
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
using (var cmd = new SqlCommand("[prc_report_edt]", conn))
@@ -323,16 +306,14 @@
}
}
}
-
if (rtnInt > 0)
- return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Success,
- "鎿嶄綔鎴愬姛锛�");
- return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception,
- "鎿嶄綔澶辫触锛岃閲嶈瘯锛�");
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
+ else
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "鎿嶄綔澶辫触锛岃閲嶈瘯锛�");
}
/// <summary>
- /// 绉诲嚭
+ /// 绉诲嚭
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -340,31 +321,29 @@
public ReturnDto<int?> DeleteModel([FromBody] dynamic model)
{
string guid = model.guid;
- var rtnInt = (int)ReturnCode.Default;
+ int rtnInt = (int)ReturnCode.Default;
if (guid.ToUpper() == "AF1105F3-1CFA-4E48-BE07-6EC3A184918C".ToUpper())
- return ReturnDto<int>.QuickReturn(default(int?),
- ReturnCode.Exception, "鎿嶄綔澶辫触锛岄粯璁ゆā鐗堬紝涓嶈兘鍒犻櫎锛�");
+ {
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "鎿嶄綔澶辫触锛岄粯璁ゆā鐗堬紝涓嶈兘鍒犻櫎锛�");
+ }
try
{
- var strSql = new StringBuilder();
+ StringBuilder strSql = new StringBuilder();
strSql.Append(" delete from SYS_REPORT_TEMPLATE ");
strSql.Append(" where guid='" + guid + "'");
rtnInt = DbHelperSQL.ExecuteSql(strSql.ToString());
}
catch (Exception ex)
{
- LogHelper.Debug(ToString(), "DeleteModel error锛�" + ex.Message);
+ LogHelper.Debug(this.ToString(), "DeleteModel error锛�" + ex.Message);
rtnInt = (int)ReturnCode.Exception;
- return ReturnDto<int>.QuickReturn(default(int?),
- ReturnCode.Exception, "鎿嶄綔澶辫触锛�" + ex.Message);
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "鎿嶄綔澶辫触锛�" + ex.Message);
}
-
if (rtnInt > 0)
- return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Success,
- "鎿嶄綔鎴愬姛锛�");
- return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception,
- "鎿嶄綔澶辫触锛岃閲嶈瘯锛�");
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
+ else
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "鎿嶄綔澶辫触锛岃閲嶈瘯锛�");
}
-
#endregion
+
}
\ No newline at end of file
--
Gitblit v1.9.3