修改三个检验，适配WOMDAA表

啊鑫

2024-08-16 c9d9aacd884e9d730d47982e7f65ecc1bb836268

修改三个检验，适配WOMDAA表

 MES.Service/Dto/service/SJPageResult.cs

@@ -57,37 +57,30 @@
    [SugarColumn(ColumnName = "DAA001")] //用于SqlSugar
    public string? daa001 { get; set; }

    [SugarColumn(ColumnName = "CAT_QTY")] //用于SqlSugar
    public decimal? catQty { get; set; }

    [SugarColumn(ColumnName = "DETAIL_MEM")] //用于SqlSugar
    public string? detailMem { get; set; }

    [SugarColumn(ColumnName = "TASK_NO")] //用于SqlSugar
    public string? taskNo { get; set; }

    //LINE
    [SugarColumn(ColumnName = "LINE")] //用于SqlSugar
    public string? line { get; set; }

    /// <summary>
    ///     æ¨¡å…·å·
    /// </summary>

    [SugarColumn(ColumnName = "MOID_NUM")] //用于SqlSugar
    public string? MoidNum { get; set; }

    [SugarColumn(ColumnName = "Remarks")] //用于SqlSugar
    public string? Remarks { get; set; }

    //BOARD_MODEL
    [SugarColumn(ColumnName = "BOARD_MODEL")]
    public string? BoardModel { get; set; }
    /// <summary>
    /// äº§å“åç§° 
    ///</summary>
    [SugarColumn(ColumnName = "DAA003")]
    public string? Daa003 { get; set; }

    [SugarColumn(ColumnName = "PLAN_QTY")] public decimal? PlanQty { get; set; }
    /// <summary>
    /// äº§å“è§„æ ¼ 
    ///</summary>
    [SugarColumn(ColumnName = "DAA004")]
    public string? Daa004 { get; set; }

    [SugarColumn(ColumnName = "MOCODE")] public string? Mocode { get; set; }
    /// <summary>
    /// å·¥å•æ•°é‡ 
    ///</summary>
    [SugarColumn(ColumnName = "DAA008")]
    public decimal? Daa008 { get; set; }

    [SugarColumn(ColumnName = "BOARD_STYLE")]
    public string? BoardStyle { get; set; }
}

 MES.Service/Modes/MesBoardBaseInfo.cs

ÎļþÒÑɾ³ý

 MES.Service/Modes/MesDepTask.cs

ÎļþÒÑɾ³ý

 MES.Service/Modes/MesLine.cs

@@ -1,258 +1,173 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using SqlSugar;
using SqlSugar;

namespace MES.Service.Modes;

namespace MES.Service.Modes
{
/// <summary>
///     çº¿ä½“
/// </summary>
[Table("MES_LINE")]
[SugarTable("MES_LINE")] //用于SqlSugar
    [SugarTable("MES_LINE")]
public class MesLine
{
    /// <summary>
    ///     ä¸»é”®
    /// </summary>
    [Key]
    [Column("ID")]
    [SugarColumn(ColumnName = "ID")] //用于SqlSugar
        [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
    public decimal Id { get; set; }

    /// <summary>
    ///     æ¡ç ç±»åž‹
        /// çº¿ä½“编号 
    /// </summary>
    [Column("BARTYPE")]
    [SugarColumn(ColumnName = "BARTYPE")] //用于SqlSugar
    [StringLength(20, ErrorMessage = "条码类型长度不能超出20")]
    public string Bartype { get; set; }
        [SugarColumn(ColumnName = "LINE_NO")]
        public string LineNo { get; set; }

    /// <summary>
    ///     å¡æ¿åˆ†ç±»
        /// çº¿ä½“名称 
    /// </summary>
    [Column("BK01")]
    [SugarColumn(ColumnName = "BK01")] //用于SqlSugar
    [StringLength(50, ErrorMessage = "卡板分类长度不能超出50")]
    public string Bk01 { get; set; }
        [SugarColumn(ColumnName = "LINE_NAME")]
        public string LineName { get; set; }

    /// <summary>
    ///     å®¡æ ¸äºº
        /// å·¥ä½œä¸­å¿ƒç¼–号 
    /// </summary>
    [Column("CHECK_BY")]
    [SugarColumn(ColumnName = "CHECK_BY")] //用于SqlSugar
    [StringLength(30, ErrorMessage = "审核人长度不能超出30")]
    public string CheckBy { get; set; }
        [SugarColumn(ColumnName = "WORKSHOP_CENTER_CODE")]
        public string WorkshopCenterCode { get; set; }

    /// <summary>
    ///     å®¡æ ¸æ—¥æœŸ
        /// å¤‡æ³¨ 
    /// </summary>
    [Column("CHECK_DATE")]
    [SugarColumn(ColumnName = "CHECK_DATE")] //用于SqlSugar
    public DateTime? CheckDate { get; set; }

    /// <summary>
    ///     å®¡æ ¸çŠ¶æ€
    /// </summary>
    [Column("CHECK_STATUS")]
    [SugarColumn(ColumnName = "CHECK_STATUS")] //用于SqlSugar
    public decimal? CheckStatus { get; set; }

    /// <summary>
    /// </summary>
    [Column("COMPANY")]
    [SugarColumn(ColumnName = "COMPANY")] //用于SqlSugar
    [StringLength(20, ErrorMessage = "Company长度不能超出20")]
    public string Company { get; set; }
        [SugarColumn(ColumnName = "MEMO")]
        public string Memo { get; set; }

    /// <summary>
    ///     åˆ›å»ºäºº
    /// </summary>
    [Column("CREATE_BY")]
    [SugarColumn(ColumnName = "CREATE_BY")] //用于SqlSugar
    [StringLength(30, ErrorMessage = "创建人长度不能超出30")]
        [SugarColumn(ColumnName = "CREATE_BY")]
    public string CreateBy { get; set; }

    /// <summary>
    ///     åˆ›å»ºæ—¥æœŸ
    /// </summary>
    [Column("CREATE_DATE")]
    [SugarColumn(ColumnName = "CREATE_DATE")] //用于SqlSugar
        [SugarColumn(ColumnName = "CREATE_DATE")]
    public DateTime? CreateDate { get; set; }

    /// <summary>
    ///     éƒ¨é—¨ç¼–号
    /// </summary>
    [Column("DEPARTMENTCODE")]
    [SugarColumn(ColumnName = "DEPARTMENTCODE")] //用于SqlSugar
    [StringLength(32, ErrorMessage = "部门编号长度不能超出32")]
    public string Departmentcode { get; set; }

    /// <summary>
    ///     çº¿è¾¹ä»“库
    /// </summary>
    [Column("DEPOT_CODE")]
    [SugarColumn(ColumnName = "DEPOT_CODE")] //用于SqlSugar
    [StringLength(50, ErrorMessage = "线边仓库长度不能超出50")]
    public string DepotCode { get; set; }

    /// <summary>
    ///     é»˜è®¤åº“位
    /// </summary>
    [Column("DEPOT_SECTION_CODE")]
    [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")] //用于SqlSugar
    [StringLength(50, ErrorMessage = "默认库位长度不能超出50")]
    public string DepotSectionCode { get; set; }

    /// <summary>
    /// </summary>
    [Column("FACTORY")]
    [SugarColumn(ColumnName = "FACTORY")] //用于SqlSugar
    [StringLength(20, ErrorMessage = "Factory长度不能超出20")]
    public string Factory { get; set; }

    /// <summary>
    ///     æ ‡ç­¾æ˜¾ç¤ºå€¼
    /// </summary>
    [Column("LABEL")]
    [SugarColumn(ColumnName = "LABEL")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "标签显示值长度不能超出100")]
    public string Label { get; set; }

    /// <summary>
    ///     æœ€åŽä¿®æ”¹äºº
    /// </summary>
    [Column("LASTUPDATE_BY")]
    [SugarColumn(ColumnName = "LASTUPDATE_BY")] //用于SqlSugar
    [StringLength(30, ErrorMessage = "最后修改人长度不能超出30")]
        [SugarColumn(ColumnName = "LASTUPDATE_BY")]
    public string LastupdateBy { get; set; }

    /// <summary>
    ///     æœ€åŽä¿®æ”¹æ—¥æœŸ
    /// </summary>
    [Column("LASTUPDATE_DATE")]
    [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //用于SqlSugar
        [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
    public DateTime? LastupdateDate { get; set; }

    /// <summary>
    ///     ç»„长编号
        /// å¡æ¿åˆ†ç±» 
    /// </summary>
    [Column("L_CODE")]
    [SugarColumn(ColumnName = "L_CODE")] //用于SqlSugar
    [StringLength(32, ErrorMessage = "组长编号长度不能超出32")]
    public string LCode { get; set; }
        [SugarColumn(ColumnName = "BK01")]
        public string Bk01 { get; set; }

    /// <summary>
    ///     çº¿ç®€ç 
        /// æ ‡ç­¾æ˜¾ç¤ºå€¼ 
    /// </summary>
    [Column("LINEJM")]
    [SugarColumn(ColumnName = "LINEJM")] //用于SqlSugar
    [StringLength(20, ErrorMessage = "线简码长度不能超出20")]
    public string Linejm { get; set; }

    /// <summary>
    ///     çº¿ä½“名称
    /// </summary>
    [Column("LINE_NAME")]
    [SugarColumn(ColumnName = "LINE_NAME")] //用于SqlSugar
    [StringLength(64, ErrorMessage = "线体名称长度不能超出64")]
    public string LineName { get; set; }

    /// <summary>
    ///     çº¿ä½“编号
    /// </summary>
    [Column("LINE_NO")]
    [SugarColumn(ColumnName = "LINE_NO")] //用于SqlSugar
    [StringLength(32, ErrorMessage = "线体编号长度不能超出32")]
    public string LineNo { get; set; }

    /// <summary>
    ///     äº§çº¿ç±»åˆ«
    /// </summary>
    [Column("LINE_STYLE")]
    [SugarColumn(ColumnName = "LINE_STYLE")] //用于SqlSugar
    [StringLength(32, ErrorMessage = "产线类别长度不能超出32")]
    public string LineStyle { get; set; }

    /// <summary>
    ///     å¤‡æ³¨
    /// </summary>
    [Column("MEMO")]
    [SugarColumn(ColumnName = "MEMO")] //用于SqlSugar
    [StringLength(1000, ErrorMessage = "备注长度不能超出1000")]
    public string Memo { get; set; }

    /// <summary>
    ///     æ‰€å±žå·¥åº
    /// </summary>
    [Column("PROC_NO")]
    [SugarColumn(ColumnName = "PROC_NO")] //用于SqlSugar
    [StringLength(32, ErrorMessage = "所属工序长度不能超出32")]
    public string ProcNo { get; set; }

    /// <summary>
    /// </summary>
    [Column("SHOW_INDEX")]
    [SugarColumn(ColumnName = "SHOW_INDEX")] //用于SqlSugar
    public decimal? ShowIndex { get; set; }

    /// <summary>
    /// </summary>
    [Column("SIMPLENAME")]
    [SugarColumn(ColumnName = "SIMPLENAME")] //用于SqlSugar
    [StringLength(20, ErrorMessage = "Simplename长度不能超出20")]
    public string Simplename { get; set; }

    /// <summary>
    ///     æ ‡å‡†å·¥æ—¶
    /// </summary>
    [Column("STAND_TIME")]
    [SugarColumn(ColumnName = "STAND_TIME")] //用于SqlSugar
    public decimal? StandTime { get; set; }

    /// <summary>
    ///     ç»„é•¿
    /// </summary>
    [Column("USERCODE")]
    [SugarColumn(ColumnName = "USERCODE")] //用于SqlSugar
    [StringLength(50, ErrorMessage = "组长长度不能超出50")]
    public string Usercode { get; set; }

    /// <summary>
    ///     åŒºåˆ†é”‚锰锂亚
    /// </summary>
    [Column("WORKCENTERTYPE")]
    [SugarColumn(ColumnName = "WORKCENTERTYPE")] //用于SqlSugar
    [StringLength(50, ErrorMessage = "区分锂锰锂亚长度不能超出50")]
    public string Workcentertype { get; set; }
        [SugarColumn(ColumnName = "LABEL")]
        public string Label { get; set; }

    /// <summary>
    ///     è½¦é—´ç®€ç 
    /// </summary>
    [Column("WORKHOMEJM")]
    [SugarColumn(ColumnName = "WORKHOMEJM")] //用于SqlSugar
    [StringLength(20, ErrorMessage = "车间简码长度不能超出20")]
        [SugarColumn(ColumnName = "WORKHOMEJM")]
    public string Workhomejm { get; set; }

    /// <summary>
    ///     å·¥ä½œä¸­å¿ƒç¼–号
        /// çº¿ç®€ç  
    /// </summary>
    [Column("WORKSHOP_CENTER_CODE")]
    [SugarColumn(ColumnName = "WORKSHOP_CENTER_CODE")] //用于SqlSugar
    [StringLength(20, ErrorMessage = "工作中心编号长度不能超出20")]
    public string WorkshopCenterCode { get; set; }
        [SugarColumn(ColumnName = "LINEJM")]
        public string Linejm { get; set; }

    /// <summary>
    ///     æŠ¥å·¥æ–¹å¼ï¼ˆ0、离散报工，1、整线报工）
        /// æ¡ç ç±»åž‹ 
    /// </summary>
    [Column("WORK_TYPE")]
    [SugarColumn(ColumnName = "WORK_TYPE")] //用于SqlSugar
    public decimal? WorkType { get; set; }
        [SugarColumn(ColumnName = "BARTYPE")]
        public string Bartype { get; set; }

    /// <summary>
    ///     å¾®ä¿¡æ˜¾ç¤ºå€¼
    /// </summary>
    [Column("WX_LABLE")]
    [SugarColumn(ColumnName = "WX_LABLE")] //用于SqlSugar
    [StringLength(50, ErrorMessage = "微信显示值长度不能超出50")]
        [SugarColumn(ColumnName = "WX_LABLE")]
    public string WxLable { get; set; }

        /// <summary>
        /// åŒºåˆ†é”‚锰锂亚 
        ///</summary>
        [SugarColumn(ColumnName = "WORKCENTERTYPE")]
        public string Workcentertype { get; set; }

        /// <summary>
        ///  
        ///</summary>
        [SugarColumn(ColumnName = "SIMPLENAME")]
        public string Simplename { get; set; }

        /// <summary>
        ///  
        ///</summary>
        [SugarColumn(ColumnName = "SHOW_INDEX")]
        public decimal? ShowIndex { get; set; }

        /// <summary>
        ///  
        ///</summary>
        [SugarColumn(ColumnName = "COMPANY")]
        public string Company { get; set; }

        /// <summary>
        ///  
        ///</summary>
        [SugarColumn(ColumnName = "FACTORY")]
        public string Factory { get; set; }

        /// <summary>
        /// çº¿è¾¹ä»“库 
        ///</summary>
        [SugarColumn(ColumnName = "DEPOT_CODE")]
        public string DepotCode { get; set; }

        /// <summary>
        /// é»˜è®¤åº“位 
        ///</summary>
        [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")]
        public string DepotSectionCode { get; set; }

        /// <summary>
        /// æŠ¥å·¥æ–¹å¼ï¼ˆ0、离散报工，1、整线报工） 
        ///</summary>
        [SugarColumn(ColumnName = "WORK_TYPE")]
        public decimal? WorkType { get; set; }

        /// <summary>
        /// éƒ¨é—¨ç¼–号 
        ///</summary>
        [SugarColumn(ColumnName = "DEPARTMENTCODE")]
        public string Departmentcode { get; set; }

        /// <summary>
        /// æ‰€å±žå·¥åº 
        ///</summary>
        [SugarColumn(ColumnName = "PROC_NO")]
        public string ProcNo { get; set; }

        /// <summary>
        ///  
        ///</summary>
        [SugarColumn(ColumnName = "LINE_STYLE")]
        public string LineStyle { get; set; }

        /// <summary>
        /// ç»„长编号 
        ///</summary>
        [SugarColumn(ColumnName = "L_CODE")]
        public string LCode { get; set; }
    }
}

 MES.Service/Modes/MesSchemeResult.cs

ÎļþÒÑɾ³ý

 MES.Service/Modes/Womdaa.cs

@@ -1,7 +1,10 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;

namespace MES.Service.Modes;

namespace MES.Service.Modes
{
/// <summary>
///     å·¥å•æŒ‡ä»¤è¡¨
/// </summary>
@@ -11,11 +14,11 @@
    /// <summary>
    ///     è‡ªå¢žåˆ—
    /// </summary>
    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, IsIdentity = true)]
    public decimal Id { get; set; }
        [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
        public decimal? Id { get; set; }

    /// <summary>
    ///     PID
        /// æŽ’产ID 
    /// </summary>
    [SugarColumn(ColumnName = "PID")]
    public decimal? Pid { get; set; }
@@ -27,7 +30,7 @@
    public string? Daa001 { get; set; }

    /// <summary>
    ///     äº§å“ç¼–码
        /// äº§å“ID 
    /// </summary>
    [SugarColumn(ColumnName = "DAA002")]
    public string? Daa002 { get; set; }
@@ -51,13 +54,13 @@
    public string? Daa005 { get; set; }

    /// <summary>
    ///     é¢„计开工时间
        /// ERP预计开工时间 
    /// </summary>
    [SugarColumn(ColumnName = "DAA006")]
    public DateTime? Daa006 { get; set; }

    /// <summary>
    ///     é¢„计完工时间
        /// ERP预计完工时间 
    /// </summary>
    [SugarColumn(ColumnName = "DAA007")]
    public DateTime? Daa007 { get; set; }
@@ -229,4 +232,89 @@
    /// </summary>
    [SugarColumn(ColumnName = "DAA028")]
    public string? Daa028 { get; set; }

        /// <summary>
        /// æ ‡å‡†å·¥æ—¶ 
        ///</summary>
        [SugarColumn(ColumnName = "PROD_HOUR")]
        public decimal? ProdHour { get; set; }

        /// <summary>
        /// å•äººå°æ—¶äº§èƒ½ 
        ///</summary>
        [SugarColumn(ColumnName = "PERSON_HOUR_CAPACITY")]
        public decimal? PersonHourCapacity { get; set; }

        /// <summary>
        /// ç†è®ºæ ‡äº§ 
        ///</summary>
        [SugarColumn(ColumnName = "THE_CAPACITY")]
        public decimal? TheCapacity { get; set; }

        /// <summary>
        /// è®¡åˆ’用人数 
        ///</summary>
        [SugarColumn(ColumnName = "PLAN_PERSONNEL")]
        public decimal? PlanPersonnel { get; set; }

        /// <summary>
        /// è®¡åˆ’标准产能 
        ///</summary>
        [SugarColumn(ColumnName = "PLAN_CAPACITY")]
        public decimal? PlanCapacity { get; set; }

        /// <summary>
        /// ç†è®ºç”¨æ—¶/M 
        ///</summary>
        [SugarColumn(ColumnName = "THE_MIN")]
        public decimal? TheMin { get; set; }

        /// <summary>
        /// ç†è®ºç”¨æ—¶/H 
        ///</summary>
        [SugarColumn(ColumnName = "THE_HOUR")]
        public decimal? TheHour { get; set; }

        /// <summary>
        /// çº¿ä½“类别 
        ///</summary>
        [SugarColumn(ColumnName = "LINE_TYPE")]
        public string? LineType { get; set; }

        /// <summary>
        /// æ ‡å‡†äººæ•° 
        ///</summary>
        [SugarColumn(ColumnName = "PERSONNEL")]
        public decimal? Personnel { get; set; }

        /// <summary>
        /// æ¢çº¿æ—¶é—´ 
        ///</summary>
        [SugarColumn(ColumnName = "CHANGE_LINE_TIME")]
        public decimal? ChangeLineTime { get; set; }

        /// <summary>
        /// ä¼‘息时间 
        ///</summary>
        [SugarColumn(ColumnName = "REST_TIME")]
        public decimal? RestTime { get; set; }

        /// <summary>
        /// æŽ’产序号 
        ///</summary>
        [SugarColumn(ColumnName = "SCHEDULE_ORDER")]
        public decimal? ScheduleOrder { get; set; }

        /// <summary>
        /// MES预计开工时间 
        ///</summary>
        [SugarColumn(ColumnName = "MES_START_PROD")]
        public DateTime? MesStartProd { get; set; }

        /// <summary>
        /// MES预计完工时间 
        ///</summary>
        [SugarColumn(ColumnName = "MES_END_PROD")]
        public DateTime? MesEndProd { get; set; }
    }
}

 MES.Service/service/QC/RKJService.cs

@@ -418,14 +418,14 @@
        var mesInvItemIns = db.Queryable<MesInvItemIns>()
            .Single(s => s.BillNo == qsItemOqcReq.BillNo);

        var mesSchemeResult = db.Queryable<MesSchemeResult>()
            .Single(s => s.BillNo == mesInvItemIns.CbillNo);
        var mesSchemeResult = db.Queryable<Womdaa>()
            .Single(s => s.Daa001 == mesInvItemIns.CbillNo);

        var entity = new MesQaItemsDetect02();
        entity.ItemNo = mesSchemeResult.BoardItem;
        entity.BoardItem = mesSchemeResult.BoardItem;
        entity.LineNo = mesSchemeResult.LineNo;
        entity.Aufnr = mesSchemeResult.TaskNo;
        // entity.ItemNo = mesSchemeResult.BoardItem;
        // entity.BoardItem = mesSchemeResult.BoardItem;
        entity.LineNo = mesSchemeResult.Daa015;
        // entity.Aufnr = mesSchemeResult.TaskNo;
        entity.ReleaseNo = qsItemOqcReq.ReleaseNo;
        entity.LotNo = qsItemOqcReq.BillNo;
        entity.FcheckDate = qsItemOqcReq.FcheckDate;

 MES.Service/service/QC/SJService.cs

@@ -99,7 +99,7 @@
        var count = db.Queryable<MesQa>().Where(s => s.QsType == "1"
            && s.ItemNo == itemNo && s.Fsubmit == 1).Count();

        if (count <= 0) return new List<QsItemIpiItem>();
        if (count <= 0) return [];

        return db
            .Queryable<MesQualityStandard>()

 MES.Service/service/QC/SuspendService.cs

@@ -6,20 +6,20 @@

public class SuspendService
{
    private readonly string[] statusArray = ["生产", "待产", "暂停"];
    private readonly string[] statusArray = ["开工", "待开工"];

    public List<SysDepartment> getDept()
    {
        var db = SqlSugarHelper.GetInstance();
        //return db.Queryable<SysDepartment>().ToList();
        return db
            .Queryable<MesSchemeResult, MesLine, QsQaItemXj, SysDepartment>(
            .Queryable<Womdaa, MesLine, QsQaItemXj, SysDepartment>(
                (a, b, c, d) =>
                    new JoinQueryInfos(JoinType.Left, a.LineNo == b.LineNo,
                        JoinType.Inner, a.BillNo == c.BillNo,
                    new JoinQueryInfos(JoinType.Left, a.Daa002 == b.Id.ToString(),
                        JoinType.Inner, a.Daa001 == c.BillNo,
                        JoinType.Left, b.Departmentcode == d.Departmentcode))
            .Where((a, b, c, d) => a.PmoveMk == 0 && b.LineName != null &&
                                   statusArray.Contains(a.ProcStatus))
            .Where((a, b, c, d) => b.LineName != null &&
                                   statusArray.Contains(a.Daa018))
            .GroupBy((a, b, c, d) => new
            {
                b.Departmentcode, d.Departmentname
@@ -34,20 +34,20 @@
    public List<MesLine> GetLines(string deptCode)
    {
        var db = SqlSugarHelper.GetInstance();
        var mesLines = db.Queryable<MesSchemeResult, MesLine, QsQaItemXj>(
        var mesLines = db.Queryable<Womdaa, MesLine, QsQaItemXj>(
                (a, b, c) =>
                    new JoinQueryInfos(JoinType.Left, a.LineNo == b.LineNo,
                        JoinType.Inner, a.BillNo == c.BillNo))
                    new JoinQueryInfos(JoinType.Left, a.Daa002 == b.Id.ToString(),
                        JoinType.Inner, a.Daa001 == c.BillNo))
            .Where((a, b, c) => b.LineName != null &&
                                statusArray.Contains(a.ProcStatus)
                                statusArray.Contains(a.Daa018)
                                && b.Departmentcode == deptCode)
            .GroupBy((a, b, c) => new
            {
                a.LineNo, b.LineName
                b.LineNo, b.LineName
            })
            .Select((a, b, c) => new MesLine
            {
                LineNo = a.LineNo,
                LineNo = b.LineNo,
                LineName = b.LineName
            }).ToList();


 MES.Service/service/QC/XJService.cs

@@ -13,7 +13,7 @@
    private readonly BaseService _baseService = new();


    private readonly string[] statusArray = ["生产", "待产"];
    private readonly string[] statusArray = ["开工", "待开工"];

    //生成最新的检验单号
    public string getMaxReleaseNo()
@@ -38,35 +38,16 @@
        return "XJN" + date + number;
    }

    public List<MesSchemeResult> getItem(string daa001)
    public List<Womdaa> getItem(string daa001)
    {
        var db = SqlSugarHelper.GetInstance();

        //in的写法 https://www.donet5.com/Home/Doc?typeId=1187

        return db.Queryable<MesSchemeResult, MesDepTask, MesBoardBaseInfo>(
                (a, c, b) =>
                    new JoinQueryInfos(
                        JoinType.Left, a.TaskNo == c.TaskNo,
                        JoinType.Left, c.BoardItem == b.BoardItem
                    )
            )
            .Where(a => a.PmoveMk == 0 &&
                        a.BillNo == daa001 &&
                        statusArray.Contains(a.ProcStatus))
            .Select((a, c, b) => new MesSchemeResult
            {
                BillNo = a.BillNo,
                CatQty = a.CatQty,
                DetailMem = a.DetailMem,
                TaskNo = a.TaskNo,
                BoardItem = a.BoardItem,
                BoardModel = b.BoardModel,
                PlanQty = c.PlanQty,
                Mocode = a.Mocode,
                // BoardStyle = c.BoardStyle,
                Id = a.Id
            })
        return db.Queryable<Womdaa>()
            .Where(a =>
                a.Daa001 == daa001 &&
                statusArray.Contains(a.Daa018))
            .ToList();
    }

@@ -74,50 +55,52 @@
    {
        var db = SqlSugarHelper.GetInstance();

        return db.Queryable<MesSchemeResult, MesLine>((a, b) =>
                new JoinQueryInfos(JoinType.Left, a.LineNo == b.LineNo))
            .Where((a, b) => a.PmoveMk == 0 && b.LineName != null &&
                             statusArray.Contains(a.ProcStatus))
            .Where("BOARD_ITEM like @BoardItem", new { BoardItem = "20%" })
        return db.Queryable<Womdaa, MesLine>((a, b) =>
                new JoinQueryInfos(JoinType.Left, a.Daa015 == b.LineNo))
            .Where((a, b) => b.LineName != null &&
                             statusArray.Contains(a.Daa018))
            .GroupBy((a, b) => new
            {
                a.LineNo, b.LineName
                b.LineNo, b.LineName
            })
            .Select((a, b) => new MesLine
            {
                LineNo = a.LineNo,
                LineNo = b.LineNo,
                LineName = b.LineName
            }).OrderBy("a.LINE_NO").ToList();
            }).OrderBy("b.LINE_NO").ToList();
    }

    public List<MesSchemeResult> getDaa001(string daa020, string item)
    public List<Womdaa> getDaa001(string daa020, string item)
    {
        var db = SqlSugarHelper.GetInstance();
        return db.Queryable<MesSchemeResult>().Where(a =>
                a.PmoveMk == 0 && a.LineNo == daa020 && a.BillNo != null &&
                a.BoardItem == item &&
                statusArray.Contains(a.ProcStatus))
            .Select<MesSchemeResult>(a => new MesSchemeResult
        return db.Queryable<Womdaa, MesItems>((a, b) =>
                new JoinQueryInfos(JoinType.Inner, a.Daa002 == b.Id.ToString()))
            .Where((a, b) =>
                a.Daa015 == daa020 &&
                b.ItemNo == item &&
                statusArray.Contains(a.Daa018))
            .Select<Womdaa>(a => new Womdaa
            {
                BillNo = a.BillNo,
                DetailMem = a.DetailMem
                Id = a.Id,
                Daa001 = a.Daa001,
                Daa003 = a.Daa003
            }).ToList();
    }

    public List<MesSchemeResult> getBoardItem(string lineNo)
    public List<MesItems> getBoardItem(string lineNo)
    {
        var db = SqlSugarHelper.GetInstance();
        return db.Queryable<MesSchemeResult>()
            .Where(a =>
                a.PmoveMk == 0 && statusArray.Contains(a.ProcStatus) &&
                a.LineNo == lineNo)
            .Where("BOARD_ITEM like @BoardItem", new { BoardItem = "20%" })
            .Select<MesSchemeResult>(a =>
                new MesSchemeResult
        return db.Queryable<Womdaa, MesItems>((a, b) =>
                new JoinQueryInfos(JoinType.Inner, a.Daa002 == b.Id.ToString()))
            .Where((a, b) => statusArray.Contains(a.Daa018) &&
                             a.Daa015 == lineNo)
            .OrderBy((a, b) => b.ItemName)
            .Select<MesItems>((a, b) =>
                new MesItems
                {
                    BoardItem = a.BoardItem,
                    DetailMem = a.DetailMem
                }).OrderBy(a => a.BoardItem).ToList();
                    ItemNo = b.ItemNo,
                    ItemName = b.ItemName
                }).ToList();
    }

    public List<QsQaItemXj> getPage(XJPageResult queryObj)
@@ -132,16 +115,16 @@
            lineNo = _baseService.getUserLineNo(queryObj.createUser);

        return db
            .Queryable<QsQaItemXj, MesSchemeResult, MesDepTask,
                MesBoardBaseInfo>((s, a, c, b) =>
            .Queryable<QsQaItemXj, Womdaa, MesLine,
                MesItems>((s, a, c, b) =>
                new JoinQueryInfos(
                    JoinType.Inner, s.BillNo == a.BillNo,
                    JoinType.Left, a.TaskNo == c.TaskNo,
                    JoinType.Left, c.BoardItem == b.BoardItem
                    JoinType.Inner, s.BillNo == a.Daa001,
                    JoinType.Left, a.Daa015 == c.LineNo,
                    JoinType.Left, s.ItemNo == b.ItemNo
                )
            )
            .WhereIF(lineNo != null && lineNo.Length > 0,
                (s, a, c, b) => lineNo.Contains(a.LineNo))
                (s, a, c, b) => lineNo.Contains(c.LineNo))
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                "未完成".Equals(queryObj.result),
@@ -153,11 +136,8 @@
            .WhereIF(id > 0, (s, a, c, b) => s.Id == id)
            .Select((s, a, c, b) => new QsQaItemXj
            {
                CatQty = a.CatQty,
                MoidNum = s.MoidNum,
                Daa020 = a.LineNo,
                // DetailMem = a.DetailMem,
                TaskNo = a.TaskNo,
                Daa020 = c.LineNo,
                Id = s.Id,
                CreateBy = s.CreateBy,
                CreateDate = s.CreateDate,
@@ -168,10 +148,6 @@
                FcheckBy = s.FcheckBy,
                FcheckResu = s.FcheckResu,
                Remarks = s.Remarks,
                BoardModel = b.BoardModel,
                PlanQty = c.PlanQty
                // Mocode = a.Mocode,
                // BoardStyle = c.BoardStyle
            }).OrderBy(s => s.CreateDate, OrderByType.Desc)
            .ToPageList(queryObj.PageIndex, queryObj.Limit);
    }

 MESApplication/Controllers/QC/XJController.cs

@@ -82,7 +82,9 @@
    }


    //getDaa001
    /// <summary>
    ///     èŽ·å–工单
    /// </summary>
    [HttpPost("getDaa001")]
    public ResponseResult getDaa001([FromBody] JObject data)
    {
@@ -107,7 +109,10 @@
        }
    }

    //getBoardItem
    /// <summary>
    ///     æ ¹æ®äº§çº¿èŽ·å–物料编码  lineNo
    /// </summary>
    /// <returns></returns>
    [HttpPost("getBoardItem")]
    public ResponseResult getBoardItem([FromBody] JObject data)
    {