From f28d34bfcec8003187dcab5e5b4475761a6c00a2 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期四, 23 十月 2025 14:43:14 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~cnf/JH/JH_MesService
---
WebApi/Gs.Sys/Services/FmController.cs | 29 ++-
WebApi/Gs.Wom/Service/WomdaaManager.cs | 5
WebApi/Gs.Warehouse/Services/MesInvItemMovesManager.cs | 271 ++++++++++++++++++++++++++++++++++++++
WebApi/Gs.Wom/Service/WomLLDJManager.cs | 3
WebApi/Gs.Toolbox/InterfaceUtil.cs | 26 ++-
WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs | 3
WebApi/Gs.HostIIS/appsettings.json | 2
WebApi/Gs.Wom/Service/WompbaManager.cs | 23 +--
8 files changed, 310 insertions(+), 52 deletions(-)
diff --git a/WebApi/Gs.HostIIS/appsettings.json b/WebApi/Gs.HostIIS/appsettings.json
index 22a149a..977b409 100644
--- a/WebApi/Gs.HostIIS/appsettings.json
+++ b/WebApi/Gs.HostIIS/appsettings.json
@@ -8,7 +8,7 @@
"AllowedHosts": "*",
/*"ConnectionStrings": "Data Source=192.168.1.146;Initial Catalog=TEST_MES;User ID=testUser;Password =qixi1qaz@WSXtest",*/
"ConnectionStrings": "Data Source=192.168.8.8;Initial Catalog=YS_MES;User ID=sa;Password =JianHui@2025",
- "TestErpUrl": "http://192.168.1.149:8066/WebService1.asmx/MesToErpinfoTest",
+ "TestErpUrl": "http://60.204.140.168:8080//kingdee/billWriteIn",
"TestErpUrl2": "http://192.168.1.149:8066/WebService1.asmx/MesToErpUpdateFlag",
"ProductionErpUrl": "http://192.168.1.149:8066/WebService1.asmx/mesToErpinfoFormal",
"ServicesPath": "Services",
diff --git a/WebApi/Gs.Sys/Services/FmController.cs b/WebApi/Gs.Sys/Services/FmController.cs
index 8e5b3a8..3388663 100644
--- a/WebApi/Gs.Sys/Services/FmController.cs
+++ b/WebApi/Gs.Sys/Services/FmController.cs
@@ -1,15 +1,16 @@
-锘縰sing System.Collections;
-using System.Data;
-using System.Data.SqlClient;
-using System.Dynamic;
-using Gs.Toolbox;
+锘縰sing Gs.Toolbox;
using Gs.Toolbox.ApiCore.Abstract.Mvc;
using Gs.Toolbox.ApiCore.Common.Mvc;
using Gs.Toolbox.ApiCore.Group;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using NetTaste;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System.Collections;
+using System.Data;
+using System.Data.SqlClient;
+using System.Dynamic;
using static Gs.Toolbox.UtilityHelper;
namespace Gs.Sys.Services
@@ -324,14 +325,16 @@
((IDictionary<string, object>)_datajson)[keyChild] = _lst;
}
}
- var _obj = new
- {
- mesid = _mesGuid,
- taskname = keyTaskName,
- optype = keyMeth,
- datajson = JsonConvert.SerializeObject(_datajson),
- };
- return JsonConvert.SerializeObject(_obj);
+ /*var _obj = new
+ {
+ mesid = _mesGuid,
+ taskname = keyTaskName,
+ optype = keyMeth,
+ datajson = JsonConvert.SerializeObject(_datajson),
+ };
+ return JsonConvert.SerializeObject(_obj);*/
+
+ return JsonConvert.SerializeObject(_datajson);
}
//杩欐槸璁㈠崟鍥炰紶鏍囪瘑
List<dynamic> _datajson22 = new List<dynamic>();
diff --git a/WebApi/Gs.Toolbox/InterfaceUtil.cs b/WebApi/Gs.Toolbox/InterfaceUtil.cs
index c40aa81..65bd586 100644
--- a/WebApi/Gs.Toolbox/InterfaceUtil.cs
+++ b/WebApi/Gs.Toolbox/InterfaceUtil.cs
@@ -1,8 +1,9 @@
-锘縰sing System.Net.Cache;
-using System.Net;
-using System.Text;
-using Newtonsoft.Json;
+锘縰sing Newtonsoft.Json;
using System.Data.SqlClient;
+using System.Dynamic;
+using System.Net;
+using System.Net.Cache;
+using System.Text;
namespace Gs.Toolbox;
@@ -38,7 +39,7 @@
request.Method = "POST";
request.ContentType = "application/json";
request.Accept = "*/*";
- request.Timeout = 150000;
+ //request.Timeout = 150000;
request.AllowAutoRedirect = false;
request.ServicePoint.Expect100Continue = false;
HttpRequestCachePolicy noCachePolicy = new HttpRequestCachePolicy(HttpRequestCacheLevel.NoCacheNoStore);
@@ -54,6 +55,7 @@
responseStr = reader.ReadToEnd();
reader.Close();
}
+ // LogHelper.Debug(url, "HttpPostErp response:" + param + "锛宺esponse:" + responseStr.ToString());
}
catch (Exception ex)
{
@@ -67,10 +69,11 @@
requestStream = null;
response = null;
}
+ //{"msg":"鎿嶄綔鎴愬姛","code":200,"data":{"number":"CGSL168397","code":"200","id":"268781"}}
if (_rtn != -1)
{
Result _result = JsonConvert.DeserializeObject<Result>(responseStr);
- if ("200".Equals(_result.state))
+ if ("200".Equals(_result.code))
_rtn = 1;
}
sbLog.Append("," + DateTime.Now.ToString() + "缁撴潫鍙戦��");
@@ -102,16 +105,15 @@
return (_rtn, (_rtn > 0 ? strLogGuid : responseStr));
}
}
-
+//{"msg":"鎿嶄綔鎴愬姛","code":200,"data":{"number":"CGSL168397","code":"200","id":"268781"}}
public class Result
{
/// <summary>
/// 200鎴愬姛锛屽惁鍒欏け璐�
/// </summary>
- public string? state { get; set; }
+ ///
+
public string? msg { get; set; }
-
- public string? status { get; set; }
-
- public string? message { get; set; }
+ public string? code { get; set; }
+ // public string? data { get; set; }
}
\ No newline at end of file
diff --git a/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs b/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs
index 619199b..48de7e5 100644
--- a/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs
+++ b/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs
@@ -551,8 +551,7 @@
/// <param name="query"></param>
/// <returns></returns>
[RequestMethod(RequestMethods.POST)]
- public ReturnDto<List<dynamic>> SelectFormTo(
- JArray guidList)
+ public ReturnDto<List<dynamic>> SelectFormTo(JArray guidList)
{
var intArray = guidList.ToObject<string[]>();
var sbLine = new StringBuilder();
diff --git a/WebApi/Gs.Warehouse/Services/MesInvItemMovesManager.cs b/WebApi/Gs.Warehouse/Services/MesInvItemMovesManager.cs
index 87b3d99..79a856c 100644
--- a/WebApi/Gs.Warehouse/Services/MesInvItemMovesManager.cs
+++ b/WebApi/Gs.Warehouse/Services/MesInvItemMovesManager.cs
@@ -8,6 +8,7 @@
using Gs.Toolbox.ApiCore.Group;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json.Linq;
using static Gs.Toolbox.UtilityHelper;
namespace Gs.Warehouse.Services;
@@ -22,8 +23,7 @@
public MesInvItemMovesManager(IHttpContextAccessor httpContextAccessor)
{
_http = httpContextAccessor;
- (_userCode, _userGuid, _orgFids) =
- GetUserGuidAndOrgGuid(_http);
+ (_userCode, _userGuid, _orgFids) = GetUserGuidAndOrgGuid(_http);
}
/// <summary>
@@ -346,4 +346,271 @@
}
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
}
+
+ /// <summary>
+ /// 閫夋嫨鐢熶骇璁㈠崟
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<PageList<dynamic>> SelectScdd([FromBody] dynamic model)
+ {
+ int currentPage = model.currentPage;
+ int everyPageSize = model.everyPageSize;
+ string sortName = model.sortName;
+ string keyWhere = model.keyWhere;
+ string workId = model.workId;
+ var dset = new DataSet();
+ try
+ {
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ if (workId == "1")
+ {
+ using (var cmd = new SqlCommand("[prc_wom_scdd_select]", conn))
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ new("@inCurrentPage", currentPage),
+ new("@inEveryPageSize", everyPageSize),
+ new("@inSortName", sortName),
+ new("@inSortOrder", ""),
+ new("@inQueryWhere", keyWhere),
+ new("@workId", workId),
+ new("@inP1", ""),
+ new("@inP2", "")
+ };
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+ using (var dt = new SqlDataAdapter(cmd))
+ {
+ dt.Fill(dset, "0");
+ }
+ }
+ conn.Close();
+ }
+ else
+ {
+ using (var cmd = new SqlCommand("[prc_wom_wwdd_select]", conn))
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ new("@inCurrentPage", currentPage),
+ new("@inEveryPageSize", everyPageSize),
+ new("@inSortName", sortName),
+ new("@inSortOrder", ""),
+ new("@inQueryWhere", keyWhere),
+ new("@workId", workId),
+ new("@inP1", ""),
+ new("@inP2", "")
+ };
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+ using (var dt = new SqlDataAdapter(cmd))
+ {
+ dt.Fill(dset, "0");
+ }
+ }
+ conn.Close();
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(), "prc_wom_scdd_select error锛�" + ex.Message);
+ return ReturnDto<PageList<dynamic>>.QuickReturn(default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
+ }
+
+ var _pglist = new PageList<dynamic>
+ {
+ total = 0,
+ everyPageSize = 0,
+ pages = 0,
+ list = new List<dynamic>()
+ };
+ if (dset != null && dset.Tables.Count > 0 &&
+ dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
+ {
+ var intTotal = int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
+ var pages = intTotal % everyPageSize != 0 ? intTotal / everyPageSize + 1 : intTotal / everyPageSize;
+ _pglist.total = intTotal;
+ _pglist.everyPageSize = everyPageSize;
+ _pglist.pages = pages;
+ var _dy = dset.Tables[0].TableToDynamicList();
+ _pglist.list = _dy;
+ }
+
+ return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,ReturnCode.Success, "璇诲彇鎴愬姛");
+ }
+
+
+ /// <summary>
+ /// 閫夋嫨濮斿璁㈠崟
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<PageList<dynamic>> SelectWwdd([FromBody] dynamic model)
+ {
+ int currentPage = model.currentPage;
+ int everyPageSize = model.everyPageSize;
+ string sortName = model.sortName;
+ string keyWhere = model.keyWhere;
+ string workId = model.workId;
+ var dset = new DataSet();
+ try
+ {
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ using (var cmd = new SqlCommand("[prc_wom_wwdd_select]", conn))
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ new("@inCurrentPage", currentPage),
+ new("@inEveryPageSize", everyPageSize),
+ new("@inSortName", sortName),
+ new("@inSortOrder", ""),
+ new("@inQueryWhere", keyWhere),
+ new("@workId", workId),
+ new("@inP1", ""),
+ new("@inP2", "")
+ };
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+ using (var dt = new SqlDataAdapter(cmd))
+ {
+ dt.Fill(dset, "0");
+ }
+ }
+
+ conn.Close();
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(), "prc_wom_wwdd_select error锛�" + ex.Message);
+ return ReturnDto<PageList<dynamic>>.QuickReturn(default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
+ }
+
+ var _pglist = new PageList<dynamic>
+ {
+ total = 0,
+ everyPageSize = 0,
+ pages = 0,
+ list = new List<dynamic>()
+ };
+ if (dset != null && dset.Tables.Count > 0 &&
+ dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
+ {
+ var intTotal = int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
+ var pages = intTotal % everyPageSize != 0 ? intTotal / everyPageSize + 1 : intTotal / everyPageSize;
+ _pglist.total = intTotal;
+ _pglist.everyPageSize = everyPageSize;
+ _pglist.pages = pages;
+ var _dy = dset.Tables[0].TableToDynamicList();
+ _pglist.list = _dy;
+ }
+
+ return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist, ReturnCode.Success, "璇诲彇鎴愬姛");
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁鐢ㄦ埛閫夋嫨鐨勫崟鎹甮uid锛岃鍙栭渶瑕佷綔鍏ュ簱鍒拌揣鍗曠殑鏄庣粏
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<List<dynamic>> SelectScddToView([FromBody] dynamic model)//(JArray guidList)
+ {
+ var intArray = model.lst.ToObject<string[]>();
+ string workId = model.workId;
+ var sbLine = new StringBuilder();
+ foreach (var str in intArray)
+ {
+ if (sbLine.Length > 0)
+ sbLine.Append(",");
+ sbLine.Append(str);
+ }
+ var lst = new List<dynamic>();
+ var dset = new DataSet();
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ if (workId == "1")
+ {
+ using (var cmd = new SqlCommand("[prc_db_scdd_select_to_grid]", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ new("@inP1", sbLine.ToString())
+ };
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+ using (var dt = new SqlDataAdapter(cmd))
+ {
+ dt.Fill(dset, "0");
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(), "prc_db_scdd_select_to_grid error锛�" + ex.Message);
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+ else
+ {
+ using (var cmd = new SqlCommand("[prc_db_wwdd_select_to_grid]", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ new("@inP1", sbLine.ToString())
+ };
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+ using (var dt = new SqlDataAdapter(cmd))
+ {
+ dt.Fill(dset, "0");
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(), "prc_db_wwdd_select_to_grid error锛�" + ex.Message);
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+
+ }
+
+ if (dset != null && dset.Tables.Count > 0 && dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
+ lst = dset.Tables[0].TableToDynamicList();
+ return ReturnDto<List<dynamic>>.QuickReturn(lst, ReturnCode.Success,"璇诲彇鎴愬姛锛�");
+ }
+
+
+
+
}
\ No newline at end of file
diff --git a/WebApi/Gs.Wom/Service/WomLLDJManager.cs b/WebApi/Gs.Wom/Service/WomLLDJManager.cs
index 1a77377..642bbc4 100644
--- a/WebApi/Gs.Wom/Service/WomLLDJManager.cs
+++ b/WebApi/Gs.Wom/Service/WomLLDJManager.cs
@@ -125,8 +125,7 @@
}
if (m != null)
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
- "璇诲彇鎴愬姛锛�");
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,"璇诲彇鎴愬姛锛�");
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
}
diff --git a/WebApi/Gs.Wom/Service/WomdaaManager.cs b/WebApi/Gs.Wom/Service/WomdaaManager.cs
index 392b6de..943aef3 100644
--- a/WebApi/Gs.Wom/Service/WomdaaManager.cs
+++ b/WebApi/Gs.Wom/Service/WomdaaManager.cs
@@ -555,10 +555,7 @@
{
new("@outMsg", SqlDbType.NVarChar, 300),
new("@outSum", SqlDbType.Int),
- new("@inOrderGuid",
- UtilityHelper.CheckGuid(guid)
- ? guid
- : DBNull.Value),
+ new("@inOrderGuid", UtilityHelper.CheckGuid(guid) ? guid : DBNull.Value),
new("@inEdtUserGuid", _userGuid),
new("@inMxGuid", mxGuid)
};
diff --git a/WebApi/Gs.Wom/Service/WompbaManager.cs b/WebApi/Gs.Wom/Service/WompbaManager.cs
index 321194e..1ac1330 100644
--- a/WebApi/Gs.Wom/Service/WompbaManager.cs
+++ b/WebApi/Gs.Wom/Service/WompbaManager.cs
@@ -22,8 +22,7 @@
public WompbaManager(IHttpContextAccessor httpContextAccessor)
{
_http = httpContextAccessor;
- (_userCode, _userGuid, _orgFids) =
- GetUserGuidAndOrgGuid(_http);
+ (_userCode, _userGuid, _orgFids) = GetUserGuidAndOrgGuid(_http);
}
/// <summary>
@@ -65,11 +64,8 @@
if (dset != null && dset.Tables.Count > 0 &&
dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
{
- var intTotal =
- int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
- var pages = intTotal % everyPageSize != 0
- ? intTotal / everyPageSize + 1
- : intTotal / everyPageSize;
+ var intTotal = int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
+ var pages = intTotal % everyPageSize != 0 ? intTotal / everyPageSize + 1 : intTotal / everyPageSize;
_pglist.total = intTotal;
_pglist.everyPageSize = everyPageSize;
_pglist.pages = pages;
@@ -80,12 +76,10 @@
catch (Exception ex)
{
LogHelper.Debug(ToString(), ex.Message);
- return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
- ReturnCode.Exception, ex.Message);
+ return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist, ReturnCode.Exception, ex.Message);
}
- return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
- ReturnCode.Success, "璇诲彇鎴愬姛");
+ return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist, ReturnCode.Success, "璇诲彇鎴愬姛");
}
/// <summary>
@@ -276,11 +270,8 @@
if (dset != null && dset.Tables.Count > 0 &&
dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
{
- var intTotal =
- int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
- var pages = intTotal % everyPageSize != 0
- ? intTotal / everyPageSize + 1
- : intTotal / everyPageSize;
+ var intTotal = int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
+ var pages = intTotal % everyPageSize != 0 ? intTotal / everyPageSize + 1 : intTotal / everyPageSize;
_pglist.total = intTotal;
_pglist.everyPageSize = everyPageSize;
_pglist.pages = pages;
--
Gitblit v1.9.3