feat - 小添加

master
SoulStar 4 months ago
parent 0d742100c5
commit e3c6b54e7a

@ -92,14 +92,14 @@ namespace HighWayIot.Common.LANConnectConfig
/// <returns></returns> /// <returns></returns>
public bool MoveFile(string sourcePath, string targetPath, string fileName) public bool MoveFile(string sourcePath, string targetPath, string fileName)
{ {
// 3. 剪切(移动)文件到另一个网络文件夹
string moveFileSource = Path.Combine(sourcePath, fileName); string moveFileSource = Path.Combine(sourcePath, fileName);
string moveFileTarget = Path.Combine(targetPath, fileName); string moveFileTarget = Path.Combine(targetPath, fileName);
try try
{ {
// 先创建一个待移动的文件 // 查看源目录是否存在文件
if (File.Exists(moveFileSource)) if (File.Exists(moveFileSource))
{ {
// 查看目标目录是否存在同名文件,存在就删除
if (File.Exists(moveFileTarget)) if (File.Exists(moveFileTarget))
{ {
File.Delete(moveFileTarget); // 目标存在就先删除,避免冲突 File.Delete(moveFileTarget); // 目标存在就先删除,避免冲突

@ -111,25 +111,4 @@ namespace HighWayIot.Common.XmlConfig
} }
} }
} }
public class RoleConfig
{
/// <summary>
/// 页面名称
/// </summary>
public string PageName { get; set; }
/// <summary>
/// 规则编号
/// </summary>
public int RoleIndex { get; set; }
}
public class ExportPathConfig
{
public string ExportConfig { get; set; }
public string Config { get; set; }
}
} }

@ -33,7 +33,6 @@ namespace HighWayIot.Winform.MainForm
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
this.StartWeightButon = new System.Windows.Forms.Button();
this.UploadResultButton = new System.Windows.Forms.Button(); this.UploadResultButton = new System.Windows.Forms.Button();
this.LogBox = new System.Windows.Forms.ListBox(); this.LogBox = new System.Windows.Forms.ListBox();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
@ -50,20 +49,10 @@ namespace HighWayIot.Winform.MainForm
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// StartWeightButon
//
this.StartWeightButon.Font = new System.Drawing.Font("宋体", 12F);
this.StartWeightButon.Location = new System.Drawing.Point(108, 333);
this.StartWeightButon.Name = "StartWeightButon";
this.StartWeightButon.Size = new System.Drawing.Size(93, 46);
this.StartWeightButon.TabIndex = 0;
this.StartWeightButon.Text = "开始称重";
this.StartWeightButon.UseVisualStyleBackColor = true;
//
// UploadResultButton // UploadResultButton
// //
this.UploadResultButton.Font = new System.Drawing.Font("宋体", 12F); this.UploadResultButton.Font = new System.Drawing.Font("宋体", 12F);
this.UploadResultButton.Location = new System.Drawing.Point(253, 333); this.UploadResultButton.Location = new System.Drawing.Point(191, 229);
this.UploadResultButton.Name = "UploadResultButton"; this.UploadResultButton.Name = "UploadResultButton";
this.UploadResultButton.Size = new System.Drawing.Size(93, 46); this.UploadResultButton.Size = new System.Drawing.Size(93, 46);
this.UploadResultButton.TabIndex = 1; this.UploadResultButton.TabIndex = 1;
@ -82,6 +71,9 @@ namespace HighWayIot.Winform.MainForm
// //
// groupBox1 // groupBox1
// //
this.groupBox1.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.groupBox1.Controls.Add(this.LogBox); this.groupBox1.Controls.Add(this.LogBox);
this.groupBox1.Location = new System.Drawing.Point(466, 12); this.groupBox1.Location = new System.Drawing.Point(466, 12);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
@ -94,7 +86,7 @@ namespace HighWayIot.Winform.MainForm
// //
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("宋体", 12F); this.label1.Font = new System.Drawing.Font("宋体", 12F);
this.label1.Location = new System.Drawing.Point(114, 292); this.label1.Location = new System.Drawing.Point(114, 186);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(71, 16); this.label1.Size = new System.Drawing.Size(71, 16);
this.label1.TabIndex = 4; this.label1.TabIndex = 4;
@ -103,7 +95,7 @@ namespace HighWayIot.Winform.MainForm
// WeightResultTextBox // WeightResultTextBox
// //
this.WeightResultTextBox.Font = new System.Drawing.Font("宋体", 12F); this.WeightResultTextBox.Font = new System.Drawing.Font("宋体", 12F);
this.WeightResultTextBox.Location = new System.Drawing.Point(191, 288); this.WeightResultTextBox.Location = new System.Drawing.Point(191, 182);
this.WeightResultTextBox.Name = "WeightResultTextBox"; this.WeightResultTextBox.Name = "WeightResultTextBox";
this.WeightResultTextBox.Size = new System.Drawing.Size(145, 26); this.WeightResultTextBox.Size = new System.Drawing.Size(145, 26);
this.WeightResultTextBox.TabIndex = 5; this.WeightResultTextBox.TabIndex = 5;
@ -112,7 +104,7 @@ namespace HighWayIot.Winform.MainForm
// //
this.WeightCountComboBox.Font = new System.Drawing.Font("宋体", 12F); this.WeightCountComboBox.Font = new System.Drawing.Font("宋体", 12F);
this.WeightCountComboBox.FormattingEnabled = true; this.WeightCountComboBox.FormattingEnabled = true;
this.WeightCountComboBox.Location = new System.Drawing.Point(191, 219); this.WeightCountComboBox.Location = new System.Drawing.Point(191, 127);
this.WeightCountComboBox.Name = "WeightCountComboBox"; this.WeightCountComboBox.Name = "WeightCountComboBox";
this.WeightCountComboBox.Size = new System.Drawing.Size(145, 24); this.WeightCountComboBox.Size = new System.Drawing.Size(145, 24);
this.WeightCountComboBox.TabIndex = 6; this.WeightCountComboBox.TabIndex = 6;
@ -121,7 +113,7 @@ namespace HighWayIot.Winform.MainForm
// //
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("宋体", 12F); this.label2.Font = new System.Drawing.Font("宋体", 12F);
this.label2.Location = new System.Drawing.Point(114, 222); this.label2.Location = new System.Drawing.Point(114, 130);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(71, 16); this.label2.Size = new System.Drawing.Size(71, 16);
this.label2.TabIndex = 7; this.label2.TabIndex = 7;
@ -147,6 +139,7 @@ namespace HighWayIot.Winform.MainForm
// //
// TestButton // TestButton
// //
this.TestButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.TestButton.Font = new System.Drawing.Font("宋体", 12F); this.TestButton.Font = new System.Drawing.Font("宋体", 12F);
this.TestButton.Location = new System.Drawing.Point(9, 333); this.TestButton.Location = new System.Drawing.Point(9, 333);
this.TestButton.Name = "TestButton"; this.TestButton.Name = "TestButton";
@ -158,6 +151,7 @@ namespace HighWayIot.Winform.MainForm
// //
// ReadTestButton // ReadTestButton
// //
this.ReadTestButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.ReadTestButton.Font = new System.Drawing.Font("宋体", 12F); this.ReadTestButton.Font = new System.Drawing.Font("宋体", 12F);
this.ReadTestButton.Location = new System.Drawing.Point(352, 333); this.ReadTestButton.Location = new System.Drawing.Point(352, 333);
this.ReadTestButton.Name = "ReadTestButton"; this.ReadTestButton.Name = "ReadTestButton";
@ -169,8 +163,9 @@ namespace HighWayIot.Winform.MainForm
// //
// CutTestButton // CutTestButton
// //
this.CutTestButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.CutTestButton.Font = new System.Drawing.Font("宋体", 12F); this.CutTestButton.Font = new System.Drawing.Font("宋体", 12F);
this.CutTestButton.Location = new System.Drawing.Point(352, 281); this.CutTestButton.Location = new System.Drawing.Point(253, 333);
this.CutTestButton.Name = "CutTestButton"; this.CutTestButton.Name = "CutTestButton";
this.CutTestButton.Size = new System.Drawing.Size(93, 46); this.CutTestButton.Size = new System.Drawing.Size(93, 46);
this.CutTestButton.TabIndex = 12; this.CutTestButton.TabIndex = 12;
@ -180,8 +175,9 @@ namespace HighWayIot.Winform.MainForm
// //
// WriteInTestButton // WriteInTestButton
// //
this.WriteInTestButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.WriteInTestButton.Font = new System.Drawing.Font("宋体", 12F); this.WriteInTestButton.Font = new System.Drawing.Font("宋体", 12F);
this.WriteInTestButton.Location = new System.Drawing.Point(352, 229); this.WriteInTestButton.Location = new System.Drawing.Point(154, 333);
this.WriteInTestButton.Name = "WriteInTestButton"; this.WriteInTestButton.Name = "WriteInTestButton";
this.WriteInTestButton.Size = new System.Drawing.Size(93, 46); this.WriteInTestButton.Size = new System.Drawing.Size(93, 46);
this.WriteInTestButton.TabIndex = 13; this.WriteInTestButton.TabIndex = 13;
@ -206,7 +202,6 @@ namespace HighWayIot.Winform.MainForm
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
this.Controls.Add(this.UploadResultButton); this.Controls.Add(this.UploadResultButton);
this.Controls.Add(this.StartWeightButon);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "MainForm"; this.Name = "MainForm";
@ -220,8 +215,6 @@ namespace HighWayIot.Winform.MainForm
} }
#endregion #endregion
private Button StartWeightButon;
private Button UploadResultButton; private Button UploadResultButton;
private GroupBox groupBox1; private GroupBox groupBox1;
private Label label1; private Label label1;

@ -131,6 +131,16 @@ namespace HighWayIot.Winform.MainForm
{ {
//回车后的业务逻辑 //回车后的业务逻辑
//先核对膜卷号 //先核对膜卷号
LANConnect.Instance.ReadTxt(XmlUtil.Instance.BaseInnerTextReader("InputPath"), $"{RollNumberTextBox.Text}.txt");
//string操作
if (true)
{
}
else
{
MessageBox.Show("膜卷号不一致,请人工解决问题");
}
//准备开始称重 //准备开始称重
action.Invoke($"膜卷号[{RollNumberTextBox.Text}]开始称重"); action.Invoke($"膜卷号[{RollNumberTextBox.Text}]开始称重");

Loading…
Cancel
Save