wangsr
|
2dbc258001
|
change - 提交
|
1 year ago |
|
wangsr
|
d2a83d1392
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
# Main/MCEdit/Data/MCProject/SCWSProject2.mprj
|
1 year ago |
|
wangsr
|
2705805e9e
|
解决冲突
|
1 year ago |
|
wangsr
|
68ef3b8f49
|
change - 干混机报表导出事件
|
1 year ago |
|
wangsr
|
845d3aa2c0
|
add - 干混机报表事件：初始化、查询、双击加载明细、导出
|
1 year ago |
|
wangsr
|
e369e85122
|
add - 干混机报表事件：初始化、查询、明细加载、导出
|
1 year ago |
 wenjy
|
918e13579f
|
change - 报警逻辑代码优化
|
1 year ago |
|
wenjy
|
1704350b44
|
change - 报警读取逻辑代码优化
|
1 year ago |
|
wenjy
|
fcd32f6ee7
|
change - 报表数据保存代码优化
|
1 year ago |
|
wenjy
|
4a9bef5fac
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wenjy
|
3c9dd0e37f
|
change - 代码整理
|
1 year ago |
|
wangsr
|
5fae34a7e4
|
Merge remote-tracking branch 'origin/dep' into dep
|
1 year ago |
|
wangsr
|
f59f92144c
|
change - 数据源修改
|
1 year ago |
|
wenjy
|
ae8f502a86
|
add - 干混机报表数据保存
|
1 year ago |
nodyang
|
ae58b33366
|
Merge branch 'wangsr' into dep_plan
|
1 year ago |
|
nodyang
|
e091fb94e8
|
demo
|
1 year ago |
|
wangsr
|
127f02c930
|
222
|
1 year ago |
|
wangsr
|
fbf5894f9f
|
测试
|
1 year ago |
|
wenjy
|
fcdf6ce7d6
|
change - 干混机报表数据读取
|
1 year ago |
|
wangsr
|
39159ad352
|
窗口美化 完毕
|
1 year ago |
|
wangsr
|
069ce8225d
|
Merge branch 'dep' into wangsr
|
1 year ago |
|
wangsr
|
00ebb2f69d
|
报警灯完善
|
1 year ago |
|
wenjy
|
c29239fef0
|
change - 初始化引擎时加载Hsl、报警灯模块
|
1 year ago |
|
wangsr
|
febbba11c9
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into wangsr
|
1 year ago |
|
wangsr
|
1faaf589c4
|
change - 接入报警灯
|
1 year ago |
|
wenjy
|
969946be45
|
add - 增加报警灯控制
|
1 year ago |
|
wenjy
|
22b6de500b
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wenjy
|
440d9564c2
|
change - 保存报警信息
|
1 year ago |
|
wangsr
|
8f7481b3bc
|
Merge branch 'wangsr' into dep_plan
# Conflicts:
# Main/MCEdit/Data/MCProject/SCWSProject2.mprj
|
1 year ago |
|
wangsr
|
ad016a535e
|
前端页面修改 -未完成
|
1 year ago |
|
wangsr
|
71092f75f6
|
qqw
|
1 year ago |
|
wangsr
|
90d62551a6
|
Merge branch 'dep_plan' into wangsr
# Conflicts:
# Main/MCEdit/Data/MCProject/SCWSProject2.mprj
|
1 year ago |
|
nodyang
|
5bf766ff4a
|
都没
|
1 year ago |
|
nodyang
|
7034f0a654
|
Merge branch 'dep' into dep_plan
# Conflicts:
# Main/MCEdit/Data/MCProject/SCWSProject2.mprj
|
1 year ago |
|
nodyang
|
59fb13fa48
|
修复物料和大仓的关系
|
1 year ago |
|
nodyang
|
6ccb7b82f9
|
Merge remote-tracking branch 'haiwei/dep' into dep
|
1 year ago |
|
nodyang
|
3521fa2333
|
SiemensPLCS.S200Smart=> s1200
|
1 year ago |
|
wenjy
|
245656cc68
|
change - 报警数据读取
|
1 year ago |
|
nodyang
|
6ac73f7201
|
demo
|
1 year ago |
|
wenjy
|
3b544355fc
|
change - HSL 读取Plc测试
|
1 year ago |
|
wenjy
|
30661be234
|
change - 集成HSL PLC读取模块
|
1 year ago |
|
wenjy
|
10f3db53bf
|
change - 报警维护
|
1 year ago |
|
nodyang
|
425828021a
|
临时提交
|
1 year ago |
|
wenjy
|
fad533557a
|
change - plc点位标注
|
1 year ago |
|
wangsr
|
b9baefc7a4
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into wangsr
|
1 year ago |
|
wangsr
|
8bcbdd5105
|
到可用版本
|
1 year ago |
|
wenjy
|
a1d32cd167
|
change - 设备控件修改
|
1 year ago |
|
wenjy
|
8e286eeb01
|
add - 设备细节界面
|
1 year ago |
|
nodyang
|
e4da793b9c
|
临时提交代码到服务器
|
1 year ago |
|
nodyang
|
a441d9ca59
|
0801 临时提交
|
1 year ago |