wangsr
|
2defa0a367
|
Merge branch 'dep' into dep_pf
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ChemicalWeighingPlc/PlcPlanHelper.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/FinishBatchHelper.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/ReportGelDoserHelper.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/LjFormulaDetailDownEntity.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjClick/FormClientManager.Designer.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjClick/FormClientManager.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjClick/FormClientManager.resx
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjClick/InitFormAction.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjHelp.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/MetageHelp.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownToDatabase.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownloadAction.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/PauseAction.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/WeightSettingPlc.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Pl/PlcConnect.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/PptPlan/AutoDownloadAction.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Sys/TimerRunService.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/DeleteAction.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/FrmRecipe.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/ModifyRecipeAction.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/SelectRecipe.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/SetCratParam.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/SetCratParamForm.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
# DataBlockHelper/DataBlockHelper.csproj
# DataBlockHelper/Entity/ClickEntity.cs
# DataBlockHelper/PlcConnect.cs
# Main/MCEdit/Data/MCProject/SCWSProject2.mprj
# Main/MCEdit/Data/MCProject/nodeForm/Form1.xml
|
1 year ago |
nodyang
|
c84878f388
|
2105 准备信号
|
1 year ago |
|
nodyang
|
fdc12243dc
|
添加闽安功能
|
1 year ago |
|
nodyang
|
799c0ea68c
|
1 在湿混机下面加个Rva 小车 信息。 监控有没有报警
|
1 year ago |
|
nodyang
|
d4223bf026
|
对接闽安系统 点击按钮提示正在上料
|
1 year ago |
|
nodyang
|
50858979e4
|
Merge
|
1 year ago |
|
nodyang
|
d8d71bf3f0
|
merge
|
1 year ago |
|
nodyang
|
a0ee2a8868
|
Merge branch 'dep' into dep1011
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
|
1 year ago |
|
nodyang
|
4618441c44
|
删除么有用的报表
|
1 year ago |
|
nodyang
|
ef86b96e76
|
修复一个版本
|
1 year ago |
|
wangsr
|
fad95ec358
|
change - 简化代码初步
|
1 year ago |
nodyang
|
6eaee007f6
|
Demo
|
1 year ago |
|
nodyang
|
af59930b1b
|
ok
|
1 year ago |
|
nodyang
|
f2fe90ef1a
|
freesql
|
1 year ago |
|
nodyang
|
c9087e86de
|
添加数据访问
|
1 year ago |
|
wangsr
|
37e66a188d
|
add - 报表plchelper数据读取废案
|
1 year ago |
|
nodyang
|
94101f3a1d
|
后台运行
|
1 year ago |
|
nodyang
|
55a9a78539
|
0913 整理代码
|
1 year ago |
|
nodyang
|
1761df780f
|
Merge branch 'dep0901' into dep
|
1 year ago |
|
nodyang
|
4e0213df1b
|
榄菊新的管理
|
1 year ago |
|
wangsr
|
b27477df99
|
change - 按钮逻辑修改
|
1 year ago |
|
nodyang
|
18634444a4
|
fix
|
1 year ago |
|
wangsr
|
6f0a34056e
|
提交准备合并
|
1 year ago |
|
wangsr
|
6ee566826c
|
change - PlcCommunication代码优化
|
1 year ago |
|
wangsr
|
4c853034dd
|
add - 数据块状态检测（差两个struct数据类型）
|
1 year ago |
|
wangsr
|
92bfefa190
|
add - DB1165状态监测 部分完成 nodeDevice维护
|
1 year ago |
|
wangsr
|
af10a16d38
|
add - 8/23下班 添加马达初始化数据块监测类（阶段）
|
1 year ago |
|
wangsr
|
b82b87a847
|
change - 电机初始化状态监测
|
1 year ago |
|
wangsr
|
8331712550
|
add - 阀门数据类状态监测 维护nodeDevice
|
1 year ago |
|
wangsr
|
be5c0bc9a1
|
Revert "change - Timer完善 增加 等待加入多綫程"
This reverts commit e00504ce9a.
|
1 year ago |
|
wangsr
|
e00504ce9a
|
change - Timer完善 增加 等待加入多綫程
|
1 year ago |
|
wangsr
|
b43b08586a
|
add - 阀门数据块监测 - 电机代码待优化
|
1 year ago |
|
wangsr
|
c298569b3f
|
add - Plc数据读取-816下班
|
1 year ago |
|
wangsr
|
924bdf72db
|
add - 电机调试2（业务偏差）
|
1 year ago |
|
wangsr
|
da6ba6e358
|
add - 阀门控制调试
|
1 year ago |
|
wangsr
|
acef76c492
|
add - 电机调试窗口、逻辑、plc连接（待测试优化）
|
1 year ago |
|
wangsr
|
a3d5f972db
|
解决冲突 合并
|
1 year ago |
 wenjy
|
918e13579f
|
change - 报警逻辑代码优化
|
1 year ago |
|
wangsr
|
fbf5894f9f
|
测试
|
1 year ago |
|
nodyang
|
425828021a
|
临时提交
|
1 year ago |
|
nodyang
|
e4da793b9c
|
临时提交代码到服务器
|
1 year ago |
|
nodyang
|
a441d9ca59
|
0801 临时提交
|
1 year ago |
|
nodyang
|
65292edda5
|
0801 新的分支
|
1 year ago |
|
nodyang
|
8afe01f752
|
demo
|
1 year ago |
|
nodyang
|
1d6383267f
|
0725 提交的数据
|
1 year ago |
|
nodyang
|
e068ae7bb0
|
TestAction
|
1 year ago |
|
nodyang
|
0c97c41f7c
|
设备管理
|
1 year ago |
|
nodyang
|
f03b412359
|
qw3
|
1 year ago |
|
nodyang
|
c971b5330b
|
临时提交
|
1 year ago |
|
nodyang
|
9cb1a81080
|
0628 对plc 就行测试
|
1 year ago |