蓝宝PC后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
啊鑫
4 天以前 2ba5117206c152cece2e5ac40067a6232dfb2870 
 WebApi/GS.QC/Service/MesQaMjManager.cs


@@ -1,5 +1,4 @@


using System.Data;


using System.Text;


using System.Text;


using Gs.Entity.BaseInfo;


using Gs.Entity.Sys;


using GS.QC.Models;


@@ -12,6 +11,7 @@


using Microsoft.AspNetCore.Mvc;


using Newtonsoft.Json.Linq;


using SqlSugar;


using System.Data;




namespace GS.QC.Service;




@@ -46,15 +46,14 @@


            var _sbBy =


                new StringBuilder(query.sortName + " " + query.sortOrder);


            var totalCount = 0;


            var itemsList = Db


                .Queryable<MesQaMj, MesItems, SysOrganization, MesSupplier>((a,


                    b, org, d) => new JoinQueryInfos(


                    JoinType.Inner, a.ItemId == b.Id,


                    JoinType.Inner, b.FSubsidiary == org.Fid,


                    JoinType.Left, a.SuppId == d.Id.ToString()


                ))


                .Where(_sbWhere.ToString())


                .OrderBy(_sbBy.ToString())


            var itemsList = Db.Queryable<MesQaMj, MesItems, SysOrganization, MesSupplier>(


                    (a, b, org, d) => new JoinQueryInfos(


                        JoinType.Inner, a.ItemId == b.Id,


                        JoinType.Inner, b.FSubsidiary == org.Fid,


                        JoinType.Left, a.SuppId == d.Id.ToString()


                    ))


                 .Where(_sbWhere.ToString())


                 .OrderBy(_sbBy.ToString())


                .Select((a, b, org, d) => new MesQaMj


                {


                    FSubsidiary = "(" + org.FNumber + ") " + org.Name,


@@ -66,7 +65,7 @@


                .ToPageList(query.currentPage, query.everyPageSize,


                    ref totalCount);


            pageList = new PageList<MesQaMj>(itemsList, totalCount,


                query.everyPageSize);


               query.everyPageSize);


            return ReturnDto<PageList<MesQaMj>>.QuickReturn(pageList,


                ReturnCode.Success, "读取成功");


        }


@@ -87,17 +86,15 @@


        [FromBody] MesQaMj model)


    {


        var m = base.GetById(model.Guid);


        var sbSql = new StringBuilder();


        sbSql.Append(


            "select  i.FSubsidiary,i.[item_name],i.[item_model],i.item_no,mj.SUPP_ID,sup.supp_name,sup.supp_no");


        sbSql.Append(


            " from MES_ITEMS i right join [dbo].[MES_QA_MJ] mj on i.id=mj.ITEM_ID left join [dbo].[MES_SUPPLIER] sup on sup.id=mj.SUPP_ID ");


        System.Text.StringBuilder sbSql = new StringBuilder();


        sbSql.Append("select  i.FSubsidiary,i.[item_name],i.[item_model],i.item_no,mj.SUPP_ID,sup.supp_name,sup.supp_no");


        sbSql.Append(" from MES_ITEMS i right join [dbo].[MES_QA_MJ] mj on i.id=mj.ITEM_ID left join [dbo].[MES_SUPPLIER] sup on sup.id=mj.SUPP_ID ");


        sbSql.Append("  where i.id=" + m.ItemId);


        try


        {


            var dset = new DataSet();


            dset = DbHelperSQL.Query(sbSql.ToString());


            var r = dset.Tables[0].Rows[0];


            DataSet dset = new DataSet();


            dset = Gs.Toolbox.DbHelperSQL.Query(sbSql.ToString());


            System.Data.DataRow r = dset.Tables[0].Rows[0];


            m.FSubsidiary = r["FSubsidiary"].ToString();


            m.ItemNo = r["item_no"].ToString();


            m.suppNo = r["supp_no"].ToString();


@@ -106,7 +103,6 @@


        {


            LogHelper.Debug(ToString(), "GetModel error：" + ex.Message);


        }




        if (m != null)


            return ReturnDto<MesQaMj>.QuickReturn(m,


                ReturnCode.Success, "读取成功！");


@@ -127,25 +123,18 @@


            var cont = 0;


            cont = IsChkOrUnChk(model.Guid.ToString());


            if (cont > 0)


                return ReturnDto<string>.QuickReturn("", ReturnCode.Exception,


                    "修改失败，该信息已被审核！");


                return ReturnDto<string>.QuickReturn("", ReturnCode.Exception, "修改失败，该信息已被审核！");


        }




        try


        {


            //防呆是不是属于同一组织


            string supOrg = "", itemOrg = "";


            supOrg = DbHelperSQL


                .GetSingle(


                    "select top 1 FSubsidiary from MES_SUPPLIER a where a.id=" +


                    model.SuppId).ToString();


            itemOrg = DbHelperSQL


                .GetSingle(


                    "select top 1 FSubsidiary from MES_ITEMS a where a.id=" +


                    model.ItemId).ToString();


            if (supOrg != itemOrg)


            supOrg = Gs.Toolbox.DbHelperSQL.GetSingle("select top 1 FSubsidiary from MES_SUPPLIER a where a.id="+model.SuppId.ToString()).ToString();


            itemOrg = Gs.Toolbox.DbHelperSQL.GetSingle("select top 1 FSubsidiary from MES_ITEMS a where a.id=" + model.ItemId.ToString()).ToString();


            if (supOrg != itemOrg) {


                return ReturnDto<string>.QuickReturn("",


                    ReturnCode.Default, "供应商和物料不在同一组织下，请重新选择！");


              ReturnCode.Default, "供应商和物料不在同一组织下，请重新选择！");


            }


            Db.Ado.BeginTran();


            if (!UtilityHelper.CheckGuid(model.Guid))


            {


@@ -169,10 +158,9 @@


        }


        catch (Exception ex)


        {


            LogHelper.Debug(ToString(), "EditModel error：" + ex.Message);


            LogHelper.Debug(this.ToString(), "EditModel error：" + ex.Message);


            Db.Ado.RollbackTran();


            return ReturnDto<string>.QuickReturn("", ReturnCode.Exception,


                ex.Message);


            return ReturnDto<string>.QuickReturn("", ReturnCode.Exception, ex.Message);


        }




        return ReturnDto<string>.QuickReturn(model.Guid.ToString(),