首检获取检验项目前 删除原有检验项

sjz

2025-08-26 f31edb8fa31c6608d34d303e750890f7eea1930b

首检获取检验项目前 删除原有检验项

 MES.Service/Dto/service/SJPageResult.cs

@@ -106,4 +106,7 @@
    /// </summary>
    [SugarColumn(ColumnName = "LINE_NAME")]
    public string? LineName { get; set; }

    //销售订单号
    [SugarColumn(IsIgnore = true)] public string? SaleOrder { get; set; }
}

 MES.Service/Dto/service/XJPageResult.cs

@@ -10,4 +10,5 @@
    public string? id { get; set; }

    public string? SearchValue { get; set; }
    public string? statusUser { get; set; } //用户编码
}

 MES.Service/Modes/QsItemOqcReq.cs

@@ -119,6 +119,12 @@
    [SugarColumn(ColumnName = "ITEM_ID")]
    public decimal? ItemId { get; set; }

    /// <summary>
    ///     销售订单号
    /// </summary>
    [SugarColumn(IsIgnore = true)]
    public string? SaleOrderNo { get; set; }

    // 添加以下字段以适应查询返回的数据
    [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }


 MES.Service/Modes/QsQaItemXj.cs

@@ -136,4 +136,5 @@
    [SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; }
    [SugarColumn(IsIgnore = true)] public string? LineName { get; set; }
    [SugarColumn(IsIgnore = true)] public string? CreateUser { get; set; }
    [SugarColumn(IsIgnore = true)] public string? SaleOrder { get; set; }
}

 MES.Service/Modes/SalesOrder/SalesOrder.cs

@@ -179,22 +179,22 @@
        /// 发货日期 
        ///</summary>
        [SugarColumn(ColumnName = "F_WWC_DATE")]
        public DateTime? FWwcDate { get; set; }
        public DateTime? F_WWC_DATE { get; set; }
        /// <summary>
        /// 是否评审 
        ///</summary>
        [SugarColumn(ColumnName = "F_WWC_CHECKBOX")]
        public string? FWwcCheckbox { get; set; }
        public string? F_WWC_CHECKBOX { get; set; }
        /// <summary>
        /// 技术评审 
        ///</summary>
        [SugarColumn(ColumnName = "F_WWC_LARGETEXT")]
        public string? FWwcLargetext { get; set; }
        public string? F_WWC_LARGETEXT { get; set; }
        /// <summary>
        /// PMC评审 
        ///</summary>
        [SugarColumn(ColumnName = "F_WWC_LARGETEXT1")]
        public string? FWwcLargetext1 { get; set; }
        public string? F_WWC_LARGETEXT1 { get; set; }
        /// <summary>
        /// 备注（明细） 
        ///</summary>

 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/service/QC/RKJService.cs

@@ -522,13 +522,14 @@


        var query = db
            .Queryable<QsItemOqcReq, MesItems, Womdaa, MesLine, SysUser>((a, b,
                    da, c, us) =>
            .Queryable<QsItemOqcReq, MesItems, Womdaa, MesLine, SysUser,Womcaa>((a, b,
                    da, c, us, ca) =>
                new JoinQueryInfos(
                    JoinType.Left, a.ItemNo == b.ItemNo, // 关联物料信息
                    JoinType.Left, a.BillNo == da.Daa001, // 关联工单信息
                    JoinType.Left, da.Daa015 == c.LineNo, // 关联工单信息
                    JoinType.Left, us.Fcode == a.CreateBy // 关联工单信息
                    JoinType.Left, us.Fcode == a.CreateBy, // 关联工单信息
                    JoinType.Left, da.Daa021 == ca.Caa020//任务单，用于查询销售订单号
                ))
            // 用户线体过滤条件
            //.WhereIF(lineNo != null && lineNo.Length > 0 && !"PL017".Equals(queryObj.createUser),
@@ -548,7 +549,7 @@
                        .Contains(queryObj.SearchValue.ToLower()) ||
                    a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
            // 查询字段
            .Select((a, b, da, c, us) => new QsItemOqcReq
            .Select((a, b, da, c, us, ca) => new QsItemOqcReq
            {
                Id = a.Id,
                BillNo = a.BillNo,
@@ -566,7 +567,8 @@
                Daa015 = da.Daa015, // 工单线体
                Fsubmit = a.Fsubmit,
                Quantity = da.Daa008,
                LineNo = c.LineName
                LineNo = c.LineName,
                SaleOrderNo = ca.Caa015
            })
            // 排序
            .OrderBy(a => a.CreateDate, OrderByType.Desc);

 MES.Service/service/QC/SJService.cs

@@ -48,7 +48,12 @@
        //if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
        //    lineNo = _baseService.getUserLineNo(queryObj.StatusUser);

        var data = db.Queryable<SJPageResult>()
        var data = db.Queryable<SJPageResult, Womdaa, Womcaa> ((a,
                    da,ca) =>
                new JoinQueryInfos(
                    JoinType.Left, Convert.ToDecimal(a.Pbaid) == da.Id, // 关联工单信息
                    JoinType.Left, da.Daa021 == ca.Caa020//任务单，用于查询销售订单号
                ))
            //.WhereIF(lineNo != null && lineNo.Length > 0,
            //    a => lineNo.Contains(a.line))
            .WhereIF(queryObj.Id != null, a => a.Id == queryObj.Id)
@@ -62,6 +67,34 @@
                StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
                !"未完成".Equals(queryObj.Result),
                a => a.FSubmit == "1")
            .Select((a, da, ca) => new SJPageResult
            {
                Id = a.Id,
                BillNo = a.BillNo,
                StatusDate = a.StatusDate,
                FName = a.FName,
                Result = a.Result,
                FSubmit = a.FSubmit,
                FSubmitBy = a.FSubmitBy,
                FSubmitDate = a.FSubmitDate,
                MoidNum = a.MoidNum,
                StatusUser = a.StatusUser,
                Pbaid = a.Pbaid,
                CreateTime = a.CreateTime,
                Comments = a.Comments,
                ItemMod = a.ItemMod,
                ItemNo = a.ItemNo,
                daa001 = a.daa001,
                line = a.line,
                Remarks = a.Remarks,
                Daa003 = a.Daa003,
                Daa004 = a.Daa004,
                Daa008 = a.Daa008,
                LineName = a.LineName,

                // 映射额外的字段（销售订单号）
                SaleOrder = ca.Caa015
            })
            .OrderBy(a => a.CreateTime, OrderByType.Desc);
        var items = data.ToPageList(queryObj.PageIndex, queryObj.Limit,ref totalCount);


 MES.Service/service/QC/XJService.cs

@@ -123,12 +123,14 @@

        var query = db
            .Queryable<QsQaItemXj, Womdaa, MesLine,
                MesItems, SysUser>((s, a, c, b, us) =>
                MesItems, SysUser,Womcaa,SysDepartment>((s, a, c, b, us,ca,d) =>
                new JoinQueryInfos(
                    JoinType.Inner, s.BillNo == a.Daa001,
                    JoinType.Left, a.Daa015 == c.LineNo,
                    JoinType.Left, s.ItemId == b.Id,
                    JoinType.Left, us.Fcode == s.CreateBy
                    JoinType.Left, us.Fcode == s.CreateBy,
                    JoinType.Left, ca.Caa020 == a.Daa021,
                    JoinType.Left, d.Departmentcode == c.Departmentcode
                )
            )
            //.WhereIF(lineNo != null && lineNo.Length > 0,
@@ -142,8 +144,8 @@
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                !"未完成".Equals(queryObj.result),
                (s, a, c, b, us) => s.SubmitStatus == 1)
            .WhereIF(id > 0, (s, a, c, b, us) => s.Id == id)
            .Select((s, a, c, b, us) => new QsQaItemXj
            .WhereIF(id > 0, (s, a, c, b, us,ca) => s.Id == id)
            .Select((s, a, c, b, us,ca) => new QsQaItemXj
            {
                Daa020 = c.LineNo,
                Id = s.Id,
@@ -159,7 +161,8 @@
                ItemModel = b.ItemModel,
                CheckBy = s.CheckBy,
                CheckResult = s.CheckResult,
                Remarks = s.Remarks
                Remarks = s.Remarks,
                SaleOrder = ca.Caa015 
            }).OrderBy(s => s.CreateDate, OrderByType.Desc);
        var items = query.ToPageList(queryObj.PageIndex, queryObj.Limit,
            ref totalCount);

 MES.Service/service/SaleDeliveryNotice/SalesDeliveryNoticeManager.cs

@@ -37,6 +37,7 @@
                        return UpdateData(db, mesSalesDelivery, mesSalesDeliveryDatas) ? 1 : 0;
                    case "2":
                    case "4":
                    case "5":
                        return SaveOrUpdateData(db, mesSalesDelivery, mesSalesDeliveryDatas, erpSalesDeliveryDto.Type)
                            ? 1
                            : 0;

 MES.Service/service/SalesOrder/SalesOrderManager.cs

@@ -34,6 +34,7 @@
                    return UpdateData(db, mesSalesOrder, mesSalesOrderDatas) ? 1 : 0;
                case "2":
                case "4":
                case "5":
                    return SaveOrUpdateData(db, mesSalesOrder, mesSalesOrderDatas, erpSalesOrderDto.Type)
                        ? 1
                        : 0;
@@ -82,6 +83,23 @@
        return result.All(b => b);
    }

    //自动映射字段
    public static void MapProperties<T>(T target, object source)
    {
        var targetProps = typeof(T).GetProperties();
        var sourceProps = source.GetType().GetProperties();

        foreach (var targetProp in targetProps)
        {
            var sourceProp = sourceProps.FirstOrDefault(p => p.Name == targetProp.Name && p.PropertyType == targetProp.PropertyType);
            if (sourceProp != null)
            {
                var value = sourceProp.GetValue(source);
                targetProp.SetValue(target, value);
            }
        }
    }

    private SalesOrder ConvertErpToSalesOrder(
        ErpSalesOrder erpDto1)
    {
@@ -99,7 +117,9 @@
            return null; // 如果转换失败，返回null
        }
        var erpDto = erpDto1.OrderDto;
        var salesOrder = new SalesOrder
        var salesOrder = new SalesOrder();
        MapProperties(salesOrder, erpDto);
        /*var salesOrder = new SalesOrder
        {
            Id = erpDto.Id,
            Erpid = erpDto.Erpid,
@@ -143,7 +163,7 @@
            //long.Parse()
            //Convert.ToDecimal()
            //Convert.ToDouble()
        };
        };*/

        var single = base.GetSingle(it => it.Erpid == erpDto.Erpid);
        if (single != null) salesOrder.Id = single.Id;
@@ -160,7 +180,9 @@

        foreach (var erpDto in erpDtoList.Items)
        {
            var salesOrderSub = new SalesOrderDetail
            var salesOrderSub = new SalesOrderDetail();
            MapProperties(salesOrderSub, erpDto);
            /*var salesOrderSub = new SalesOrderDetail
            {
                Id = erpDto.Id,
                Erpid = erpDto.Erpid,
@@ -196,7 +218,7 @@
                Fmapid = erpDto.Fmapid,
                Fmapname = erpDto.Fmapname,
                Fmapspec = erpDto.Fmapspec
            };
            };*/

            var single = _SalesOrderDetailManager.GetSingle(it =>
                it.Erpid == salesOrderSub.Erpid);

 MES.Service/service/SalesReturnNotice/SalesReturnNoticeManager.cs

@@ -34,6 +34,7 @@
                    return UpdateData(db, mesSalesReturn, mesSalesReturnDatas) ? 1 : 0;
                case "2":
                case "4":
                case "5":
                    return SaveOrUpdateData(db, mesSalesReturn, mesSalesReturnDatas, erpSalesReturnDto.Type)
                        ? 1
                        : 0;

 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/MESApplication.deps.json

@@ -1887,10 +1887,7 @@
          "SqlSugarCore": "5.1.4.158"
        },
        "runtime": {
          "MES.Service.dll": {
            "assemblyVersion": "1.0.0",
            "fileVersion": "1.0.0.0"
          }
          "MES.Service.dll": {}
        }
      },
      "Kingdee.CDP.WebApi.SDK/8.0.6.0": {

 MESApplication/bin/Release/net8.0/publish (2).zip

Binary files differ

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

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.deps.json

@@ -1635,10 +1635,7 @@
          "SqlSugarCore": "5.1.4.158"
        },
        "runtime": {
          "MES.Service.dll": {
            "assemblyVersion": "1.0.0",
            "fileVersion": "1.0.0.0"
          }
          "MES.Service.dll": {}
        }
      },
      "Kingdee.CDP.WebApi.SDK/8.0.6.0": {