change - 代码整理

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/ReportSaveHelper.cs

@@ -25,61 +25,6 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
             {
                 ICSharpCode.Core.LoggingService<GHFinshBatchHelper>.Debug("干混机报表数据保存开始！！！");
                 //准备信号读取
-                #region 注释代码 读取复杂
-                //if (BasePlcHelper.Instance.RdyRpt_D1.NowValue.ToInt() == 1)
-                //{
-                //    Report_DryMixer _dryMixer = new Report_DryMixer();
-                //    _dryMixer.eqNo = BasePlcHelper.Instance.dryerA_dos0_eqNo.NowValue.ToInt();
-                //    _dryMixer.batch = BasePlcHelper.Instance.dryerA_dos0_batch.NowValue.ToInt();
-                //    _dryMixer.matCode = BasePlcHelper.Instance.dryerA_dos0_matCode.NowValue.ToInt();
-                //    _dryMixer.setValue = BasePlcHelper.Instance.dryerA_dos0_setValue.NowValue.ToString();
-                //    _dryMixer.setToler = BasePlcHelper.Instance.dryerA_dos0_setToler.NowValue.ToString();
-                //    _dryMixer.actValue = BasePlcHelper.Instance.dryerA_dos0_actValue.NowValue.ToString();
-                //    _dryMixer.actToLer = BasePlcHelper.Instance.dryerA_dos0_actToLer.NowValue.ToString();
-                //    _dryMixer.dos = "0";
-                //    _dryMixer.recordTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-                //}
-                //else if (BasePlcHelper.Instance.RdyRpt_D2.NowValue.ToInt() == 1)
-                //{
-                //    Report_DryMixer _dryMixer = new Report_DryMixer();
-                //    _dryMixer.eqNo = BasePlcHelper.Instance.dryerA_dos1_eqNo.NowValue.ToInt();
-                //    _dryMixer.batch = BasePlcHelper.Instance.dryerA_dos1_batch.NowValue.ToInt();
-                //    _dryMixer.matCode = BasePlcHelper.Instance.dryerA_dos1_matCode.NowValue.ToInt();
-                //    _dryMixer.setValue = BasePlcHelper.Instance.dryerA_dos1_setValue.NowValue.ToString();
-                //    _dryMixer.setToler = BasePlcHelper.Instance.dryerA_dos1_setToler.NowValue.ToString();
-                //    _dryMixer.actValue = BasePlcHelper.Instance.dryerA_dos1_actValue.NowValue.ToString();
-                //    _dryMixer.actToLer = BasePlcHelper.Instance.dryerA_dos1_actToLer.NowValue.ToString();
-                //    _dryMixer.dos = "1";
-                //    _dryMixer.recordTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-                //}
-                //else if (BasePlcHelper.Instance.RdyRpt_D3.NowValue.ToInt() == 1)
-                //{
-                //    Report_DryMixer _dryMixer = new Report_DryMixer();
-                //    _dryMixer.eqNo = BasePlcHelper.Instance.dryerA_dos2_eqNo.NowValue.ToInt();
-                //    _dryMixer.batch = BasePlcHelper.Instance.dryerA_dos2_batch.NowValue.ToInt();
-                //    _dryMixer.matCode = BasePlcHelper.Instance.dryerA_dos2_matCode.NowValue.ToInt();
-                //    _dryMixer.setValue = BasePlcHelper.Instance.dryerA_dos2_setValue.NowValue.ToString();
-                //    _dryMixer.setToler = BasePlcHelper.Instance.dryerA_dos2_setToler.NowValue.ToString();
-                //    _dryMixer.actValue = BasePlcHelper.Instance.dryerA_dos2_actValue.NowValue.ToString();
-                //    _dryMixer.actToLer = BasePlcHelper.Instance.dryerA_dos2_actToLer.NowValue.ToString();
-                //    _dryMixer.dos = "2";
-                //    _dryMixer.recordTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-                //}
-                //else if (BasePlcHelper.Instance.RdyRpt_D4.NowValue.ToInt() == 1)
-                //{
-                //    Report_DryMixer _dryMixer = new Report_DryMixer();
-                //    _dryMixer.eqNo = BasePlcHelper.Instance.dryerA_dos3_eqNo.NowValue.ToInt();
-                //    _dryMixer.batch = BasePlcHelper.Instance.dryerA_dos3_batch.NowValue.ToInt();
-                //    _dryMixer.matCode = BasePlcHelper.Instance.dryerA_dos3_matCode.NowValue.ToInt();
-                //    _dryMixer.setValue = BasePlcHelper.Instance.dryerA_dos3_setValue.NowValue.ToString();
-                //    _dryMixer.setToler = BasePlcHelper.Instance.dryerA_dos3_setToler.NowValue.ToString();
-                //    _dryMixer.actValue = BasePlcHelper.Instance.dryerA_dos3_actValue.NowValue.ToString();
-                //    _dryMixer.actToLer = BasePlcHelper.Instance.dryerA_dos3_actToLer.NowValue.ToString();
-                //    _dryMixer.dos = "3";
-                //    _dryMixer.recordTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-                //}
-                #endregion
-
                 //if (BasePlcHelper.Instance.RdyRpt_D1.NowValue.ToInt() == 1)
                 //{
                 //    Report_DryMixer dryMixer_dos0 = readDryMixer("A"); //读取报表数据
@@ -123,13 +68,30 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
             Report_DryMixer _dryMixer = null;
             try
             {
-                var s= BasePlcHelper.Instance.dryerA_dos0_eqNo.LastValue.ToInt();
-                
                 _dryMixer = new Report_DryMixer();
-                List<DryMixerDos> dryMixerDoes = new List<DryMixerDos> ();
+                _dryMixer.dos = readDryMixerDos(machineType, 4); 
-                List<DryMixerMix> dryMixerMixes = new List<DryMixerMix> ();
+                _dryMixer.mix = readDryMixerMix(machineType, 10);
-                for (int dos = 0;dos< 4; dos++)
+            }
+            catch (Exception ex)
+            {
+                ICSharpCode.Core.LoggingService<GHFinshBatchHelper>.Error(String.Format("通过PLC读取干混机报表数读取异常：{0}", ex.Message), ex);
+            }
+            return _dryMixer;
+        }
+
+        
+        /// <summary>
+        /// 读取干混机Dos数据
+        /// </summary>
+        /// <param name="machineType"></param>
+        /// <param name="amount"></param>
+        /// <returns></returns>
+        private static List<DryMixerDos> readDryMixerDos(string machineType,int amount)
         {
+            List<DryMixerDos> dryMixerDoes = new List<DryMixerDos>();
+            for (int dos = 0; dos < amount; dos++)
+            {
+                #region 实例化参数
                 BasePlcHelper.Instance.dryer_eqNo = new Entity.DataKeyValue($"dryer{machineType}_dos{dos}_eqNo");
                 BasePlcHelper.Instance.dryer_batch = new Entity.DataKeyValue($"dryer{machineType}_dos{dos}_batch");
                 BasePlcHelper.Instance.dryer_matCode = new Entity.DataKeyValue($"dryer{machineType}_dos{dos}_matCode");
@@ -137,6 +99,8 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
                 BasePlcHelper.Instance.dryer_setToler = new Entity.DataKeyValue($"dryer{machineType}_dos{dos}_setToler");
                 BasePlcHelper.Instance.dryer_actValue = new Entity.DataKeyValue($"dryer{machineType}_dos{dos}_actValue");
                 BasePlcHelper.Instance.dryer_actToLer = new Entity.DataKeyValue($"dryer{machineType}_dos{dos}_actToLer");
+                #endregion
+
                 DryMixerDos dryMixerDos = new DryMixerDos()
                 {
                     eqNo = BasePlcHelper.Instance.dryer_eqNo.NowValue.ToInt(),
@@ -149,17 +113,31 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
                     dos = dos,
                     recordTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
                 };
-                    dryMixerDoes.Add( dryMixerDos );
+                dryMixerDoes.Add(dryMixerDos);
+            }
+            return dryMixerDoes;
         }
 
+        /// <summary>
+        /// 读取干混机Mix数据
+        /// </summary>
+        /// <param name="machineType"></param>
+        /// <param name="amount"></param>
+        /// <returns></returns>
+        private static List<DryMixerMix> readDryMixerMix(string machineType, int amount)
+        {
+            List<DryMixerMix> dryMixerMixes = new List<DryMixerMix>();
             for (int mix = 0; mix < 10; mix++)
             {
+                #region 实例化参数
                 BasePlcHelper.Instance.dryer_mixBatch = new Entity.DataKeyValue($"dryer{machineType}_mix{mix}_mixBatch");
                 BasePlcHelper.Instance.dryer_mixStep = new Entity.DataKeyValue($"dryer{machineType}_mix{mix}_mixStep");
                 BasePlcHelper.Instance.dryer_actCode = new Entity.DataKeyValue($"dryer{machineType}_mix{mix}_actCode");
                 BasePlcHelper.Instance.dryer_mixTime = new Entity.DataKeyValue($"dryer{machineType}_mix{mix}_mixTime");
                 BasePlcHelper.Instance.dryer_mixTemp = new Entity.DataKeyValue($"dryer{machineType}_mix{mix}_mixTemp");
                 BasePlcHelper.Instance.dryer_mixSpeed = new Entity.DataKeyValue($"dryer{machineType}_mix{mix}_mixSpeed");
+                #endregion
+
                 DryMixerMix dryMixerMix = new DryMixerMix()
                 {
                     eqNo = BasePlcHelper.Instance.dryer_eqNo.NowValue.ToInt(),
@@ -172,16 +150,10 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
                     mix = mix,
                     recordTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
                 };
-                    dryMixerMixes.Add( dryMixerMix );
+                dryMixerMixes.Add(dryMixerMix);
             }
-                _dryMixer.dos = dryMixerDoes;
+
-                _dryMixer.mix = dryMixerMixes;
+            return dryMixerMixes;
-            }
-            catch (Exception ex)
-            {
-                ICSharpCode.Core.LoggingService<GHFinshBatchHelper>.Error(String.Format("通过PLC读取干混机报表数读取异常：{0}", ex.Message), ex);
-            }
-            return _dryMixer;
         }
 
         /// <summary>
@@ -306,128 +278,5 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
                 ICSharpCode.Core.LoggingService<GHFinshBatchHelper>.Error(String.Format("保存干混机报表明细数据异常：{0}", ex.Message), ex);
             }
         }
-
-/*create table Report_DryMixer
-(
-    objId      int identity
-        primary key,
-    reportId   varchar(36),
-    eqNo       int,
-    batch      int,
-    matCode    int,
-    setValue   decimal(18, 4),
-    setToler   decimal(18, 4),
-    actValue   decimal(18, 4),
-    actToLer   decimal(18, 4),
-    dos        int,
-    recordTime datetime default getdate()
-)
-go
-
-exec sp_addextendedproperty 'MS_Description', N'干混机报表', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer'
-go
-
-exec sp_addextendedproperty 'MS_Description', N'主键标识', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer', 'COLUMN',
-     'objId'
-go
-
-exec sp_addextendedproperty 'MS_Description', N'报表标识', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer', 'COLUMN',
-     'reportId'
-go
-
-exec sp_addextendedproperty 'MS_Description', N'设备编号', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer', 'COLUMN', 'eqNo'
-go
-
-exec sp_addextendedproperty 'MS_Description', N'批次号', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer', 'COLUMN', 'batch'
-go
-
-exec sp_addextendedproperty 'MS_Description', N'物料代码', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer', 'COLUMN',
-     'matCode'
-go
-
-exec sp_addextendedproperty 'MS_Description', N'设定重量', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer', 'COLUMN',
-     'setValue'
-go
-
-exec sp_addextendedproperty 'MS_Description', N'设定公差', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer', 'COLUMN',
-     'setToler'
-go
-
-exec sp_addextendedproperty 'MS_Description', N'实际重量', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer', 'COLUMN',
-     'actValue'
-go
-
-exec sp_addextendedproperty 'MS_Description', N'实际公差', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer', 'COLUMN',
-     'actToLer'
-go
-
-exec sp_addextendedproperty 'MS_Description', N'dos编号', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer', 'COLUMN', 'dos'
-go
-
-exec sp_addextendedproperty 'MS_Description', N'记录时间', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer', 'COLUMN',
-     'recordTime'
-go
-
-
- create table Report_DryMixer_Detail
-(
-    objId      int identity
-        primary key,
-    reportId   varchar(36),
-    eqNo       int,
-    mixBatch   int,
-    mixStep    int,
-    actCode    int,
-    mixTime    int,
-    mixTemp    decimal(18, 4),
-    mixSpeed   decimal(18, 4),
-    mix        int,
-    recordTime datetime default getdate()
-)
-go
-
-exec sp_addextendedproperty 'MS_Description', N'主键标识', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer_Detail', 'COLUMN',
-     'objId'
-go
-
-exec sp_addextendedproperty 'MS_Description', N'报表标识', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer_Detail', 'COLUMN',
-     'reportId'
-go
-
-exec sp_addextendedproperty 'MS_Description', N'设备编号', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer_Detail', 'COLUMN',
-     'eqNo'
-go
-
-exec sp_addextendedproperty 'MS_Description', N'批次', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer_Detail', 'COLUMN',
-     'mixBatch'
-go
-
-exec sp_addextendedproperty 'MS_Description', N'步号', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer_Detail', 'COLUMN',
-     'mixStep'
-go
-
-exec sp_addextendedproperty 'MS_Description', N'动作', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer_Detail', 'COLUMN',
-     'actCode'
-go
-
-exec sp_addextendedproperty 'MS_Description', N'时间', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer_Detail', 'COLUMN',
-     'mixTime'
-go
-
-exec sp_addextendedproperty 'MS_Description', N'温度', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer_Detail', 'COLUMN',
-     'mixTemp'
-go
-
-exec sp_addextendedproperty 'MS_Description', N'速度', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer_Detail', 'COLUMN',
-     'mixSpeed'
-go
-
-exec sp_addextendedproperty 'MS_Description', N'mix编号', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer_Detail', 'COLUMN',
-     'mix'
-go
-
-exec sp_addextendedproperty 'MS_Description', N'记录时间', 'SCHEMA', 'dbo', 'TABLE', 'Report_DryMixer_Detail', 'COLUMN',
-     'recordTime'
-go*/
     }
 }