Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
张东亮
/
NS200
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
图表
网络
创建新的问题
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit b237d193
由
刘韬
编写于
2026-02-26 15:46:18 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
SO1340 定制添加删除含有NA字样的条码
1 个父辈
9a16b822
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
21 行增加
和
8 行删除
AutoScanAndLabel/AboutBox1.Designer.cs
AutoScanAndLabel/AboutBox1.cs
AutoScanAndLabel/Program.cs
AutoScanAndLabel/Properties/AssemblyInfo.cs
Common/Setting_Init.cs
DeviceLibrary/DeviceLibrary/CodeManager.cs
AutoScanAndLabel/AboutBox1.Designer.cs
查看文件 @
b237d19
...
...
@@ -43,9 +43,9 @@ namespace AutoScanAndLabel
this
.
tableLayoutPanel
.
ColumnCount
=
2
;
this
.
tableLayoutPanel
.
ColumnStyles
.
Add
(
new
System
.
Windows
.
Forms
.
ColumnStyle
(
System
.
Windows
.
Forms
.
SizeType
.
Percent
,
12.98701F
));
this
.
tableLayoutPanel
.
ColumnStyles
.
Add
(
new
System
.
Windows
.
Forms
.
ColumnStyle
(
System
.
Windows
.
Forms
.
SizeType
.
Percent
,
87.01299F
));
this
.
tableLayoutPanel
.
Controls
.
Add
(
this
.
labelCopyright
,
1
,
2
);
this
.
tableLayoutPanel
.
Controls
.
Add
(
this
.
labelProductName
,
1
,
0
);
this
.
tableLayoutPanel
.
Controls
.
Add
(
this
.
labelVersion
,
1
,
1
);
this
.
tableLayoutPanel
.
Controls
.
Add
(
this
.
labelCopyright
,
1
,
2
);
this
.
tableLayoutPanel
.
Controls
.
Add
(
this
.
labelCompanyName
,
1
,
3
);
this
.
tableLayoutPanel
.
Controls
.
Add
(
this
.
textBoxDescription
,
1
,
4
);
this
.
tableLayoutPanel
.
Controls
.
Add
(
this
.
okButton
,
1
,
5
);
...
...
@@ -97,6 +97,7 @@ namespace AutoScanAndLabel
this
.
labelCopyright
.
Name
=
"labelCopyright"
;
this
.
labelCopyright
.
Size
=
new
System
.
Drawing
.
Size
(
354
,
16
);
this
.
labelCopyright
.
TabIndex
=
21
;
this
.
labelCopyright
.
Tag
=
"not"
;
this
.
labelCopyright
.
Text
=
"版权"
;
this
.
labelCopyright
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
//
...
...
@@ -124,6 +125,7 @@ namespace AutoScanAndLabel
this
.
textBoxDescription
.
Size
=
new
System
.
Drawing
.
Size
(
354
,
116
);
this
.
textBoxDescription
.
TabIndex
=
23
;
this
.
textBoxDescription
.
TabStop
=
false
;
this
.
textBoxDescription
.
Tag
=
"not"
;
this
.
textBoxDescription
.
Text
=
"说明"
;
//
// okButton
...
...
AutoScanAndLabel/AboutBox1.cs
查看文件 @
b237d19
...
...
@@ -18,7 +18,7 @@ namespace AutoScanAndLabel
this
.
Text
=
String
.
Format
(
crc
.
GetString
(
"Res0001"
,
"关于 {0}"
),
crc
.
GetString
(
"App_Title"
,
"自动贴标机"
));
this
.
labelProductName
.
Text
=
AssemblyProduct
;
this
.
labelVersion
.
Text
=
String
.
Format
(
crc
.
GetString
(
"Res0002"
,
"版本 {0}"
),
AssemblyVersion
);
this
.
labelCopyright
.
Text
=
crc
.
GetString
(
"Res0219"
,
"版权 © 2021"
)
;
this
.
labelCopyright
.
Text
=
AssemblyCopyright
;
this
.
labelCompanyName
.
Text
=
AssemblyCompany
;
this
.
textBoxDescription
.
Text
=
AssemblyDescription
;
}
...
...
@@ -63,10 +63,10 @@ namespace AutoScanAndLabel
{
int
days
=
Convert
.
ToInt32
(
strArray
[
2
]);
int
seconds
=
Convert
.
ToInt32
(
strArray
[
3
]);
DateTime
d1
=
DateTime
.
Parse
(
"20
24-06-06
"
);
//
var newData = d1.AddDays(days);
//
newData = newData.AddSeconds(seconds * 2);
updatetime
=
$
"{crc.GetString("
Res0220
", "
最后更新时间
:
")}"
+
d1
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
);
DateTime
d1
=
DateTime
.
Parse
(
"20
00-01-01
"
);
var
newData
=
d1
.
AddDays
(
days
);
newData
=
newData
.
AddSeconds
(
seconds
*
2
);
updatetime
=
$
"{crc.GetString("
Res0220
", "
最后更新时间
:
")}"
+
newData
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
);
}
if
(
attributes
.
Length
==
0
)
...
...
AutoScanAndLabel/Program.cs
查看文件 @
b237d19
...
...
@@ -73,6 +73,7 @@ namespace AutoScanAndLabel
}
Environment
.
CurrentDirectory
=
Application
.
StartupPath
;
XmlConfigurator
.
Configure
();
Config
.
LoadMyConfig
(
typeof
(
Setting_Init
));
Application
.
EnableVisualStyles
();
Application
.
SetCompatibleTextRenderingDefault
(
false
);
Application
.
Run
(
new
Form1
());
...
...
AutoScanAndLabel/Properties/AssemblyInfo.cs
查看文件 @
b237d19
...
...
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Neotel")]
[assembly: AssemblyProduct("NS200")]
[assembly: AssemblyCopyright("Copyright © 202
4
")]
[assembly: AssemblyCopyright("Copyright © 202
6
")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
...
...
Common/Setting_Init.cs
查看文件 @
b237d19
using
System
;
using
ConfigHelper
;
using
System
;
using
System.Collections.Generic
;
using
System.Globalization
;
using
System.Linq
;
...
...
@@ -74,5 +75,14 @@ namespace OnlineStore.Common
public
static
string
SMB_StorageUnitValue
=
"SMB_StorageUnitValue"
;
[
MyConfigComment
(
"设备项目号"
)]
public
static
MyConfig
<
Procjet_NO
>
ProcjetNO
=
Procjet_NO
.
General
;
}
public
enum
Procjet_NO
{
General
,
SO1340
}
}
DeviceLibrary/DeviceLibrary/CodeManager.cs
查看文件 @
b237d19
此文件的差异被折叠,
点击展开。
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论