WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/CodeChunks.db-wal

Binary files differ

 WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db

Binary files differ

 WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db-wal

Binary files differ

 WebApi/GS.QC/Service/IpqcShouManager.cs

@@ -132,42 +132,101 @@
            return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "读取失败！");
        }

        /*        /// <summary>
                ///     读取
                /// </summary>
                /// <param name="guid"></param>
                /// <returns></returns>
                [RequestMethod(RequestMethods.POST)]
                public ReturnDto<ExpandoObject> GetModel12([FromBody] dynamic model)
                {
                    Guid guid = model.guid;
                    string parentGuid = model.parentGuid;
                    dynamic m = new ExpandoObject();
                    m.list = new List<dynamic>();
                    m.list2 = new List<dynamic>();
                    StringBuilder sb = new StringBuilder();
                    sb.Append("select * from  MES_QA_ITEMS_DETECT_DETAIL12 where parent_guid='" + guid + "' order by fstand asc");
                    sb.Append("   select d13.*,d5.fcheck_item as  fcheckItemd5,d5.ybsl from  MES_QA_ITEMS_DETECT_DETAIL13 d13 left join[dbo].[MES_QA_ITEMS_DETECT_DETAIL5] d5 on d13.parent_guid = d5.guid");
                    sb.Append("  where d13.parent_guid = '" + guid + "'");
                    sb.Append(" order by d13.fcheck_item asc");
                    try
                    {
                        DataSet dset = new DataSet();
                        dset = DbHelperSQL.Query(sb.ToString());
                        var _tb = dset.Tables[0].TableToDynamicList();
                        m.list = _tb;
                        var _tb2 = dset.Tables[1].TableToDynamicList();
                        m.list2 = _tb2;
                    }
                    catch (Exception ex)
                    {
                        LogHelper.Debug(ToString(), "GetModel12 error：" + ex.Message);
                    }
                    if (m != null)
                        return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
                            "读取成功！");
                    return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
                        "读取失败！");
                }
        */

        /// <summary>
        ///     读取
        /// 录入检验结果
        /// </summary>
        /// <param name="guid"></param>
        /// <param name="model"></param>
        /// <returns></returns>
        [RequestMethod(RequestMethods.POST)]
        public ReturnDto<ExpandoObject> GetModel12([FromBody] dynamic model)
        public ReturnDto<int?> EdtModel12([FromBody] dynamic model)
        {
            Guid guid = model.guid;
            string parentGuid = model.parentGuid;
            dynamic m = new ExpandoObject();
            m.list = new List<dynamic>();
            m.list2 = new List<dynamic>();
            StringBuilder sb = new StringBuilder();
            sb.Append("select * from  MES_QA_ITEMS_DETECT_DETAIL12 where parent_guid='" + guid + "' order by fstand asc");
            sb.Append("   select d13.*,d5.fcheck_item as  fcheckItemd5,d5.ybsl from  MES_QA_ITEMS_DETECT_DETAIL13 d13 left join[dbo].[MES_QA_ITEMS_DETECT_DETAIL5] d5 on d13.parent_guid = d5.guid");
            sb.Append("  where d13.parent_guid = '" + guid + "'");
            sb.Append(" order by d13.fcheck_item asc");
            try
            string inOrderGuid1 = model.inOrderGuid1; //这是检验单guid
            string inOrderGuid5 = model.inOrderGuid5; //这是抽样的guid
            string inP1 = model.inP1; //这是9，有可能是19，或者0k-19,或者ng-19
            var _outMsg = "";
            int? _outSum = -1;
            using (var conn = new SqlConnection(DbHelperSQL.strConn))
            {
                DataSet dset = new DataSet();
                dset = DbHelperSQL.Query(sb.ToString());
                var _tb = dset.Tables[0].TableToDynamicList();
                m.list = _tb;
                var _tb2 = dset.Tables[1].TableToDynamicList();
                m.list2 = _tb2;
                using (var cmd = new SqlCommand("[ipqc_detect01_panding]", conn))
                {
                    try
                    {
                        conn.Open();
                        cmd.CommandType = CommandType.StoredProcedure;
                        SqlParameter[] parameters =
                        {
                        new("@outMsg", SqlDbType.NVarChar, 300),
                        new("@outSum", SqlDbType.Int),
                        new("@inEdtUserGuid", _userGuid),
                        new("@inOrderGuid1", inOrderGuid1),
                        new("@inOrderGuid5", inOrderGuid5),
                        new("@inP1", inP1),
                    };
                        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_iqc_panding error：" + ex.Message);
                        _outMsg = ex.Message;
                        _outSum = -1;
                    }
                    finally
                    {
                        conn.Close();
                    }
                }
            }
            catch (Exception ex)
            {
                LogHelper.Debug(ToString(), "GetModel12 error：" + ex.Message);
            }
            if (m != null)
                return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
                    "读取成功！");
            return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
                "读取失败！");
            if (_outSum <= 0)
                return ReturnDto<string>.QuickReturn(_outSum,
                    ReturnCode.Exception, _outMsg);
            return ReturnDto<string>.QuickReturn(_outSum,
                ReturnCode.Success, _outMsg);
        }

        /// <summary>

 WebApi/GS.QC/Service/IpqcXunManager.cs

@@ -145,9 +145,9 @@
            m.list2 = new List<dynamic>();
            StringBuilder sb = new StringBuilder();
            sb.Append("select * from  MES_QA_ITEMS_DETECT_DETAIL12 where parent_guid='" + guid + "' order by fstand asc");
            sb.Append("   select d13.*,d5.fcheck_item as  fcheckItemd5,d5.ybsl from  MES_QA_ITEMS_DETECT_DETAIL13 d13 left join[dbo].[MES_QA_ITEMS_DETECT_DETAIL5] d5 on d13.parent_guid = d5.guid");
            sb.Append("  where d13.parent_guid = '" + guid + "'");
            sb.Append(" order by d13.fcheck_item asc");
            sb.Append("select d13.*,d5.fcheck_item as fcheckItemd5,d5.ybsl from  MES_QA_ITEMS_DETECT_DETAIL13 d13 left join[dbo].[MES_QA_ITEMS_DETECT_DETAIL5] d5 on d13.parent_guid = d5.guid");
            sb.Append("where d13.parent_guid = '" + guid + "'");
            sb.Append("order by d13.fcheck_item asc");
            try
            {
                DataSet dset = new DataSet();

 WebApi/Gs.Warehouse/Services/MesInvItemBarcodesManager.cs

@@ -9,7 +9,11 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using System.Data;
using System.Data.SqlClient;
using System.Dynamic;
using System.Text;
using static Microsoft.EntityFrameworkCore.DbLoggerCategory;

namespace Gs.Warehouse.Services;

@@ -34,24 +38,78 @@
    /// <param name="query"></param>
    /// <returns></returns>
    [RequestMethod(RequestMethods.POST)]
    public ReturnDto<PageList<MesItems>> GetListPage(PageQuery query)
    public ReturnDto<PageList<dynamic>> GetListPage(PageQuery query)
    {
        var _sbWhere = new StringBuilder(" 1=1" + query.keyWhere);
        var _sbBy =new StringBuilder(query.sortName + " " + query.sortOrder);
        var pageList = new PageList<MesItems>();

        int currentPage = query.currentPage;
        int everyPageSize = query.everyPageSize;
        string sortName = query.sortName;
        string keyWhere = query.keyWhere;
        SqlParameter[] parameters =
        {
                new("@inCurrentPage", currentPage),
                new("@inEveryPageSize", everyPageSize),
                new("@inSortName", sortName),
                new("@inSortOrder", query.sortOrder),
                new("@inQueryWhere", keyWhere),
                new("@inFid", ""),
                new("@inP1", ""),
                new("@inP2", ""),
                new("@inP3", ""),
                new("@inP4", _userGuid)//当前登录用户guid，将根据他读取仓管员
            };
        var dset = new DataSet();
        var _pglist = new PageList<dynamic>
        {
            total = 0,
            everyPageSize = 0,
            pages = 0,
            list = new List<dynamic>()
        };
        try
        {
            var totalCount = GetPageTotalCount(null, query, out var itemsList, _sbWhere, _sbBy);
            pageList = new PageList<MesItems>(itemsList, totalCount,
                query.everyPageSize);
            return ReturnDto<PageList<MesItems>>.QuickReturn(pageList,
                ReturnCode.Success, "读取成功");
            dset = DbHelperSQL.RunProcedure("prc_qcdy_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;
                //currentId = dset.Tables[1].Rows[0]["mrCgy"].ToString();
            }
        }
        catch (Exception ex)
        {
            return ReturnDto<PageList<MesItems>>.QuickReturn(pageList,
                ReturnCode.Default, ex.Message);
            LogHelper.Debug(ToString(), ex.Message);
            return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
          ReturnCode.Exception, "读取失败！");
        }

        return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
            ReturnCode.Success, "读取成功");

        //var pageList = new PageList<MesItems>();
        //try
        //{
        //    var totalCount = GetPageTotalCount(null, query, out var itemsList, _sbWhere, _sbBy);
        //    pageList = new PageList<MesItems>(itemsList, totalCount,
        //        query.everyPageSize);
        //    return ReturnDto<PageList<MesItems>>.QuickReturn(pageList,
        //        ReturnCode.Success, "读取成功");
        //}
        //catch (Exception ex)
        //{
        //    return ReturnDto<PageList<MesItems>>.QuickReturn(pageList,
        //        ReturnCode.Default, ex.Message);
        //}
    }

    private int GetPageTotalCount(Guid? guid, PageQuery query,
@@ -99,41 +157,82 @@
    /// <param name="model"></param>
    /// <returns></returns>
    [RequestMethod(RequestMethods.POST)]
    public ReturnDto<InitialBarcode> GetModel(
        [FromBody] MesItems model)
    public ReturnDto<ExpandoObject> GetModel(
        [FromBody] dynamic model)
    {
        // var m = base.GetById(model.Guid);
        var query = new PageQuery

        string guid = model.guid.ToString();
        dynamic m = new ExpandoObject();
        m.list = new List<dynamic>();
        m.list2 = new List<dynamic>();
        SqlParameter[] parameters =
        {
            currentPage = 1,
            everyPageSize = 1
            new("@inMainGuid", guid),
            new("@inP1", ""),
            new("@inP2", ""),
            new("@inP3", ""),
            new("@inP4", ""),
            new("@userGuid", _userGuid)
        };
        System.Text.StringBuilder sb = new StringBuilder();
        System.Text.StringBuilder order = new StringBuilder();
        order.Append(" org.FNumber asc ,a.item_no asc");
        var pageTotalCount =  GetPageTotalCount(model.Guid, query, out var itemsList, sb, order);
        var dset = new DataSet();
        try
        {
            dset = DbHelperSQL.RunProcedure("[prc_qcdy_mx]", parameters,
                "0");
            if (dset != null && dset.Tables.Count > 0 &&
                dset.Tables[0].Rows.Count > 0)
            {
                var dr = dset.Tables[0].Rows[0];
                m = dr.RowToDynamic();
                var _tb = dset.Tables[1].TableToDynamicList();
                m.list = _tb;
                //var _tb2 = dset.Tables[2].TableToDynamicList();
                //m.list2 = _tb2;
    
            }
        }
        catch (Exception ex)
        {
            LogHelper.Debug(ToString(), ex.Message);
        }

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

        if (pageTotalCount == 0)
            return ReturnDto<InitialBarcode>.QuickReturn(barcode,
                ReturnCode.Default,
                "读取失败！");
        //// var m = base.GetById(model.Guid);
        //var query = new PageQuery
        //{
        //    currentPage = 1,
        //    everyPageSize = 1
        //};
        //System.Text.StringBuilder sb = new StringBuilder();
        //System.Text.StringBuilder order = new StringBuilder();
        //order.Append(" org.FNumber asc ,a.item_no asc");
        //var pageTotalCount =  GetPageTotalCount(model.Guid, query, out var itemsList, sb, order);

        var mesItems = itemsList.FirstOrDefault();
        //var barcode = new InitialBarcode();

        //if (pageTotalCount == 0)
        //    return ReturnDto<InitialBarcode>.QuickReturn(barcode,
        //        ReturnCode.Default,
        //        "读取失败！");

        //var mesItems = itemsList.FirstOrDefault();


        if (mesItems == null)
            return ReturnDto<InitialBarcode>.QuickReturn(barcode,
                ReturnCode.Default,
                "读取失败！");
        //if (mesItems == null)
        //    return ReturnDto<InitialBarcode>.QuickReturn(barcode,
        //        ReturnCode.Default,
        //        "读取失败！");

        barcode.from = mesItems;
        //barcode.from = mesItems;

        barcode.barcodes = GetMesInvItemBarcodes(mesItems.Id);
        //barcode.barcodes = GetMesInvItemBarcodes(mesItems.Id);

        return ReturnDto<InitialBarcode>.QuickReturn(barcode,
            ReturnCode.Success, "读取成功！");
        //return ReturnDto<InitialBarcode>.QuickReturn(barcode,
        //    ReturnCode.Success, "读取成功！");
    }

    private List<MesInvItemBarcodes> GetMesInvItemBarcodes(long? ItemId)