11

啊鑫

2024-10-14 611ac2e3f6f5cbfa30b1a72d75fafc358b792e35

11

 MES.Service/Dto/service/RkDaa002.cs

@@ -24,4 +24,8 @@

    [SugarColumn(ColumnName = "ITEM_NAME")]
    public string? ItemName { get; set; }
    
    
    [SugarColumn(ColumnName = "DAA020")]
    public string? Daa020 { get; set; }
}

 MES.Service/Modes/MesDeptUser.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,80 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;

namespace MES.Service.Modes
{
    /// <summary>
    /// 
    ///</summary>
    [SugarTable("MES_DEPT_USER")]
    public class MesDeptUser
    {
        /// <summary>
        /// SEQ_USER 
        ///</summary>
        [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
        public decimal Id { get; set; }

        /// <summary>
        /// è½¦é—´ 
        ///</summary>
        [SugarColumn(ColumnName = "WORKSHOP")]
        public string Workshop { get; set; }

        /// <summary>
        /// ç¼–码 
        ///</summary>
        [SugarColumn(ColumnName = "CODE")]
        public string Code { get; set; }

        /// <summary>
        /// ç”¨æˆ· 
        ///</summary>
        [SugarColumn(ColumnName = "USER_NO")]
        public string UserNo { get; set; }

        /// <summary>
        /// å²—位 
        ///</summary>
        [SugarColumn(ColumnName = "POST")]
        public string Post { get; set; }

        /// <summary>
        /// ç”µè¯ 
        ///</summary>
        [SugarColumn(ColumnName = "PHONE")]
        public string Phone { get; set; }

        /// <summary>
        /// æ˜¯å¦ç¦»èŒ 
        ///</summary>
        [SugarColumn(ColumnName = "IS_DEPARTURE")]
        public short? IsDeparture { get; set; }

        /// <summary>
        /// 0未审核 1审核 
        ///</summary>
        [SugarColumn(ColumnName = "STATUS")]
        public decimal? Status { get; set; }

        /// <summary>
        /// å®¡æ ¸äºº 
        ///</summary>
        [SugarColumn(ColumnName = "ISSUED_BY")]
        public string IssuedBy { get; set; }

        /// <summary>
        /// å®¡æ ¸æ—¶é—´ 
        ///</summary>
        [SugarColumn(ColumnName = "ISSUED_DATE")]
        public DateTime? IssuedDate { get; set; }

        /// <summary>
        /// ç”¨æˆ·å 
        ///</summary>
        [SugarColumn(ColumnName = "USER_NAME")]
        public string UserName { get; set; }
    }
}

 MES.Service/Modes/QsItemOqcReq.cs

@@ -134,5 +134,5 @@

    [SugarColumn(IsIgnore = true)] public decimal? ItemInId { get; set; }
    
    [SugarColumn(IsIgnore = true)] public string Bgr { get; set; }
    [SugarColumn(IsIgnore = true)] public string? Bgr { get; set; }
}

 MES.Service/bin/Debug/net8.0/MES.Service.dll

Binary files differ

 MES.Service/bin/Debug/net8.0/MES.Service.pdb

Binary files differ

 MES.Service/bin/Release/net8.0/MES.Service.dll

Binary files differ

 MES.Service/bin/Release/net8.0/MES.Service.pdb

Binary files differ

 MES.Service/service/QC/RKJService.cs

@@ -57,11 +57,10 @@
    public List<RkDaa002> GetDaa001s(string lineNo)
    {
        var db = SqlSugarHelper.GetInstance();
        // return db.Queryable<RKJDaa001>()
        //     .Where(t => t.LineNo == lineNo)
        //     .OrderBy(t => t.BillNo, OrderByType.Desc)
        //     .ToList();
        return null;
        return db.Queryable<RkDaa002>()
            .Where(t => lineNo.Contains(t.Daa020))
            .OrderBy(t => t.BillNo, OrderByType.Desc)
            .ToList();
    }

    //根据检验标准来计算检验个数
@@ -600,8 +599,8 @@

        var qsItemOqcReqs = db
            .Queryable<QsItemOqcReq, MesItems, MesInvItemIns, MesInvTransaction,
                RKJDaa001, Womdaa, VLineUser>(
                (a, b, c, ca, m, da, z) => new JoinQueryInfos(
                RKJDaa001, Womdaa, VLineUser,MesDeptUser>(
                (a, b, c, ca, m, da, z,d) => new JoinQueryInfos(
                    JoinType.Left, a.ItemNo == b.ItemNo,
                    JoinType.Left, a.BillNo == c.BillNo,
                    JoinType.Left,
@@ -610,23 +609,24 @@
                    c.Factory == ca.Factory,
                    JoinType.Left, c.Id == m.ItemInId && a.ItemNo == m.ItemNo,
                    JoinType.Left, da.Daa001 == c.RbillNo,
                    JoinType.Left, da.Daa015 == z.LineNo
                    JoinType.Left, da.Daa015 == z.LineNo,
                    JoinType.Left,c.Bgr == d.UserNo
                ))
            // .WhereIF(lineNo != null && lineNo.Length > 0,
            //     (a, b, c, ca, m, da) => lineNo.Contains(da.Daa015))
            .WhereIF(!"PL017".Equals(queryObj.createUser),
                (a, b, c, ca, m, da, z) => lineNo.Contains(da.Daa015))
                (a, b, c, ca, m, da, z,d) => lineNo.Contains(da.Daa015))
            .WhereIF(!string.IsNullOrEmpty(queryObj.id),
                (a, b, c, ca, m, da, z) => a.Id.ToString() == queryObj.id)
                (a, b, c, ca, m, da, z,d) => a.Id.ToString() == queryObj.id)
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                "未完成".Equals(queryObj.result),
                (a, b, c, ca, m, da, z) => a.FcheckResu == null)
                (a, b, c, ca, m, da, z,d) => a.FcheckResu == null)
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                !"未完成".Equals(queryObj.result),
                (a, b, c, ca, m, da, z) => a.FcheckResu != null)
            .Select((a, b, c, ca, m, da, z) => new QsItemOqcReq
                (a, b, c, ca, m, da, z,d) => a.FcheckResu != null)
            .Select((a, b, c, ca, m, da, z,d) => new QsItemOqcReq
            {
                BillNo = a.BillNo,
                Fsubmit = a.Fsubmit,
@@ -646,7 +646,7 @@
                Daa015 = da.Daa015,
                LineNo = c.LineNo,
                Quantity = m.Quantity,
                Bgr = c.Bgr
                Bgr = d.UserName
            })
            .OrderBy(a => a.CreateDate, OrderByType.Desc)
            .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);

 MESApplication/bin/Debug/net8.0/MES.Service.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/MES.Service.pdb

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.exe

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.pdb

Binary files differ

 MESApplication/bin/Release/net8.0/MES.Service.dll

Binary files differ

 MESApplication/bin/Release/net8.0/MES.Service.pdb

Binary files differ

 MESApplication/bin/Release/net8.0/MESApplication.dll

Binary files differ

 MESApplication/bin/Release/net8.0/MESApplication.exe

Binary files differ

 MESApplication/bin/Release/net8.0/MESApplication.pdb

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MES.Service.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MES.Service.pdb

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.exe

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.pdb

Binary files differ