1

zyf

2025-08-25 387c9a7271272644bd872b896e8d0ead23451dc4

1

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

@@ -527,9 +527,9 @@
                new JoinQueryInfos(
                    JoinType.Left, a.ItemNo == b.ItemNo, // 关联物料信息
                    JoinType.Left, a.BillNo == da.Daa001, // 关联工单信息
                    JoinType.Left, da.Daa021 == ca.Caa020,//任务单，用于查询销售订单号
                    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),

 MES.Service/service/SalesOrder/SalesOrderManager.cs

@@ -82,6 +82,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 +116,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 +162,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 +179,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 +217,7 @@
                Fmapid = erpDto.Fmapid,
                Fmapname = erpDto.Fmapname,
                Fmapspec = erpDto.Fmapspec
            };
            };*/

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