Merge branch 'master' of http://git.gs-mes.com:8080/r/~cnf/JH/JH_MesService

kyy

2025-10-23 f28d34bfcec8003187dcab5e5b4475761a6c00a2

Merge branch 'master' of http://git.gs-mes.com:8080/r/~cnf/JH/JH_MesService

 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",

 WebApi/Gs.Sys/Services/FmController.cs

@@ -1,15 +1,16 @@
using System.Collections;
using System.Data;
using System.Data.SqlClient;
using System.Dynamic;
using Gs.Toolbox;
using 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>();

 WebApi/Gs.Toolbox/InterfaceUtil.cs

@@ -1,8 +1,9 @@
using System.Net.Cache;
using System.Net;
using System.Text;
using Newtonsoft.Json;
using 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 + "，response:" + 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; }
}

 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();

 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>
    ///     根据用户选择的单据guid，读取需要作入库到货单的明细
    /// </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,"读取成功！");
    }




}

 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, "读取失败！");
        }


 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)
                    };

 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;