提交报告修改

duheng

2024-12-11 a789cf802f06aa176877ddddb6e42d7799de5093

提交报告修改

 WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs

@@ -92,12 +92,12 @@
            {
                foreach (var prop in item.PropList)
                {
                    _propList.Add(new PropGroupChoiceViewModel() { PropGroupName = item.Name, PropName = prop.Name, ID = prop.ID,TagName= prop.Code });
                    _propList.Add(new PropGroupChoiceViewModel() { PropGroupName = item.Name, PropName = prop.Name, ID = prop.ID, TagName = prop.Code });
                }
            }
            var propbll = new BLL.AssetsPumpPropContent();
            _allPropList = await propbll.GetByPumpPartID(model.ID);
             foreach (var item in _allPropList)
            foreach (var item in _allPropList)
            {
                var selectProp = _propList.Find(x => x.ID == item.PropID);
                if (selectProp != null)
@@ -131,7 +131,7 @@
            updatepart.Code = TextEditProductCode.Text;
            updatepart.SeriesID = _series.ID;
            var propList = _propList.Where(x => x.TagName == "Prop").ToList(); //找到所有的额外属性
            foreach (var item in propList)
            foreach (var item in _propList)
            {
                if (_allPropList != null)
                {
@@ -141,15 +141,16 @@
                    if (prop != null)
                    {
                        prop.PropValue = item.Value;
                     }
                    }
                    else
                    {
                        _allPropList.Add(new Vmo.AssetsPumpPropContentVmo() { 
                            SeriesID = _allPropList.First().SeriesID, 
                            PartID = _allPropList.First().PartID, 
                            PropID = item.ID, 
                        _allPropList.Add(new Vmo.AssetsPumpPropContentVmo()
                        {
                            SeriesID = _allPropList.First().SeriesID,
                            PartID = _allPropList.First().PartID,
                            PropID = item.ID,
                            PropValue = item.Value,
                            TagName=item.TagName
                            TagName = item.TagName
                        });
                    }
                }
@@ -176,6 +177,10 @@
            }
            var pumpMainBll = new BLL.AssetsPumpMain();
            await pumpMainBll.Update(_pumpMain);
            _propList.Remove(_propList.Find(x => x.TagName == "Basic_Flow"));
            _propList.Remove(_propList.Find(x => x.TagName == "Basic_Head"));
            _propList.Remove(_propList.Find(x => x.TagName == "Basic_Power"));
            _propList.Remove(_propList.Find(x => x.TagName == "Basic_Speed"));
            if (await _bll.UpdateEx(updatepart, _allPropList))
            {
                vm.Reset(updatepart);
@@ -222,11 +227,13 @@
            var AssetsPumpPropContent = new List<Vmo.AssetsPumpPropContentVmo>();
            foreach (var item in _propList)
            {
                AssetsPumpPropContent.Add(new Vmo.AssetsPumpPropContentVmo { 
                    PropID = item.ID, 
                    PropValue = item.Value, 
                    SeriesID = _pumpPart.SeriesID ,
                    TagName=item.TagName});
                AssetsPumpPropContent.Add(new Vmo.AssetsPumpPropContentVmo
                {
                    PropID = item.ID,
                    PropValue = item.Value,
                    SeriesID = _pumpPart.SeriesID,
                    TagName = item.TagName
                });
            }
            var id = await _bll.InsertEx(_pumpPart, AssetsPumpPropContent, _partMapping);
            if (id > 0)
@@ -267,10 +274,11 @@
                {
                    foreach (var prop in item.PropList)
                    {
                        _propList.Add(new PropGroupChoiceViewModel() { 
                            PropGroupName = item.Name, 
                        _propList.Add(new PropGroupChoiceViewModel()
                        {
                            PropGroupName = item.Name,
                            PropName = prop.Name,
                            ID = prop.ID, 
                            ID = prop.ID,
                            Value = prop.DefaultValue,
                            TagName = prop.Code,
                        });

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/test.cs

@@ -1,4 +1,6 @@
namespace HStation.WinFrmUI
using HStation.Assets;

namespace HStation.WinFrmUI
{
    public partial class test : DocumentPage
    {
@@ -7,10 +9,16 @@
            InitializeComponent();
        }

        private void simpleButton1_Click(object sender, EventArgs e)
        private async void simpleButton1_Click(object sender, EventArgs e)
        {
            var bll = new BLL.AssetsPumpMain().GetByIDEx(1845041966958645248);

            var allList = await new BLL.AssetsPumpMain().GetByIDEx(1845041966958645248);
            foreach (var item in allList.PropContent)
            {
                if (item.TagName == PumpDataType.RatedCurrent)
                {
                    var value = item.PropValue;
                }
            }
            SimulationWordReport word = new SimulationWordReport();
            var test1 = new ReportViewModel();
            test1.ValveOpens = new List<ValveOpen>();