切换测试库地址

啊鑫

8 天以前 aedc81d40157133df8b5c44d3fbabc803a0e6e75

 WebApi/GS.QC/Service/MesQmCheckitemManager.cs

@@ -1,7 +1,4 @@
using System.Data;
using System.Data.SqlClient;
using System.Dynamic;
using System.Text;
using System.Text;
using Gs.Entity.BaseInfo;
using Gs.Entity.Sys;
using GS.QC.Models;
@@ -13,6 +10,9 @@
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
using SqlSugar;
using System.Data;
using System.Data.SqlClient;
using System.Dynamic;

namespace GS.QC.Service;

@@ -43,19 +43,18 @@
        var _sbWhere = new StringBuilder(" 1=1 " + query.keyWhere);
        var _sbBy = new StringBuilder(query.sortName + " " + query.sortOrder);
        var totalCount = 0;
        var itemsList = Db
            .Queryable<MesQmCheckitem, MesItems, SysOrganization>((a, b, org) =>
                new object[]
        var itemsList = Db.Queryable<MesQmCheckitem, MesItems, SysOrganization>(
                (a, b, org) => new object[]
                {
                    JoinType.Left, a.ItemId == b.Id,
                    JoinType.Left, b.FSubsidiary == org.Fid
                }).Select((a, b, org) => new MesQmCheckitem
            {
                FSubsidiary = "(" + org.FNumber + ")" + org.Name,
                mc = b.ItemName,
                gg = b.ItemModel,
                ItemNo = b.ItemNo
            }, true)
                {
                    FSubsidiary = "(" + org.FNumber + ")" + org.Name,
                    mc = b.ItemName,
                    gg = b.ItemModel,
                    ItemNo = b.ItemNo,
                }, true)
            .Where(_sbWhere.ToString())
            .OrderBy(_sbBy.ToString())
            .ToPageList(query.currentPage, query.everyPageSize,
@@ -77,16 +76,14 @@
        [FromBody] MesQmCheckitem model)
    {
        var m = base.GetById(model.Guid);
        var sbSql = new StringBuilder();
        sbSql.Append(
            "select top 1 FSubsidiary,org.NAME as fName,org.FNumber, [item_name],[item_model],item_no from MES_ITEMS i left join SYS_ORGANIZATION org on i.FSubsidiary=org.FID where i.id=" +
            m.ItemId);
        System.Text.StringBuilder sbSql = new StringBuilder();
        sbSql.Append("select top 1 FSubsidiary,org.NAME as fName,org.FNumber, [item_name],[item_model],item_no from MES_ITEMS i left join SYS_ORGANIZATION org on i.FSubsidiary=org.FID where i.id=" + m.ItemId);
        try
        {
            var dset = new DataSet();
            dset = DbHelperSQL.Query(sbSql.ToString());
            var r = dset.Tables[0].Rows[0];
            m.FSubsidiary = "(" + r["FNumber"] + ")" + r["fName"];
            DataSet dset = new DataSet();
            dset = Gs.Toolbox.DbHelperSQL.Query(sbSql.ToString());
            System.Data.DataRow r = dset.Tables[0].Rows[0];
            m.FSubsidiary ="("+ r["FNumber"].ToString() + ")"+ r["fName"].ToString();
            m.ItemNo = r["item_no"].ToString();
            m.gg = r["item_model"].ToString();
            m.mc = r["item_name"].ToString();
@@ -95,7 +92,6 @@
        {
            LogHelper.Debug(ToString(), "GetModel error：" + ex.Message);
        }

        m.list = Db.Queryable<MesQmCheckitemDt, MesQmAql1>((a, b) =>
                new object[]
                {
@@ -127,10 +123,8 @@
        {
            var cont = IsChkOrUnChk(model.Guid.ToString());
            if (cont > 0)
                return ReturnDto<string>.QuickReturn("", ReturnCode.Exception,
                    "修改失败，该信息已被审核！");
                return ReturnDto<string>.QuickReturn("", ReturnCode.Exception, "修改失败，该信息已被审核！");
        }

        try
        {
            Db.Ado.BeginTran();
@@ -225,9 +219,8 @@
            it.Guid == Guid.Parse(_guid) && it.FoneChecked == true).Count;
        return cont;
    }

    /// <summary>
    ///     复制物料项目
    ///  复制物料项目
    /// </summary>
    /// <param name="model"></param>
    /// <returns></returns>
@@ -237,7 +230,7 @@
        int? rtnInt = (int)ReturnCode.Default;
        string inSourceGuid = model.sourceGuid;
        string inMxGuids = model.itemGuids;
        string strType = model.iqcType;
        string strType=model.iqcType;
        var _outMsg = "";
        var _outSum = -1;
        using (var conn = new SqlConnection(DbHelperSQL.strConn))
@@ -252,10 +245,10 @@
                    {
                        new("@outMsg", SqlDbType.NVarChar, 300),
                        new("@outSum", SqlDbType.Int),
                        new("@inSourceGuid", inSourceGuid),
                        new("@inSourceGuid",inSourceGuid),
                        new("@inMxGuids", inMxGuids),
                        new("@iqcType", strType),
                        new("@inEdtUserGuid", _userGuid)
                        new("@inEdtUserGuid", _userGuid),
                    };
                    parameters[0].Direction = ParameterDirection.Output;
                    parameters[1].Direction = ParameterDirection.Output;
@@ -278,7 +271,6 @@
                }
            }
        }

        if (_outSum <= 0)
            return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
                _outMsg);
@@ -286,6 +278,7 @@
    }

    /// <summary>
    ///   
    /// </summary>
    /// <param name="mode"></param>
    /// <returns></returns>
@@ -336,7 +329,6 @@
                }
            }
        }

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