nodyang
|
098f833ec0
|
merge
|
1 year ago |
|
nodyang
|
7848b05546
|
merge
|
1 year ago |
|
nodyang
|
9f13b74e6d
|
0907 晚上临时提交
|
1 year ago |
wangsr
|
62bbcfaf91
|
解决合并冲突 最终正常期望版本
|
1 year ago |
|
wangsr
|
26358bdfbd
|
add - DB2105nodeDevice添加 问题待解决
|
1 year ago |
|
wangsr
|
d8b0eb696d
|
add - 输送监视图完成 点位开始维护 换电脑
|
1 year ago |
|
nodyang
|
1761df780f
|
Merge branch 'dep0901' into dep
|
1 year ago |
|
nodyang
|
4e0213df1b
|
榄菊新的管理
|
1 year ago |
|
nodyang
|
c72bd4553b
|
add 重新编辑配方
|
1 year ago |
|
wangsr
|
142709f84f
|
change - 小料监控图重画完毕
|
1 year ago |
|
wangsr
|
b27477df99
|
change - 按钮逻辑修改
|
1 year ago |
|
nodyang
|
d48a870f9f
|
页面整合处理
|
1 year ago |
|
wangsr
|
53c2b54934
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
dc45f101bb
|
change - 化工來訪前
|
1 year ago |
|
nodyang
|
a1c9ba3aac
|
生产计划
|
1 year ago |
|
nodyang
|
4ad8952ab1
|
Merge remote-tracking branch 'haiwei/dep' into dep
|
1 year ago |
|
nodyang
|
57880f5e4e
|
0830 提交
|
1 year ago |
|
wangsr
|
1667bca306
|
Revert "测试"
This reverts commit deb07e73dc.
|
1 year ago |
|
wangsr
|
2412c53d6a
|
Revert "change - 菜单装载"
This reverts commit 5508d3bc2b.
|
1 year ago |
|
nodyang
|
deb07e73dc
|
测试
|
1 year ago |
|
nodyang
|
ed6e1167dc
|
Merge remote-tracking branch 'haiwei/dep' into dep
|
1 year ago |
|
nodyang
|
1c0fbf79e8
|
重量 参数管理
|
1 year ago |
|
wangsr
|
5508d3bc2b
|
change - 菜单装载
|
1 year ago |
|
wangsr
|
bbdba86dd4
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
0eb4288d01
|
change - 改名
|
1 year ago |
|
nodyang
|
18634444a4
|
fix
|
1 year ago |
|
wangsr
|
8a6fecc6cb
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
cfa80ec7f3
|
change - 三通阀逻辑控制完善
|
1 year ago |
|
nodyang
|
8f5e9f0fc9
|
fix配方
|
1 year ago |
|
nodyang
|
927685d010
|
plc最终版提交经过测试
|
1 year ago |
|
wangsr
|
5e39f02bd1
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
# Main/MCRun/Data/MCProject/nodeDevice.xml
|
1 year ago |
|
nodyang
|
e8224d1f53
|
emrge
|
1 year ago |
|
wangsr
|
f3f6e1afc3
|
add - 添加界面
|
1 year ago |
|
nodyang
|
2e02aa0483
|
nodeDevice.xml
|
1 year ago |
|
nodyang
|
6895e8cde4
|
整理代码
|
1 year ago |
|
nodyang
|
d03d423814
|
比例阀
|
1 year ago |
|
nodyang
|
24400a59c9
|
阀门
|
1 year ago |
|
wangsr
|
39d8fdd960
|
change - text limit
|
1 year ago |
|
wangsr
|
1fb17ee8f0
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
4a9cc5c480
|
change - delete sql change
|
1 year ago |
|
nodyang
|
f195102a8a
|
整理代码
|
1 year ago |
|
nodyang
|
48e1497789
|
Merge branch 'wangsr' into dep_yangw
# Conflicts:
# Mesnac.DoUtils/DoControl.cs
|
1 year ago |
|
wangsr
|
4c853034dd
|
add - 数据块状态检测（差两个struct数据类型）
|
1 year ago |
|
nodyang
|
73320cb736
|
merge
|
1 year ago |
|
wangsr
|
9b29781643
|
add - ParameterWithPC部分状态监测
|
1 year ago |
|
wangsr
|
92bfefa190
|
add - DB1165状态监测 部分完成 nodeDevice维护
|
1 year ago |
|
wangsr
|
4eb0084239
|
add - MotorinitStateMonitor 结束
|
1 year ago |
|
wangsr
|
8331712550
|
add - 阀门数据类状态监测 维护nodeDevice
|
1 year ago |
|
wangsr
|
a42944f15d
|
change - 榄菊设备参数压力管理 partchange
|
1 year ago |
|
wangsr
|
6c0ba7c4db
|
change - 大小写问题
|
1 year ago |