wangsr
|
4bfc54b494
|
测试提交
|
1 year ago |
|
wangsr
|
c5c60daf59
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
8455a4b825
|
change - 加载界面
|
1 year ago |
nodyang
|
a3ba502b80
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
nodyang
|
e1342383fb
|
0915 替换plc
|
1 year ago |
|
wangsr
|
90c7c0381e
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
34efa803e1
|
修改推送问题
|
1 year ago |
|
wangsr
|
d9980be420
|
合并
|
1 year ago |
|
wangsr
|
67ab37d415
|
Add - LJPlanning-TestAction等待实装
|
1 year ago |
|
wangsr
|
65848c2175
|
add - 添加计划状态下拉框 数据库变更
|
1 year ago |
|
wangsr
|
6e98ca3d4c
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
37fcb77890
|
change - 计划配方新增查询功能
|
1 year ago |
|
nodyang
|
8a021e197c
|
采用胡工 替换西门子
|
1 year ago |
|
nodyang
|
33cde15530
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
nodyang
|
9c5ad7a7c5
|
准备继承 hsl
|
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
|
7919c71752
|
change - 下班前小修改
|
1 year ago |
|
wangsr
|
a62b3fc913
|
change - yw保存报表界面美化
|
1 year ago |
|
wangsr
|
ddf2e523be
|
Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
|
1 year ago |
|
wangsr
|
3cda278e1d
|
change - 界面美化
|
1 year ago |
|
nodyang
|
cd50514e00
|
修复按钮
|
1 year ago |
|
wangsr
|
f926545355
|
change - 修改nodedevice 完善设备监控图 发版前准备
|
1 year ago |
|
wangsr
|
63eab8ca08
|
add - 设备监控界面添加报警
|
1 year ago |
|
wangsr
|
37e66a188d
|
add - 报表plchelper数据读取废案
|
1 year ago |
|
nodyang
|
94101f3a1d
|
后台运行
|
1 year ago |
|
wangsr
|
acebd40093
|
Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
|
1 year ago |
|
wangsr
|
12927af05a
|
change - 展示界面报表添加
|
1 year ago |
|
nodyang
|
751b3f53ab
|
Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
|
1 year ago |
|
nodyang
|
55a9a78539
|
0913 整理代码
|
1 year ago |
|
wangsr
|
ab7419f990
|
Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
# Conflicts:
# Main/MCEdit/Data/MCProject/nodeDevice.xml
|
1 year ago |
|
wangsr
|
4c5f60e7fb
|
change - 展示界面添加高低料位等
|
1 year ago |
|
nodyang
|
e9f1825eaf
|
Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
# Conflicts:
# Main/MCEdit/Data/MCProject/nodeDevice.xml
|
1 year ago |
|
nodyang
|
7e71fd990b
|
2107 add 新增数据库2107
|
1 year ago |
|
wangsr
|
96afbeffa4
|
Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownloadAction.cs
|
1 year ago |
|
wangsr
|
e74338a03d
|
change - 界面设置
|
1 year ago |
|
nodyang
|
a5e0b1e767
|
0912 测试计划的版本呢
|
1 year ago |
|
wangsr
|
8942b48b85
|
Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
|
1 year ago |
|
wangsr
|
918040618a
|
change - 中横线改下划线
|
1 year ago |
|
nodyang
|
d14fa8de9d
|
demo
|
1 year ago |
|
nodyang
|
397e90d767
|
Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
|
1 year ago |
|
nodyang
|
aeab567cc7
|
修补缺失的点位
|
1 year ago |
|
wangsr
|
de62462783
|
Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
|
1 year ago |
|
wangsr
|
f0eec65097
|
change - 点位测试
|
1 year ago |
|
nodyang
|
cc63ca6d63
|
0911 修改146=>2106
|
1 year ago |
|
wangsr
|
320f5331ee
|
change - 小改动
|
1 year ago |
|
wangsr
|
42c9b0b73d
|
add - 展示界面添加新点位
|
1 year ago |
|
wangsr
|
87dfe65f7e
|
change - db 2102 2103 2017 维护完毕
|
1 year ago |