代码修改为七喜

cnf

3 天以前 aebd2d642e19ce9ccb253c671b239e7ed9fc91c6

 WebApi/Gs.JJGZ/MesJjgzErrorJsController.cs

@@ -1,14 +1,14 @@
using System.Data;
using System.Data.SqlClient;
using System.Dynamic;
using System.Text;
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 Newtonsoft.Json.Linq;
using System.Data;
using System.Data.SqlClient;
using System.Dynamic;
using System.Text;
using static Gs.Toolbox.UtilityHelper;

namespace Gs.JJGZ;
@@ -19,7 +19,6 @@
    private readonly IHttpContextAccessor _http;

    private readonly string _userCode, _userGuid, _orgFids;

    public MesJjgzErrorJsController(IHttpContextAccessor httpContextAccessor)
    {
        _http = httpContextAccessor;
@@ -83,9 +82,8 @@
        {
            LogHelper.Debug(ToString(), ex.Message);
            return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
                ReturnCode.Exception, ex.Message);
          ReturnCode.Exception, ex.Message);
        }

        return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
            ReturnCode.Success, "读取成功");
    }
@@ -103,20 +101,18 @@
        m.list = new List<dynamic>();
        m.list2 = new List<dynamic>();
        // 假设主表为MES_JJGZ_JS_SALARY，明细表为MES_JJGZ_JS_SALARY_DETAIL
        var mainTable = "MES_JJGZ_ERRORJS";
        string mainTable = "MES_JJGZ_ERRORJS";
        try
        {
            var sqlMain = $"SELECT * FROM {mainTable} WHERE guid='{guid}'";
            string sqlMain = $"SELECT * FROM {mainTable} WHERE guid='{guid}'";
            var dsMain = DbHelperSQL.Query(sqlMain);
            if (dsMain != null && dsMain.Tables.Count > 0 &&
                dsMain.Tables[0].Rows.Count > 0)
            if (dsMain != null && dsMain.Tables.Count > 0 && dsMain.Tables[0].Rows.Count > 0)
            {
                var dr = dsMain.Tables[0].Rows[0];
                m = dr.RowToDynamic();
            }

            var sqlMain1 =
                $"SELECT * FROM MES_JJGZ_ERRORJS_DETAIL WHERE pid='{guid}'";
            string sqlMain1 = $"SELECT * FROM MES_JJGZ_ERRORJS_DETAIL WHERE pid='{guid}'";


            var _tb = DbHelperSQL.Query(sqlMain1);
@@ -127,10 +123,8 @@
        {
            LogHelper.Debug(ToString(), ex.Message);
        }

        if (m != null)
            return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
                "读取成功！");
            return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "读取成功！");
        return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "读取失败！");
    }

@@ -150,9 +144,8 @@
        try
        {
            // 假设提交就是更新某个字段
            var sql =
                $"UPDATE MES_JJGZ_ERRORJS SET check_status='{_inFieldValue}',check_date = getdate(), check_user='{_userGuid}' WHERE guid='{_guid}'";
            var rows = DbHelperSQL.ExecuteSql(sql);
            string sql = $"UPDATE MES_JJGZ_ERRORJS SET check_status='{_inFieldValue}',check_date = getdate(), check_user='{_userGuid}' WHERE guid='{_guid}'";
            int rows = DbHelperSQL.ExecuteSql(sql);
            m.outSum = rows;
            m.outMsg = rows > 0 ? "操作成功！" : "未更新任何数据";
        }
@@ -161,10 +154,8 @@
            LogHelper.Debug(ToString(), "EditModelSubmit error：" + ex.Message);
            m.outMsg = ex.Message;
            m.outSum = -1;
            return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
                ex.Message);
            return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, ex.Message);
        }

        return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "操作成功！");
    }

@@ -179,35 +170,32 @@
        {
            Guid? guid = model.guid; //主键
            string hourlyType = model.hourlyType; //原因
            string errorType = model.errorType; //工单
            string errorTime = model.errorTime; //组织
            string hourlySalary = model.hourlySalary; //组织
            string remark = model.remark; //组织
            string DAA001 = model.DAA001; //组织
            string DAAType = model.DAAType; //组织
            string OrgId = model.OrgId; //组织
            string errorType = model.errorType;//工单
            string errorTime = model.errorTime;//组织
            string hourlySalary = model.hourlySalary;//组织
            string remark = model.remark;//组织
            string DAA001 = model.DAA001;//组织
            string DAAType = model.DAAType;//组织
            string OrgId = model.OrgId;//组织
            var _sb = new StringBuilder();
            var _split = "|";
            foreach (var m in model.list)
            {
                string _guid = m.Guid.ToString();
                var _line = m.ID + _split
                                 + m.Staff_Id + _split
                                 + m.Staff_No + _split
                                 + m.Staff_Name + _split
                                 + m.Hour + _split
                                 + m.Line_No + _split
                                 + m.Line_Name + _split
                                 + m.Salary + _split
                                 + m.Remark + _split
                                 + (CheckGuid(_guid)
                                     ? _guid
                                     : Guid.Empty.ToString());
                                        + m.Staff_Id + _split
                                        + m.Staff_No + _split
                                        + m.Staff_Name + _split
                                        + m.Hour + _split
                                        + m.Line_No + _split
                                        + m.Line_Name + _split
                                        + m.Salary + _split
                                        + m.Remark + _split
                                        + (CheckGuid(_guid) ? _guid : Guid.Empty.ToString());
                if (_sb.Length > 0)
                    _sb.Append("~");
                _sb.Append(_line);
            }

            dynamic mObj = new ExpandoObject();
            mObj.outMsg = "";
            mObj.outSum = -1;
@@ -223,23 +211,22 @@
                        cmd.CommandType = CommandType.StoredProcedure;
                        SqlParameter[] parameters =
                        {
                            new("@outMsg", SqlDbType.NVarChar, 300),
                            new("@outSum", SqlDbType.Int),
                            new("@outGuid", SqlDbType.UniqueIdentifier),
                            new("@outNo", SqlDbType.NVarChar, 300),
                            new("@inOrderGuid",
                                CheckGuid(guid) ? guid : DBNull.Value),
                            new("@inErrorTime", errorTime),
                            new("@inErrorType", errorType),
                            new("@inHourlyType", hourlyType),
                            new("@inHourlySalary", hourlySalary),
                            new("@inRemark", remark),
                            new("@inDAA001", DAA001),
                            new("@inDAAType", DAAType),
                            new("@inOrgId", OrgId),
                            new("@inEdtUserGuid", _userGuid),
                            new("@inLineList", _sb.ToString())
                        };
                        new("@outMsg", SqlDbType.NVarChar, 300),
                        new("@outSum", SqlDbType.Int),
                        new("@outGuid", SqlDbType.UniqueIdentifier),
                        new("@outNo", SqlDbType.NVarChar, 300),
                        new("@inOrderGuid", CheckGuid(guid) ? guid : DBNull.Value),
                        new("@inErrorTime",errorTime),
                        new("@inErrorType",errorType),
                        new("@inHourlyType",hourlyType),
                        new("@inHourlySalary",hourlySalary),
                        new("@inRemark",remark),
                        new("@inDAA001",DAA001),
                        new("@inDAAType",DAAType),
                        new("@inOrgId",OrgId),
                        new("@inEdtUserGuid", _userGuid),
                        new("@inLineList", _sb.ToString())
                    };
                        parameters[0].Direction = ParameterDirection.Output;
                        parameters[1].Direction = ParameterDirection.Output;
                        parameters[2].Direction = ParameterDirection.Output;
@@ -265,12 +252,9 @@
                    }
                }
            }

            if (mObj.outSum <= 0)
                return ReturnDto<dynamic>.QuickReturn(mObj,
                    ReturnCode.Exception, mObj.outMsg);
            return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Success,
                mObj.outMsg);
                return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Exception, mObj.outMsg);
            return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Success, mObj.outMsg);
        }
    }

@@ -291,8 +275,7 @@
        {
            if (CheckGuid(guid))
            {
                var sql =
                    $"DELETE FROM MES_JJGZ_ERRORJS WHERE guid='{guid}' DELETE FROM MES_JJGZ_ERRORJS_DETAIL WHERE pid='{guid}'";
                string sql = $"DELETE FROM MES_JJGZ_ERRORJS WHERE guid='{guid}' DELETE FROM MES_JJGZ_ERRORJS_DETAIL WHERE pid='{guid}'";
                _outSum = DbHelperSQL.ExecuteSql(sql);
                _outMsg = _outSum > 0 ? "删除成功！" : "未删除任何数据";
            }
@@ -308,10 +291,8 @@
            _outMsg = ex.Message;
            _outSum = -1;
        }

        if (_outSum <= 0)
            return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
                _outMsg);
            return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception, _outMsg);
        return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success, _outMsg);
    }

@@ -324,14 +305,12 @@
    public ReturnDto<ExpandoObject> GetTimeType([FromBody] dynamic model)
    {
        dynamic m = new ExpandoObject();
        var mainTable = "MES_JJGZ_TIMETYPE";
        string mainTable = "MES_JJGZ_TIMETYPE";
        try
        {
            var sqlMain =
                "SELECT HourlyType 计时类型,HourlySalary 计时单价 FROM MES_JJGZ_JSSALARY WHERE CHECK_STATUS = 1";
            string sqlMain = $"SELECT HourlyType 计时类型,HourlySalary 计时单价 FROM MES_JJGZ_JSSALARY WHERE CHECK_STATUS = 1";
            var dsMain = DbHelperSQL.Query(sqlMain);
            if (dsMain != null && dsMain.Tables.Count > 0 &&
                dsMain.Tables[0].Rows.Count > 0)
            if (dsMain != null && dsMain.Tables.Count > 0 && dsMain.Tables[0].Rows.Count > 0)
            {
                var _tb = dsMain.Tables[0].TableToDynamicList();
                m.list = _tb;
@@ -341,10 +320,8 @@
        {
            LogHelper.Debug(ToString(), ex.Message);
        }

        if (m != null)
            return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
                "读取成功！");
            return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "读取成功！");
        return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "读取失败！");
    }

@@ -359,11 +336,9 @@
        dynamic m = new ExpandoObject();
        try
        {
            var sqlMain =
                "select daa001 工单号,daa002 产品编码,daa003 产品名称,daa004 产品规格,daa025 工单类型 from WOMDAA";
            string sqlMain = $"select daa001 工单号,daa002 产品编码,daa003 产品名称,daa004 产品规格,daa025 工单类型 from WOMDAA";
            var dsMain = DbHelperSQL.Query(sqlMain);
            if (dsMain != null && dsMain.Tables.Count > 0 &&
                dsMain.Tables[0].Rows.Count > 0)
            if (dsMain != null && dsMain.Tables.Count > 0 && dsMain.Tables[0].Rows.Count > 0)
            {
                var _tb = dsMain.Tables[0].TableToDynamicList();
                m.list = _tb;
@@ -373,10 +348,8 @@
        {
            LogHelper.Debug(ToString(), ex.Message);
        }

        if (m != null)
            return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
                "读取成功！");
            return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "读取成功！");
        return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "读取失败！");
    }

@@ -391,10 +364,9 @@
        dynamic m = new ExpandoObject();
        try
        {
            var sqlMain = "select line_no 产线,name 产线名称 from MES_WORKSHOP_LINE";
            string sqlMain = $"select line_no 产线,name 产线名称 from MES_WORKSHOP_LINE";
            var dsMain = DbHelperSQL.Query(sqlMain);
            if (dsMain != null && dsMain.Tables.Count > 0 &&
                dsMain.Tables[0].Rows.Count > 0)
            if (dsMain != null && dsMain.Tables.Count > 0 && dsMain.Tables[0].Rows.Count > 0)
            {
                var _tb = dsMain.Tables[0].TableToDynamicList();
                m.list = _tb;
@@ -404,10 +376,8 @@
        {
            LogHelper.Debug(ToString(), ex.Message);
        }

        if (m != null)
            return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
                "读取成功！");
            return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "读取成功！");
        return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "读取失败！");
    }

@@ -430,12 +400,9 @@
                    sbLine.Append(",");
                sbLine.Append(str);
            }

            var sqlMain =
                $"select a.id as Staff_Id,Staff_No ,Staff_Name,0 Hour ,d.Line_No Line_No , d.Line_Name Line_Name,0 Salary,''Remark,'' Id from MES_STAFF a left join OA_User b on a.staff_no = b.jobnumber left join Mes_DepartmentToLine d on d.DepartmentId = b.department where a.id in (select line from dbo.fn_split('{sbLine}',','))";
            string sqlMain = $"select a.id as Staff_Id,Staff_No ,Staff_Name,0 Hour ,d.Line_No Line_No , d.Line_Name Line_Name,0 Salary,''Remark,'' Id from MES_STAFF a left join OA_User b on a.staff_no = b.jobnumber left join Mes_DepartmentToLine d on d.DepartmentId = b.department where a.id in (select line from dbo.fn_split('{sbLine.ToString()}',','))";
            var dsMain = DbHelperSQL.Query(sqlMain);
            if (dsMain != null && dsMain.Tables.Count > 0 &&
                dsMain.Tables[0].Rows.Count > 0)
            if (dsMain != null && dsMain.Tables.Count > 0 && dsMain.Tables[0].Rows.Count > 0)
            {
                var _tb = dsMain.Tables[0].TableToDynamicList();
                m.list = _tb;
@@ -445,10 +412,8 @@
        {
            LogHelper.Debug(ToString(), ex.Message);
        }

        if (m != null)
            return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
                "读取成功！");
            return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "读取成功！");
        return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "读取失败！");
    }

@@ -470,8 +435,7 @@
        {
            using (var conn = new SqlConnection(DbHelperSQL.strConn))
            {
                using (var cmd =
                       new SqlCommand("[prc_item_staff_select]", conn))
                using (var cmd = new SqlCommand("[prc_item_staff_select]", conn))
                {
                    conn.Open();
                    cmd.CommandType = CommandType.StoredProcedure;
@@ -487,7 +451,7 @@
                        new("@inP2", "")
                    };
                    foreach (var parameter in parameters)
                        cmd.Parameters.Add(parameter);
                        cmd.Parameters.Add(parameter); 
                    using (var dt = new SqlDataAdapter(cmd))
                    {
                        dt.Fill(dset, "0");
@@ -499,8 +463,7 @@
        }
        catch (Exception ex)
        {
            LogHelper.Debug(ToString(),
                "prc_item_staff_select error：" + ex.Message);
            LogHelper.Debug(ToString(), "prc_item_staff_select error：" + ex.Message);
            return ReturnDto<PageList<dynamic>>.QuickReturn(
                default(PageList<dynamic>), ReturnCode.Exception, "读取失败");
        }