kyy
2025-09-12 53a1aadcc28a9a26783f99b21d012e9b0a217081
1、ipqc、Fqc
已修改2个文件
已添加1个文件
589 ■■■■■ 文件已修改
WebApi/GS.QC/Service/FqcExceptionalManager.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebApi/GS.QC/Service/FqcItemsManager.cs 474 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebApi/GS.QC/Service/FqcManager.cs 114 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebApi/GS.QC/Service/FqcExceptionalManager.cs
@@ -79,7 +79,6 @@
            {
                LogHelper.Debug(ToString(), ex.Message);
            }
            return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
                ReturnCode.Success, "读取成功");
        }
WebApi/GS.QC/Service/FqcItemsManager.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,474 @@
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.Security.Cryptography.X509Certificates;
using System.Text;
using static Gs.Toolbox.UtilityHelper;
namespace GS.QC.Service
{
    [ApiGroup(ApiGroupNames.QC)]
    public class FqcItemsManager : IRomteService
    {
        private readonly IHttpContextAccessor _http;
        private readonly string _userCode, _userGuid, _orgFids;
        public FqcItemsManager(IHttpContextAccessor httpContextAccessor)
        {
            _http = httpContextAccessor;
            (_userCode, _userGuid, _orgFids) =
                GetUserGuidAndOrgGuid(_http);
        }
        /// <summary>
        ///     è¯»å–列表,支持分页
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [RequestMethod(RequestMethods.POST)]
        public ReturnDto<PageList<dynamic>> GetListPage([FromBody] dynamic model)
        {
            int currentPage = model.currentPage;
            int everyPageSize = model.everyPageSize;
            string sortName = model.sortName;
            string keyWhere = model.keyWhere;
            SqlParameter[] parameters =
            {
                new("@inCurrentPage", currentPage),
                new("@inEveryPageSize", everyPageSize),
                new("@inSortName", sortName),
                new("@inSortOrder", ""),
                new("@inQueryWhere", keyWhere),
                new("@inFid", ""),
                new("@inP1", ""),
                new("@inP2", ""),
                new("@inP3", ""),
                new("@inP4", "")
            };
            var dset = new DataSet();
            var _pglist = new PageList<dynamic>
            {
                total = 0,
                everyPageSize = 0,
                pages = 0,
                list = new List<dynamic>()
            };
            try
            {
                dset = DbHelperSQL.RunProcedure("prc_fqc_items_lst", parameters, "0");
                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;
                }
            }
            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.Success, "读取成功");
        }
        /// <summary>
        ///     è¯»å–单个实体
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [RequestMethod(RequestMethods.POST)]
        public ReturnDto<ExpandoObject> GetModel([FromBody] dynamic model)
        {
            string guid = model.guid.ToString();
            dynamic m = new ExpandoObject();
            m.list = new List<dynamic>();
            m.list2 = new List<dynamic>();
            try
            {
                // æŸ¥è¯¢ä¸»è¡¨æ•°æ®
                string sqlMain = $"SELECT A.*,B.Name as OrgName FROM MES_FQC_ITEMS A LEFT JOIN SYS_ORGANIZATION b ON A.OrgId = b.FID  WHERE a.GUID='{guid}'";
                var dsMain = DbHelperSQL.Query(sqlMain);
                if (dsMain != null && dsMain.Tables.Count > 0 && dsMain.Tables[0].Rows.Count > 0)
                {
                    var dr = dsMain.Tables[0].Rows[0];
                    m = dr.RowToDynamic();
                }
                // æŸ¥è¯¢å­è¡¨1数据
                string sqlDetail1 = $"SELECT * FROM MES_FQC_ITEM_DETAIL1 WHERE PID='{guid}' ORDER BY Seq";
                var dsDetail1 = DbHelperSQL.Query(sqlDetail1);
                if (dsDetail1 != null && dsDetail1.Tables.Count > 0)
                {
                    var _tb = dsDetail1.Tables[0].TableToDynamicList();
                    m.list = _tb;
                }
                // æŸ¥è¯¢å­è¡¨2数据
                string sqlDetail2 = $"SELECT * FROM MES_FQC_ITEM_DETAIL2 WHERE PID='{guid}' ORDER BY Seq";
                var dsDetail2 = DbHelperSQL.Query(sqlDetail2);
                if (dsDetail2 != null && dsDetail2.Tables.Count > 0)
                {
                    var _tb2 = dsDetail2.Tables[0].TableToDynamicList();
                    m.list2 = _tb2;
                }
            }
            catch (Exception ex)
            {
                LogHelper.Debug(ToString(), ex.Message);
            }
            if (m != null)
                return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "读取成功!");
            return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "读取失败!");
        }
        /// <summary>
        ///     å¢žåŠ æˆ–ç¼–è¾‘å®žä½“
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [RequestMethod(RequestMethods.POST)]
        public ReturnDto<ExpandoObject> EditModel([FromBody] dynamic model)
        {
            Guid? guid = model.guid; //主键
            string fqcNo = model.fqcNo; // æ£€éªŒå•号
            string workShop = model.workShop; // ç”Ÿäº§è½¦é—´
            string itemName = model.itemName; // äº§å“åç§°
            string itemModel = model.itemModel; // è§„格型号
            string brand = model.brand; // å•†æ ‡
            // å¤„理生产日期,允许为空
            DateTime? productionDate = null;
            if (model.productionDate != null && !string.IsNullOrEmpty(model.productionDate.ToString()))
            {
                if (DateTime.TryParse(model.productionDate.ToString(), out DateTime parsedDate))
                {
                    productionDate = parsedDate;
                }
            }
            string acRe_A = model.acRe_A; // AC/Re Aç±»
            string acRe_B = model.acRe_B; // AC/Re Bç±»
            string acRe_C = model.acRe_C; // AC/Re Cç±»
            string sampleMethod = model.sampleMethod; // æŠ½æ ·
            string sampleSize1 = model.sampleSize1; // åŒ€é€ŸæŠ½æ ·é€Ÿ
            string sampleSize2 = model.sampleSize2; // éšæœºæŠ½æ ·æ•°
            string sampleSize3 = model.sampleSize3; // æ ·æœ¬æ•°
            string temperature = model.temperature; // å®¤æ¸©
            string voltage = model.voltage; // ç”µåŽ‹
            string classes = model.classes; // ç­æ¬¡
            string lineNo = model.lineNo; // çº¿å·
            string batch = model.batch; // æ‰¹é‡
            string checkResult = model.checkResult; // æ£€éªŒç»“æžœ
            string processResults = model.processResults; // å¤„理结果
            // æ·»åŠ æ£€éªŒäººã€å®¡æ ¸äººã€å®¡æ‰¹äººåŠå¯¹åº”çš„æ—¥æœŸ
            string jyUser = model.jyUser; // æ£€éªŒäºº
            string checkUser = model.checkUser; // å®¡æ ¸äºº
            string spUser = model.spUser; // å®¡æ‰¹äºº
            // å¤„理检验日期,允许为空
            DateTime? jyDate = null;
            if (model.jyDate != null && !string.IsNullOrEmpty(model.jyDate.ToString()))
            {
                if (DateTime.TryParse(model.jyDate.ToString(), out DateTime parsedJyDate))
                {
                    jyDate = parsedJyDate;
                }
            }
            // å¤„理审核日期,允许为空
            DateTime? checkDate = null;
            if (model.checkDate != null && !string.IsNullOrEmpty(model.checkDate.ToString()))
            {
                if (DateTime.TryParse(model.checkDate.ToString(), out DateTime parsedCheckDate))
                {
                    checkDate = parsedCheckDate;
                }
            }
            // å¤„理审批日期,允许为空
            DateTime? spDate = null;
            if (model.spDate != null && !string.IsNullOrEmpty(model.spDate.ToString()))
            {
                if (DateTime.TryParse(model.spDate.ToString(), out DateTime parsedSpDate))
                {
                    spDate = parsedSpDate;
                }
            }
            // æž„建子表1数据字符串
            var _sb1 = new StringBuilder();
            var _split = "|";
            foreach (var m in model.list1)
            {
                string _guid = m.Guid.ToString();
                var _line = m.RPB001 + _split
                                + m.RPB003 + _split
                                + m.RPB004 + _split
                                + m.RPB005 + _split
                                + m.RPB006 + _split
                                + m.RPB007 + _split
                                + m.RPB008 + _split
                                + m.RPB009 + _split
                                + m.RPB010 + _split
                                + m.RPB011 + _split
                                + m.RPB012 + _split
                                + m.RPB013 + _split
                                + m.RPB014 + _split
                                + m.RPB015 + _split
                                + m.RPB016 + _split
                                + m.RPB017 + _split
                                + m.RPB018 + _split
                                + m.RPB019 + _split
                                + m.Remark + _split
                                + (CheckGuid(_guid) ? _guid : Guid.Empty.ToString());
                if (_sb1.Length > 0)
                    _sb1.Append("~");
                _sb1.Append(_line);
            }
            // æž„建子表2数据字符串
            var _sb2 = new StringBuilder();
            foreach (var m in model.list2)
            {
                string _guid = m.Guid.ToString();
                var _line = m.Seq + _split
                                + m.Description + _split
                                + m.AClass + _split
                                + m.BClass + _split
                                + m.CClass + _split
                                + m.Point + _split
                                + m.Remark + _split
                                + (CheckGuid(_guid) ? _guid : Guid.Empty.ToString());
                if (_sb2.Length > 0)
                    _sb2.Append("~");
                _sb2.Append(_line);
            }
            dynamic mObj = new ExpandoObject();
            mObj.outMsg = "";
            mObj.outSum = -1;
            mObj.outGuid = "";
            mObj.outNo = "";
            using (var conn = new SqlConnection(DbHelperSQL.strConn))
            {
                using (var cmd = new SqlCommand("[prc_fqc_items_edt]", conn))
                {
                    try
                    {
                        conn.Open();
                        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("@inFQCNo", fqcNo),
                            new("@inWorkShop", workShop),
                            new("@inItemName", itemName),
                            new("@inItemModel", itemModel),
                            new("@inBrand", brand),
                            new("@inProductionDate", productionDate.HasValue ? (object)productionDate.Value : DBNull.Value),
                            new("@inAcRe_A", acRe_A),
                            new("@inAcRe_B", acRe_B),
                            new("@inAcRe_C", acRe_C),
                            new("@inSampleMethod", sampleMethod),
                            new("@inSampleSize1", sampleSize1),
                            new("@inSampleSize2", sampleSize2),
                            new("@inSampleSize3", sampleSize3),
                            new("@inTemperature", temperature),
                            new("@inVoltage", voltage),
                            new("@inClasses", classes),
                            new("@inLineNo", lineNo),
                            new("@inBatch", batch),
                            new("@inCheckResult", checkResult),
                            new("@inProcessResults", processResults),
                            // æ·»åŠ æ£€éªŒäººã€å®¡æ ¸äººã€å®¡æ‰¹äººåŠå¯¹åº”çš„æ—¥æœŸå‚æ•°
                            new("@inJyUser", jyUser),
                            new("@inCheckUser", checkUser),
                            new("@inSpUser", spUser),
                            new("@inJyDate", jyDate.HasValue ? (object)jyDate.Value : DBNull.Value),
                            new("@inCheckDate", checkDate.HasValue ? (object)checkDate.Value : DBNull.Value),
                            new("@inSpDate", spDate.HasValue ? (object)spDate.Value : DBNull.Value),
                            new("@inEdtUserGuid", _userGuid),
                            new("@inDetail1List", _sb1.ToString()),
                            new("@inDetail2List", _sb2.ToString())
                        };
                        parameters[0].Direction = ParameterDirection.Output;
                        parameters[1].Direction = ParameterDirection.Output;
                        parameters[2].Direction = ParameterDirection.Output;
                        parameters[3].Direction = ParameterDirection.Output;
                        foreach (var parameter in parameters)
                            cmd.Parameters.Add(parameter);
                        cmd.ExecuteNonQuery();
                        mObj.outMsg = parameters[0].Value.ToString();
                        mObj.outSum = int.Parse(parameters[1].Value.ToString());
                        mObj.outGuid = parameters[2].Value.ToString();
                        mObj.outNo = parameters[3].Value.ToString();
                    }
                    catch (Exception ex)
                    {
                        LogHelper.Debug(ToString(),
                            "prc_fqc_items_edt error:" + ex.Message);
                        mObj.outMsg = ex.Message;
                        mObj.outSum = -1;
                    }
                    finally
                    {
                        conn.Close();
                    }
                }
            }
            if (mObj.outSum <= 0)
                return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Exception, mObj.outMsg);
            return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Success, mObj.outMsg);
        }
        /// <summary>
        ///     åˆ é™¤ä¸»è¡¨åŠæ˜Žç»†
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [RequestMethod(RequestMethods.POST)]
        public ReturnDto<int?> DeleteModel([FromBody] dynamic model)
        {
            int? rtnInt = (int)ReturnCode.Default;
            Guid? guid = model.guid;
            var _outMsg = "";
            var _outSum = -1;
            try
            {
                if (CheckGuid(guid))
                {
                    string sql = $@"
                        DELETE FROM MES_FQC_ITEM_DETAIL1 WHERE PID='{guid}';
                        DELETE FROM MES_FQC_ITEM_DETAIL2 WHERE PID='{guid}';
                        DELETE FROM MES_FQC_ITEMS WHERE GUID='{guid}';";
                    _outSum = DbHelperSQL.ExecuteSql(sql);
                    _outMsg = _outSum > 0 ? "删除成功!" : "未删除任何数据";
                }
                else
                {
                    _outMsg = "主键不能为空!";
                    _outSum = -1;
                }
            }
            catch (Exception ex)
            {
                LogHelper.Debug(ToString(), "DeleteModel error:" + ex.Message);
                _outMsg = ex.Message;
                _outSum = -1;
            }
            if (_outSum <= 0)
                return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception, _outMsg);
            return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success, _outMsg);
        }
        /// <summary>
        /// æˆå“æ£€éªŒæŠ¥è¡¨
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [RequestMethod(RequestMethods.POST)]
        public ReturnDto<PageList<dynamic>> GetCPMX([FromBody] dynamic model)
        {
            int currentPage = model.currentPage;
            int everyPageSize = model.everyPageSize;
            string sortName = model.sortName;
            string keyWhere = model.keyWhere;
            SqlParameter[] parameters =
            {
            new("@inCurrentPage", currentPage),
            new("@inEveryPageSize", everyPageSize),
            new("@inSortName", sortName),
            new("@inSortOrder", ""),
            new("@inQueryWhere", keyWhere),
        };
            var dset = new DataSet();
            var _pglist = new PageList<dynamic>
            {
                total = 0,
                everyPageSize = 0,
                pages = 0,
                list = new List<dynamic>()
            };
            try
            {
                dset = DbHelperSQL.RunProcedure("report_cprkjd", parameters, "0");
                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;
                }
            }
            catch (Exception ex)
            {
                LogHelper.Debug(ToString(), ex.Message);
            }
            return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
                ReturnCode.Success, "读取成功");
        }
        [RequestMethod(RequestMethods.POST)]
        public ReturnDto<ExpandoObject> GetCPMXDetail([FromBody] dynamic model)
        {
            dynamic m = new ExpandoObject();
            m.list = new List<dynamic>();
            string daa001 = model.daa001;
            SqlParameter[] parameters =
            {
                new("@daa001", daa001)
            };
            try
            {
                var dsMain = DbHelperSQL.RunProcedure("report_cprkjdDetail", parameters, "0");
                if (dsMain != null && dsMain.Tables.Count > 0 && dsMain.Tables[0].Rows.Count > 0)
                {
                    m.list = dsMain.Tables[0].TableToDynamicList();
                }
            }
            catch (Exception ex)
            {
                LogHelper.Debug(ToString(), ex.Message);
            }
            if (m != null)
                return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "读取成功!");
            return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "读取失败!");
        }
    }
}
WebApi/GS.QC/Service/FqcManager.cs
@@ -506,59 +506,7 @@
                ReturnCode.Success, "读取成功");
        }
        /// <summary>
        /// è´¨é‡ï¼Œå®¡æ ¸ï¼Œåå®¡æ ¸ï¼Œé©³å›ž
        /// </summary>
        /// <param name="mode"></param>
        /// <returns></returns>
        [RequestMethod(RequestMethods.POST)]
        public ReturnDto<ExpandoObject> EditModelSubmitZhiLiang([FromBody] dynamic mode)
        {
            string _guid = mode.guid;
            string _inFieldValue = mode.inFieldValue;
            dynamic m = new ExpandoObject();
            m.outSum = -1;
            m.outMsg = "";
            using (var conn = new SqlConnection(DbHelperSQL.strConn))
            {
                using (var cmd = new SqlCommand("fqc_zhiLiang", conn))
                {
                    try
                    {
                        conn.Open();
                        cmd.CommandType = CommandType.StoredProcedure;
                        SqlParameter[] parameters =
                        {
                                new("@outMsg", SqlDbType.NVarChar, 300),
                                new("@outSum", SqlDbType.Int),
                                new("@inEdtUserGuid", _userGuid),
                                new("@inOrderGuid", _guid),
                                new("@inFieldValue",_inFieldValue),
                                new("@in1", ""),
                                new("@in2", "")
                            };
                        parameters[0].Direction = ParameterDirection.Output;
                        parameters[1].Direction = ParameterDirection.Output;
                        foreach (var parameter in parameters)
                            cmd.Parameters.Add(parameter);
                        cmd.ExecuteNonQuery();
                        m.outMsg = parameters[0].Value.ToString();
                        m.outSum = int.Parse(parameters[1].Value.ToString());
                    }
                    catch (Exception ex)
                    {
                        LogHelper.Debug(this.ToString(), "fqc_zhiLiang error:" + ex.Message);
                        return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, ex.Message);
                    }
                    finally
                    {
                        conn.Close();
                    }
                }
            }
            return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "操作成功!");
        }
        /// <summary>
        ///     è¯»å–
@@ -661,7 +609,62 @@
            return GetModel14(dy);
        }
        /// <summary>
        ///     ç”ŸæˆæŠ¥å‘Š
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [RequestMethod(RequestMethods.POST)]
        public ReturnDto<int?> GetBaoGao([FromBody] dynamic model)
        {
            int? rtnInt = (int)ReturnCode.Default;
            Guid? guid = model.guid;
            var _outMsg = "";
            var _outSum = -1;
            using (var conn = new SqlConnection(DbHelperSQL.strConn))
            {
                using (var cmd = new SqlCommand("[prc_fqc_items_add]", conn))
                {
                    try
                    {
                        conn.Open();
                        cmd.CommandType = CommandType.StoredProcedure;
                        SqlParameter[] parameters =
                        {
                        new("@outMsg", SqlDbType.NVarChar, 300),
                        new("@outSum", SqlDbType.Int),
                        new("@inOrderGuid",
                            UtilityHelper.CheckGuid(guid)
                                ? guid
                                : DBNull.Value),
                        new("@inEdtUserGuid", _userGuid),
                    };
                        parameters[0].Direction = ParameterDirection.Output;
                        parameters[1].Direction = ParameterDirection.Output;
                        foreach (var parameter in parameters)
                            cmd.Parameters.Add(parameter);
                        cmd.ExecuteNonQuery();
                        _outMsg = parameters[0].Value.ToString();
                        _outSum = int.Parse(parameters[1].Value.ToString());
                    }
                    catch (Exception ex)
                    {
                        LogHelper.Debug(ToString(),
                            "prc_QT_del error:" + ex.Message);
                        _outMsg = ex.Message;
                        _outSum = -1;
                    }
                    finally
                    {
                        conn.Close();
                    }
                }
            }
            if (_outSum <= 0)
                return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
                    _outMsg);
            return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success, _outMsg);
        }
        #region æäº¤æ£€éªŒ
        /// <summary>
@@ -673,6 +676,7 @@
        public ReturnDto<ExpandoObject> EditModelSubmit([FromBody] dynamic mode)
        {
            string _guid = mode.guid;
            string _inFieldValue = mode.inFieldValue;
            dynamic m = new ExpandoObject();
            m.outSum = -1;
            m.outMsg = "";
@@ -690,7 +694,7 @@
                                new("@outSum", SqlDbType.Int),
                                new("@inEdtUserGuid", _userGuid),
                                new("@inOrderGuid", _guid),
                                new("@inFieldValue", 1),
                                new("@inFieldValue", _inFieldValue),
                                new("@in1", ""),
                                new("@in2", "")
                            };