压机文件改名

SIMDP/SIMDP.BLL/BlProductData.cs

@@ -27,5 +27,12 @@ namespace SIMDP.BLL
             var list = dalData.GetList(sql, null);
             return list.Count > 0 ? list[0] : null;
         }
+        
+        public MoProductData FindbySerialNum(string serialNum)
+        {
+            string sql = string.Format($"SELECT TOP 1 * FROM product_data WHERE serialNum = '{serialNum}' order by data_id desc");
+            var list = dalData.GetList(sql, null);
+            return list.Count > 0 ? list[0] : null;
+        }
     }
 }

SIMDP/SIMDP.Project/RWS/PLC5.cs

@@ -5,20 +5,20 @@ using SIMDP.BLL;
 using SIMDP.Device;
 using SIMDP.Model;
 using System.IO;
-using static SIMDP.Project.ProductData;
 using SIMDP.Util;
 using System.Threading.Tasks;
+using SIMDP.Project.RWS;
 
 namespace SIMDP.Project
 {
-    /// <summary>
-    /// 小压溃主压机PLC
-    /// </summary>
     public class PLC5 : PlcMXComponent
     {
         #region 设备空间
 
+        private string plcname = "小压溃主压机PLC";
+
         bool pcHeartBeat = false;
+
         public override void actionTimer()
         {
             try
@@ -43,26 +43,28 @@ namespace SIMDP.Project
                             p.proc.Invoke(this, new object[] { value });
                     }
                 }
-                redis.Publish<string>(SysEnvironment.OpcDataChannel, "");
+                redis.Publish(SysEnvironment.OpcDataChannel, "");
             }
             catch (Exception ex)
             {
                 isConnect = false;
-                LogHelper.log.Error($"PLC5 通信异常，即将重连：{ex.Message}");
+                LogHelper.log.Error($"{plcname}通信异常，即将重连：{ex.Message}");
             }
         }
+
+        public override void actionConnected()
+        {
+            Write("主压机读取请求处理完成", false);
+        }
+
         #endregion
 
         #region 信号函数
 
-        /// <summary>
-        /// 根据PLC提供的流水号，定位并保存当前工件数据；查找CSV曲线是否生成，并改名；
-        /// </summary>
-        /// <param name="value"></param>
         public void 主压机读取请求(object value)
         {
             bool signal = Convert.ToBoolean(value);
-            LogHelper.log.Info($"PLC5 : signal ={signal}");
+            LogHelper.log.Info($"{plcname} signal ={signal}");
             if (!signal)
             {
                 Write("主压机读取请求处理完成", false);
@@ -75,47 +77,42 @@ namespace SIMDP.Project
             Read("主压机压装力", out float fforce);
             Read("主压机位移", out float ofdisplacement);
 
-            //short serialNum = 10443;
+            //short serialNum = 10437;
             //bool bok = true;
-            //float fforce= 0.0f;
-            //float ofdisplacement = 0.0f;
+            // float fforce = 12.3f;
+            // float ofdisplacement = 23.4f;
 
             //2 数据绑定：根据流水号查找本地生产数据表
             MoProductData model = BLLFactory<BlProductData>.Instance.FindbySerialNum(serialNum);
             if (model == null)
             {
-                LogHelper.log.Error($"PLC5: 存储压装数据失败，无法找到当前工件的上料信息，流水号 {serialNum}");
-                //Write("主压机读取请求处理完成", true);不给完成，等PLC超时报警
+                Tool.LogAndNotice("绑定数据错误", 3, $"数据库查询不到{serialNum}");
+                LogHelper.log.Error($"{plcname} 存储压装数据失败，无法找到当前工件的上料信息，流水号 {serialNum}");
                 return;
             }
-            ProductionData_YKLG data = new ProductionData_YKLG();
+            ProductData.ProductionData_YKLG data = new ProductData.ProductionData_YKLG();
             data.LoadData(model);
             data.dict["主压机压装力"] = fforce.ToString();
             data.dict["主压机工件尺寸"] = ofdisplacement.ToString();
             data.dict["主压机结果"] = bok == true ? "OK" : "NG";
-            data.model.RuleTime = DateTime.Now;//更新的时间
+            data.model.RuleTime = DateTime.Now;
             BLLFactory<BlProductData>.Instance.Update(data.toModel(), model.DataId);
 
+            //3 反馈完成
+            Write("主压机读取请求处理完成", true);
+
+            //4 延时执行改名操作
             Task task = Task.Factory.StartNew(async () =>
             {
                 await Task.Delay(5000);
 
-                //2.1 csv文件改名
-                string csvPath = Tool.SearchLatestFile(serialNum, SysEnvironment.CSV_ExportPath);
-                if (string.IsNullOrEmpty(csvPath))
+                bool bres = PressHelper.FindNewUpload(serialNum.ToString(), SysEnvironment.CSV_ExportPath, out string newfile);
+                if (bres)
                 {
-                    Tool.LogAndNotice("找不到文件", 3, $"无法找到当前工件({serialNum})的压机数据");
-                    LogHelper.log.Error($"PLC5 无法找到CSV文件，流水号：({model.SerialNum})");
-                    Write("主压机读取请求处理完成", true);
-                    return;
+                    FileInfo fi = new FileInfo(newfile);
+                    PressHelper.RenameCSV(fi, data.dict["备注"], data.dict["图号"], serialNum.ToString());
                 }
-                string newName = data.dict["备注"] + '_' + data.dict["图号"] + '_' + DateTime.Now.ToString("yyyy-MM-dd-hh-mm") + '_' + serialNum + ".csv";
-                newName = csvPath.Substring(0, csvPath.LastIndexOf('\\')) + '\\' + newName;
-                File.Move(csvPath, newName);
             });
-
-            //3 反馈完成
-            Write("主压机读取请求处理完成", true);
         }
 
         #endregion

SIMDP/SIMDP.Project/RWS/PLC6.cs

@@ -8,6 +8,7 @@ using System.IO;
 using static SIMDP.Project.ProductData;
 using SIMDP.Util;
 using System.Threading.Tasks;
+using SIMDP.Project.RWS;
 
 namespace SIMDP.Project
 {
@@ -117,7 +118,7 @@ namespace SIMDP.Project
                 }
                 string newName = data.dict["备注"] + '_' + data.dict["图号"] + '_' + DateTime.Now.ToString("yyyy-MM-dd-hh-mm") + '_' + serialNum + ".csv";
                 newName = csvPath.Substring(0, csvPath.LastIndexOf('\\')) + '\\' + newName;
-                File.Move(csvPath, newName);
+                File.Move(csvPath, PressHelper.ReplaceInvalidChar(newName));
             });
 
             //3 反馈完成

SIMDP/SIMDP.Project/RWS/PLC7.cs

@@ -8,6 +8,7 @@ using System.IO;
 using static SIMDP.Project.ProductData;
 using SIMDP.Util;
 using System.Threading.Tasks;
+using SIMDP.Project.RWS;
 
 namespace SIMDP.Project
 {
@@ -113,7 +114,7 @@ namespace SIMDP.Project
                 }
                 string newName = data.dict["备注"] + '_' + data.dict["图号"] + '_' + DateTime.Now.ToString("yyyy-MM-dd-hh-mm") + '_' + serialNum + ".csv";
                 newName = csvPath.Substring(0, csvPath.LastIndexOf('\\')) + '\\' + newName;
-                File.Move(csvPath, newName);
+                File.Move(csvPath, PressHelper.ReplaceInvalidChar(newName));
             });
 
             //3 反馈完成

SIMDP/SIMDP.Project/RWS/PLC8.cs

@@ -8,6 +8,7 @@ using System.IO;
 using static SIMDP.Project.ProductData;
 using SIMDP.Util;
 using System.Threading.Tasks;
+using SIMDP.Project.RWS;
 
 namespace SIMDP.Project
 {
@@ -113,7 +114,7 @@ namespace SIMDP.Project
                 }
                 string newName = data.dict["备注"] + '_' + data.dict["图号"] + '_' + DateTime.Now.ToString("yyyy-MM-dd-hh-mm") + '_' + serialNum + ".csv";
                 newName = csvPath.Substring(0, csvPath.LastIndexOf('\\')) + '\\' + newName;
-                File.Move(csvPath, newName);
+                File.Move(csvPath, PressHelper.ReplaceInvalidChar(newName));
             });
 
             //3 反馈完成

SIMDP/SIMDP.Project/RWS/PressHelper.cs

@@ -0,0 +1,98 @@
+using ProjectBase.Data.BaseDAL;
+using ProjectBase.Data.Logs;
+using SIMDP.BLL;
+using SIMDP.Model;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using static SIMDP.Project.ProductData;
+
+namespace SIMDP.Project.RWS
+{
+    public class PressHelper
+    {
+        public static bool FindNewUpload(string serialnum, string csvExportPath,out string newfile)
+        {
+            newfile = "";
+
+            if (!Directory.Exists(csvExportPath))
+            {
+                Tool.LogAndNotice("找不到路径", 3, $"CSV导出路径 {csvExportPath} 不存在");
+                return false;
+            }
+            string[] files = Directory.GetFiles(csvExportPath, "*.csv", SearchOption.AllDirectories);
+            if (files.Length == 0) return true;
+
+            foreach(string sf in files)
+            {
+                
+                FileInfo fi = new FileInfo(sf);
+                if (fi.CreationTime.Date == DateTime.Now.Date)
+                {
+                    if (fi.Name.Contains(serialnum))
+                    {
+                        newfile = sf;
+                        return true;
+                    }
+                }
+            }
+            Tool.LogAndNotice("找不到文件", 3, $"无法找到 {serialnum}的曲线数据文件");
+            LogHelper.log.Error($"查找不到CSV文件，流水号：{serialnum}");
+            return false;
+        }
+
+        public static void RenameCSV(FileInfo fi,string remark,string tuhao,string serialnum)
+        {
+            string newname = remark + '_' + tuhao + '_' + fi.CreationTime.ToString("yyyy-MM-dd-hh-mm") + '_' + serialnum;
+            fi.MoveTo(Path.Combine(fi.DirectoryName + @"\" + ReplaceInvalidChar(newname) + fi.Extension));
+        }
+
+        public static bool RenameAllCSV(string csvExportPath = "")
+        {
+            if (!Directory.Exists(csvExportPath))
+            {
+                Tool.LogAndNotice("找不到路径", 3, $"CSV导出路径不存在:{csvExportPath}");
+                return false;
+            }
+
+            string[] files = Directory.GetFiles(csvExportPath, "*.csv", SearchOption.AllDirectories);
+            if (files.Length == 0) return true;
+
+            foreach (string sf in files)
+            {
+                FileInfo fi = new FileInfo(sf);
+
+                string serialnum = "";
+                if (fi.Name.StartsWith("_") && !fi.Name.StartsWith("__") && fi.Name.Length > 5)
+                {
+                    serialnum = fi.Name.Substring(1, 5);
+                }
+                if (serialnum == "") continue;
+                MoProductData model = BLLFactory<BlProductData>.Instance.FindbySerialNum(serialnum);
+                if (model == null) continue;
+                ProductionData_YKLG data = new ProductionData_YKLG();
+                data.LoadData(model);
+
+                string newName = data.dict["备注"] + '_' + data.dict["图号"] + '_' + fi.CreationTime.ToString("yyyy-MM-dd-hh-mm") + '_' + serialnum;
+
+                fi.MoveTo(Path.Combine(fi.DirectoryName + @"\" + ReplaceInvalidChar(newName) + fi.Extension));
+
+            }
+            return true;
+        }
+
+        private static string invalidChars = new string(Path.GetInvalidFileNameChars()) + new string(Path.GetInvalidPathChars());                                                                                                                            //string invalid = new string(Path.GetInvalidFileNameChars()) + new string(Path.GetInvalidPathChars());
+        public static string ReplaceInvalidChar(string path)
+        {
+            foreach (char c in invalidChars)
+            {
+                path = path.Replace(c.ToString(), "");
+            }
+            return path;
+        }
+
+    }
+}

SIMDP/SIMDP.Project/RWS/ProductData.cs

@@ -1,22 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using ProjectBase.Data.BaseDAL;
-using ProjectBase.Data.Logs;
-using SIMDP.BLL;
-using SIMDP.Device;
 using SIMDP.Model;
-using SIMDP.Util;
-using ACTMULTILib;
 
 namespace SIMDP.Project
 {
-
     public class ProductData
     {
-
         public class ProductionData_YKLG
 
         {

SIMDP/SIMDP.Project/SIMDP.Project.csproj

@@ -97,6 +97,7 @@
     <Compile Include="RWS\PLC7.cs" />
     <Compile Include="RWS\PLC8.cs" />
     <Compile Include="RWS\PLC6.cs" />
+    <Compile Include="RWS\PressHelper.cs" />
     <Compile Include="RWS\ProductData.cs" />
     <Compile Include="RWS\PLC5.cs" />
     <Compile Include="Demo\OpcDaDemo.cs" />

SIMDP/SIMDP.View/BasicForms/FormSystemParameter.Designer.cs

@@ -28,6 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormSystemParameter));
             this.gridControlPara = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -44,6 +45,7 @@
             this.repositoryItemHyperLinkAlter_Click = new DevExpress.XtraEditors.Repository.RepositoryItemHyperLinkEdit();
             this.simpleButtonAdd = new DevExpress.XtraEditors.SimpleButton();
             this.simpleButtonAllDelete = new DevExpress.XtraEditors.SimpleButton();
+            this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
             ((System.ComponentModel.ISupportInitialize)(this.gridControlPara)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemHyperLinkDelete)).BeginInit();
@@ -55,15 +57,13 @@
             this.gridControlPara.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.gridControlPara.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.gridControlPara.Location = new System.Drawing.Point(-3, 58);
+            this.gridControlPara.Location = new System.Drawing.Point(-2, 37);
             this.gridControlPara.MainView = this.gridView1;
-            this.gridControlPara.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.gridControlPara.Name = "gridControlPara";
             this.gridControlPara.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemHyperLinkDelete,
             this.repositoryItemHyperLinkAlter_Click});
-            this.gridControlPara.Size = new System.Drawing.Size(1179, 484);
+            this.gridControlPara.Size = new System.Drawing.Size(825, 308);
             this.gridControlPara.TabIndex = 0;
             this.gridControlPara.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -84,6 +84,8 @@
             this.gridColumn9,
             this.gridColumn10,
             this.gridColumn11});
+            this.gridView1.DetailHeight = 223;
+            this.gridView1.FixedLineWidth = 1;
             this.gridView1.GridControl = this.gridControlPara;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -99,9 +101,11 @@
             this.gridColumn1.AppearanceCell.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
             this.gridColumn1.Caption = "参数编码";
             this.gridColumn1.FieldName = "ParameterId";
+            this.gridColumn1.MinWidth = 14;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
             this.gridColumn1.VisibleIndex = 0;
+            this.gridColumn1.Width = 52;
             // 
             // gridColumn2
             // 
@@ -110,9 +114,11 @@
             this.gridColumn2.AppearanceCell.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
             this.gridColumn2.Caption = "参数名称";
             this.gridColumn2.FieldName = "ParameterName";
+            this.gridColumn2.MinWidth = 14;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 1;
+            this.gridColumn2.Width = 52;
             // 
             // gridColumn3
             // 
@@ -121,10 +127,11 @@
             this.gridColumn3.AppearanceCell.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
             this.gridColumn3.Caption = "参数类型";
             this.gridColumn3.FieldName = "ParameterType";
+            this.gridColumn3.MinWidth = 14;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
             this.gridColumn3.VisibleIndex = 2;
-            this.gridColumn3.Width = 78;
+            this.gridColumn3.Width = 55;
             // 
             // gridColumn5
             // 
@@ -133,9 +140,11 @@
             this.gridColumn5.AppearanceCell.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
             this.gridColumn5.Caption = "参数值";
             this.gridColumn5.FieldName = "ParameterValue";
+            this.gridColumn5.MinWidth = 14;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.Visible = true;
             this.gridColumn5.VisibleIndex = 3;
+            this.gridColumn5.Width = 52;
             // 
             // gridColumn6
             // 
@@ -144,9 +153,11 @@
             this.gridColumn6.AppearanceCell.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
             this.gridColumn6.Caption = "参数单位";
             this.gridColumn6.FieldName = "ParameterUnit";
+            this.gridColumn6.MinWidth = 14;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 4;
+            this.gridColumn6.Width = 52;
             // 
             // gridColumn7
             // 
@@ -155,10 +166,11 @@
             this.gridColumn7.AppearanceCell.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
             this.gridColumn7.Caption = "是否生效";
             this.gridColumn7.FieldName = "ParameterValid";
+            this.gridColumn7.MinWidth = 14;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Visible = true;
             this.gridColumn7.VisibleIndex = 5;
-            this.gridColumn7.Width = 78;
+            this.gridColumn7.Width = 55;
             // 
             // gridColumn8
             // 
@@ -167,10 +179,11 @@
             this.gridColumn8.AppearanceCell.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
             this.gridColumn8.Caption = "生效时间";
             this.gridColumn8.FieldName = "ParameterTime";
+            this.gridColumn8.MinWidth = 14;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
             this.gridColumn8.VisibleIndex = 6;
-            this.gridColumn8.Width = 78;
+            this.gridColumn8.Width = 55;
             // 
             // gridColumn9
             // 
@@ -179,9 +192,11 @@
             this.gridColumn9.AppearanceCell.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
             this.gridColumn9.Caption = "参数描述";
             this.gridColumn9.FieldName = "ParameterDescription";
+            this.gridColumn9.MinWidth = 14;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Visible = true;
             this.gridColumn9.VisibleIndex = 7;
+            this.gridColumn9.Width = 52;
             // 
             // gridColumn10
             // 
@@ -190,10 +205,11 @@
             this.gridColumn10.AppearanceCell.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
             this.gridColumn10.Caption = "删除操作";
             this.gridColumn10.ColumnEdit = this.repositoryItemHyperLinkDelete;
+            this.gridColumn10.MinWidth = 14;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
             this.gridColumn10.VisibleIndex = 8;
-            this.gridColumn10.Width = 45;
+            this.gridColumn10.Width = 31;
             // 
             // repositoryItemHyperLinkDelete
             // 
@@ -212,9 +228,11 @@
             this.gridColumn11.AppearanceCell.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
             this.gridColumn11.Caption = "修改操作";
             this.gridColumn11.ColumnEdit = this.repositoryItemHyperLinkAlter_Click;
+            this.gridColumn11.MinWidth = 14;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
             this.gridColumn11.VisibleIndex = 9;
+            this.gridColumn11.Width = 52;
             // 
             // repositoryItemHyperLinkAlter_Click
             // 
@@ -225,35 +243,45 @@
             // 
             // simpleButtonAdd
             // 
-            this.simpleButtonAdd.ImageUri.Uri = "Add;Size16x16";
-            this.simpleButtonAdd.Location = new System.Drawing.Point(300, 13);
-            this.simpleButtonAdd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.simpleButtonAdd.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("simpleButtonAdd.ImageOptions.Image")));
+            this.simpleButtonAdd.ImageOptions.ImageUri.Uri = "Add;Size16x16";
+            this.simpleButtonAdd.Location = new System.Drawing.Point(210, 8);
             this.simpleButtonAdd.Name = "simpleButtonAdd";
-            this.simpleButtonAdd.Size = new System.Drawing.Size(107, 36);
+            this.simpleButtonAdd.Size = new System.Drawing.Size(75, 23);
             this.simpleButtonAdd.TabIndex = 1;
             this.simpleButtonAdd.Text = "添加";
             this.simpleButtonAdd.Click += new System.EventHandler(this.simpleButtonAdd_Click);
             // 
             // simpleButtonAllDelete
             // 
-            this.simpleButtonAllDelete.ImageUri.Uri = "Cancel;Size16x16";
-            this.simpleButtonAllDelete.Location = new System.Drawing.Point(600, 13);
-            this.simpleButtonAllDelete.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.simpleButtonAllDelete.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("simpleButtonAllDelete.ImageOptions.Image")));
+            this.simpleButtonAllDelete.ImageOptions.ImageUri.Uri = "Cancel;Size16x16";
+            this.simpleButtonAllDelete.Location = new System.Drawing.Point(420, 8);
             this.simpleButtonAllDelete.Name = "simpleButtonAllDelete";
-            this.simpleButtonAllDelete.Size = new System.Drawing.Size(107, 36);
+            this.simpleButtonAllDelete.Size = new System.Drawing.Size(75, 23);
             this.simpleButtonAllDelete.TabIndex = 2;
             this.simpleButtonAllDelete.Text = "全部删除";
             this.simpleButtonAllDelete.Click += new System.EventHandler(this.simpleButtonAllDelete_Click);
             // 
+            // simpleButton1
+            // 
+            this.simpleButton1.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("simpleButton1.ImageOptions.Image")));
+            this.simpleButton1.Location = new System.Drawing.Point(632, 8);
+            this.simpleButton1.Name = "simpleButton1";
+            this.simpleButton1.Size = new System.Drawing.Size(85, 23);
+            this.simpleButton1.TabIndex = 3;
+            this.simpleButton1.Text = "CSV重命名";
+            this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
+            // 
             // FormSystemParameter
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1178, 544);
+            this.ClientSize = new System.Drawing.Size(825, 346);
+            this.Controls.Add(this.simpleButton1);
             this.Controls.Add(this.simpleButtonAllDelete);
             this.Controls.Add(this.simpleButtonAdd);
             this.Controls.Add(this.gridControlPara);
-            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.Name = "FormSystemParameter";
             this.Text = "系统参数";
             this.Load += new System.EventHandler(this.FormSystemParameter_Load);
@@ -283,5 +311,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
         private DevExpress.XtraEditors.Repository.RepositoryItemHyperLinkEdit repositoryItemHyperLinkAlter_Click;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraEditors.SimpleButton simpleButton1;
     }
 }

SIMDP/SIMDP.View/BasicForms/FormSystemParameter.cs

@@ -6,6 +6,8 @@ using ProjectBase.Data.BaseDAL;
 using ProjectBase.Data.Logs;
 using SIMDP.BLL;
 using SIMDP.Model;
+using SIMDP.Project;
+using SIMDP.Project.RWS;
 using SIMDP.Util;
 using System;
 using System.Collections.Generic;
@@ -135,5 +137,13 @@ namespace SIMDP
                 LogHelper.log.Error(string.Format("删除系统参数数据出现错误：{0}", ex));
             }
         }
+
+        private void simpleButton1_Click(object sender, EventArgs e)
+        {
+           MoSystemParameter model= BLLFactory<BlSystemParameter>.Instance.FindSingle($"parameter_name = 'CsvExportPath'");
+            if (model == null) return;
+
+            PressHelper.RenameAllCSV(model.ParameterValue);
+        }
     }
 }

SIMDP/SIMDP.View/BasicForms/FormSystemParameter.resx

@@ -117,4 +117,57 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="simpleButtonAdd.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABt0RVh0VGl0
+        bGUAQWRkO1BsdXM7QmFycztSaWJib247lQYzLwAAA3VJREFUOE9VkmtMU2cYxw+Q6GQfxvZxH3RZYqK7
+        dIaZRU3MMi/zFswWxOLmgplzXphTi1iL3IZEV2EWUSCbNOlwqMitgloOFzUdjBSplFsRhLZQLocDtvRG
+        sWX57znv5oed5J88ed7/7/8875vDDflfMtEXQYpMLuA/OF1qUiu15k6lzuI5q+tyKbWd5pTf/spLyr75
+        LnmiJO8gMZK44UCIwbGbE5eeLG7XqMq6F8tax9AwMAPztB9PRT/4Z7O40eaE6neL9+gvTYfJv0Ri/mO5
+        iDWfyZf+UNTeoKkfRO+LICyuBZhmgmgV5tFG6pj9t2cW/MirHcCxQmP9ivfWvS6xUkDUEY2xMF8/gF73
+        AniHDwa7D0mXeHyaXM6UdKkR/KgfLWN+9HtCKKBBB9V8PrFLuARl+fvHi02LnUIAlVY3ap55oB/yMtDU
+        ZcOTbjur64Z90D/3oJrOzWIQipKO0I7vL8u4/bmNJdqmEVT0ulDW5UJ5jwsV1jkGTYlzCC/+zeo7Vg9u
+        98+x81t9bpQZHZBn1Gq4r3JaLFXmaRS3i9iba2DmV5oQPfDNh/7Xk5Pn1w4R1d0zSMxu6OMSsppndaZp
+        qB9OMENHjwOdvaPo6ndiXPTC7VvAoF1E39AkBm3T2HLqDvIfT0FLIQmZjS7uizTeq3nkRG7TOAuYnPGx
+        qYJ7HuJcEIFgGP5gCD6Sl/pbFZW42DKBPBr4pcrg4nYq6nrO1w/jJ4MT+y40YvPJCmb6PKUKky8CLGxb
+        ajV2ntVjV9pdfHvFiPP8ODLv2rD9RI2F23T4ZtGJ62ZkG8agpuQrxilc/VNg29gmPfAEXrK1r7UKrJ//
+        aAJZhlH8WGrBxgPX8zhZXFbsdsW9UEadHWmkc/UOZNx3sADRHYCL3kDaKPPBGNLvOXCOpNLbsCv1QXjl
+        xkMfST/Sa5/s1xbFZz9EOsFn9HYoab09OQY2WYL3/dwMFYUrJREcn/MYHycWFRIbLQVERr/1Tszar3V8
+        XHozlDUjFGJDDl3pYpMTF5qdVI/idK0Nisrn2J3ZQnDpfeJiJJYTw5BCopbFLH9TFl9csuG7qpBc3Ybj
+        N6xIrR0hcATJf1ixl3rrD1UGVu3ITSH/GxIjSKy4iFchkaToFeuT163eXXBNlqDtlsl1Ikn4cE+pZVXc
+        5atvx36zhjzLSBESLITB/QMgLpTXht/PJgAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="simpleButtonAllDelete.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACN0RVh0VGl0
+        bGUAQ2FuY2VsO1N0b3A7RXhpdDtCYXJzO1JpYmJvbjtMlpayAAADmklEQVQ4TyWTf1CTdRzHvwim2KS6
+        0k5iXWAbIg6GbG2gHmPGhMEs+CMsT70yE1BGx3F5kCReFE7uNAMu7og6MBFk/LCEOZ15WUkXw8aAcgsE
+        +SHC9mzABtuR3rvv8/C9ez33vs/n834/3+9zz5d4TK3Ec7uDeO9cJXQF/pZ7RGQrKqh6cKLQMl5c9ISF
+        1X8XamsMHxwU05kgSoDHpCcLxhZCA/SsMYCy2qrNKx799BP/7Ldfw93eAM/tTngp7vZGzNRXYezkCb/5
+        2NFSOruWsooLoCtAK5fxho7nmcYryuC51Y757ouY66iHq6UGruYauNvqMPdTI+jLMHH2cwwcz/1FEyl8
+        gQ1hA4LMHx7+ZrS8lBovwVKUj7pwEYyZmXA2noOz4RxuZmVxNUvhMS5o7Msy/HH4/cvUu5Z0ZmVKrbk5
+        Txj9d7hXkIMG1TswdZvRnFOCbnUGDOkaTpu6ermeOf8juK7UwZqf97Q+NTWJmDI0tSNfnMTj2grU8aPw
+        wD4Fh2sJ9lEGLdrTHPepnnZ6MWyb4mamq8sxcroEhrR0Pbm5Rz1sP/ouRrT7cUPzFv7UnYd36T84532w
+        PWRgG2MwO+fDwuIy1zNq9mI4Lxu2I9m4oUp7SK4rVMv/ZKdg6O0dsB+iW969Gz26C5hx+zBDd/LYTWF8
+        +L3iKxiUStw/kIbBjAQMZiXBoEhZJlflScuW1DcwoJZhaG8irkm2w3jqLN3yEh45FzHl8FKWcL1Uh2vx
+        2zGQLod1jxT9KglYL2kSy8d6lSuFrthtaPu4DAP/OjA56wWz4AMz78f4jBf99lnoC06hKyYaljfj0KsQ
+        oylWNkVqheLvTTtksCjFuBQuhHPaiUnHIlwLfvRfqOZYCfHA8cjJzfyVFIOfEyWoFsR2kqLQiF0Xo+Ke
+        mnduw12lHLcOHIKfYXBPVwmjLJ4i4TRbY3t3k2XoS4zGD1vEyH/5NTX7IwVXviK8fCVyKyzJsehJlqJV
+        GAmTLI5+Fzl3ZlaztR6FFBZFDPSRUTizScBenvVswKqta9ZtqNy4ua8pQgDzLhE1JaA/RYK+hCjKFnrm
+        eAyqE9C3U4TmzQKc2RhhFa15lk+9gWSi4D02JDD+Gd6msuf4LVUbwtEuiMAd8evoldJAyq9Ud9BaNe19
+        9jz/x+jVwa9ST9C4dh8h7IMTKxeDd3DdS6oSXmhreUjYhC6ED11IGMrXh00W80Lb9ge/qKEzIZTAFd8+
+        8j91kUbX3K/WKgAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="simpleButton1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAHXRFWHRUaXRsZQBFeHBvcnQ7
+        Q1NWO0V4cG9ydFRvQ1NWO2FoWvAAAAB2SURBVDhP3ZLRCYAwDESd2gmygyO4gyv46UBnr3illQRS/PPB
+        cTQtjyAuAIaYGWbiCrL8VVCSpgrWfcNsRBMc1/mMUB+8z16TJiBsJTr3TUKBNmD3932TUKBo7jUJv4HQ
+        Bt5GpAlmI6qg9Lf/oPQQDrOEgnwMN8C+SBPMU4AvAAAAAElFTkSuQmCC
+</value>
+  </data>
 </root>

SIMDP/SIMDP.View/FormCopulerRequest.cs

@@ -268,12 +268,7 @@ namespace SIMDP
         RedisHelper redis = new RedisHelper();
         private void gridControl_CopulerRequest_KeyDown(object sender, KeyEventArgs e)
         {
-            if (e.Control && e.KeyCode == Keys.P && e.Alt && e.Shift)
-            {
-                // MessageBox.Show("weewrwe");
-                redis.SetString(SysEnvironment.redis_AllowProduce, "1");
-                SysEnvironment.allowProduce = true;
-            }
+          
         }
 
         private void FormCopulerRequest_KeyDown(object sender, KeyEventArgs e)

SIMDP/SIMDP.View/MainForm.cs

@@ -15,6 +15,7 @@ using ProjectBase.Data.BaseDAL;
 using SIMDP.Project;
 using static System.Reflection.MethodBase;
 using Oracle.ManagedDataAccess.Client;
+using SIMDP.Project.RWS;
 
 namespace SIMDP
 {
@@ -58,15 +59,11 @@ namespace SIMDP
 
         private void MainForm_Load(object sender, EventArgs e)
         {
-
-            redis.SetString(SysEnvironment.redis_AllowProduce, "true");
-
-            //ToDo:最小化托盘显示
-            this.notifyIcon1.Visible = true;
-            this.ribbonControl.Minimized = false;//菜单展开
+            notifyIcon1.Visible = true;
+            ribbonControl.Minimized = false;
             scheduler.Start();
             GetIpMac();
-            this.label_Version.Caption = "当前版本号：" + System.Configuration.ConfigurationManager.AppSettings["Version"];
+            label_Version.Caption = "当前版本号：" + System.Configuration.ConfigurationManager.AppSettings["Version"];
             string defaultUser = System.Configuration.ConfigurationManager.AppSettings["DefaultUser"];
 
             //if (!string.IsNullOrEmpty(defaultUser))
@@ -85,13 +82,17 @@ namespace SIMDP
 
             LogIn();
             SysSubscribeEvent();
+
+            //PLC5 plc5 = new PLC5();
+            //plc5. 主压机读取请求(true);
+
+
+            //MoSystemParameter model = BLLFactory<BlSystemParameter>.Instance.FindSingle($"parameter_name = 'CsvExportPath'");
+            //if (model == null) return;
+            //PressHelper.FindNewUpload("10437", model.ParameterValue, out string newfile);
+
             barButtonItemReset_ItemClick(this, null);
-            if (DateTime.Now > Convert.ToDateTime("2023-1-20"))
-            {
-                redis.KeyDelete(SysEnvironment.redis_AllowProduce);
-            }
-            string ss = redis.GetString(SysEnvironment.redis_AllowProduce);
-            if (!string.IsNullOrEmpty(ss)) SysEnvironment.allowProduce = true;
+           
         }
 
         private void GetIpMac()
@@ -521,6 +522,7 @@ namespace SIMDP
                 mo.NoticeContent = arr[2];
                 mo.NoticeTime = Convert.ToDateTime(arr[3]);
                 mo.NoticeSign = Convert.ToBoolean(arr[4]);
+                mo.NoticeOperator = "";
                 BLLFactory<BlSystemNotice>.Instance.Insert(mo);
                 if (this.InvokeRequired)
                 {

SIMDP/SIMDP.View/Program.cs

@@ -4,6 +4,10 @@ using DevExpress.UserSkins;
 using DevExpress.Skins;
 using ProjectBase.Data.Logs;
 using System.Threading;
+using SIMDP.Model;
+using ProjectBase.Data.BaseDAL;
+using SIMDP.BLL;
+using SIMDP.Project.RWS;
 
 namespace SIMDP
 {
@@ -38,9 +42,18 @@ namespace SIMDP
             Application.ThreadException += new System.Threading.ThreadExceptionEventHandler(Application_ThreadException);
             AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
 
-            Application.Run(new MainForm());
 
 
+            //MoSystemParameter model = BLLFactory<BlSystemParameter>.Instance.FindSingle($"parameter_name = 'CsvExportPath'");
+            //if (model == null) return;
+
+            ////PressHelper.RenameAllCSV(model.ParameterValue);
+
+            //PressHelper.FindNewUpload("10437", model.ParameterValue, out string newfile);
+           
+
+            Application.Run(new MainForm());
+
         }
         static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
@@ -51,7 +64,5 @@ namespace SIMDP
         {
             LogHelper.log.Debug(e.Exception.Message);
         }
-
-
     }
 }