wangsr
|
d54cd8c9a4
|
add - 黑粉统计添加明细和查询 change - 设备细节画面性能优化、错误校对
|
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
|
dfcfd01e71
|
添加日报表
|
1 year ago |
|
nodyang
|
dfe261ff96
|
Merge branch 'dep' into dep1011
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
# Main/MCEdit/Data/MCProject/SCWSProject2.mprj
# Main/MCEdit/MCEdit.csproj
|
1 year ago |
|
nodyang
|
ef86b96e76
|
修复一个版本
|
1 year ago |
|
wangsr
|
804e322945
|
add - hsl通讯展示界面 性能待优化
|
1 year ago |
|
wangsr
|
dc63fbdaf4
|
change - 加载时读取配置，修改配置
|
1 year ago |
|
wangsr
|
948af42a47
|
add - 手动控制添加保存功能
|
1 year ago |
|
wangsr
|
15c2a22cf3
|
change - 重构手动控制 完善日志 添加焦点控制
|
1 year ago |
|
wangsr
|
af47d12b9b
|
add - 下班前完善 - 添加按钮链接
|
1 year ago |
|
wangsr
|
41fde0575d
|
add - 处理下发请求
|
1 year ago |
|
wangsr
|
bcd9ccae26
|
add - 手动控制程序 添加日志 完善代码
|
1 year ago |
|
wangsr
|
ac92eb3529
|
add - timeradd
|
1 year ago |
|
wangsr
|
fb1ff146c0
|
add - 手动控制完成 下班
|
1 year ago |
|
wangsr
|
1c27c80404
|
add - 手动操控 糊化机新需求 待整合PLC
|
1 year ago |
|
wangsr
|
ef46dce828
|
add - 手动控制等待引入PLC
|
1 year ago |
|
wangsr
|
865c17e169
|
add - 手动控制添加
|
1 year ago |
|
wangsr
|
75b3867d42
|
change - 项目简化
|
1 year ago |
|
wangsr
|
1456c3f30c
|
delete - 删除无用文件
|
1 year ago |
|
wangsr
|
fad95ec358
|
change - 简化代码初步
|
1 year ago |
|
wangsr
|
46ce634bd5
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/InItDbAction.cs
|
1 year ago |
|
wangsr
|
4bfc54b494
|
测试提交
|
1 year ago |
|
wangsr
|
02c1e461dd
|
add - 榄菊计划管理 新增查询条件
|
1 year ago |
|
wangsr
|
8455a4b825
|
change - 加载界面
|
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
|
67ab37d415
|
Add - LJPlanning-TestAction等待实装
|
1 year ago |
|
wangsr
|
37fcb77890
|
change - 计划配方新增查询功能
|
1 year ago |
nodyang
|
6eaee007f6
|
Demo
|
1 year ago |
|
nodyang
|
c9087e86de
|
添加数据访问
|
1 year ago |
|
wangsr
|
a62b3fc913
|
change - yw保存报表界面美化
|
1 year ago |
|
wangsr
|
3cda278e1d
|
change - 界面美化
|
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
|
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 |
|
wangsr
|
4d53b1d2eb
|
change - nodedevice 新版本维护
|
1 year ago |
|
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 |
|
wangsr
|
4c853034dd
|
add - 数据块状态检测（差两个struct数据类型）
|
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 |
|
wangsr
|
2b5fccc5e8
|
解决合并冲突——wangsr+dep_yangw
|
1 year ago |
|
wangsr
|
cc10602c3f
|
Merge branch 'dep_yangw' into wangsr
# Conflicts:
# Main/MCEdit/Data/MCProject/nodeDataSource.xml
# Main/MCEdit/Data/MCProject/nodeDevice.xml
|
1 year ago |
|
wangsr
|
bcdede6928
|
add - Timer部分引入
|
1 year ago |
|
nodyang
|
df5758ff0c
|
Merge branch 'dep' into dep_yangw
|
1 year ago |
|
nodyang
|
cc80555fdf
|
最新版本的plc nodeDevice.xml
|
1 year ago |
 wenjy
|
58cc555f55
|
change - 超级管理员密码修改
|
1 year ago |
|
nodyang
|
bdd2371ba4
|
修订Plc
|
1 year ago |
|
wangsr
|
da6ba6e358
|
add - 阀门控制调试
|
1 year ago |
|
wangsr
|
61e5d44119
|
change - PLC电机控制代码完善
|
1 year ago |
|
wangsr
|
acef76c492
|
add - 电机调试窗口、逻辑、plc连接（待测试优化）
|
1 year ago |
|
nodyang
|
9379b9d227
|
Merge branch 'wangsr' into dep
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
# Main/MCEdit/Data/MCProject/SCWSProject2.mprj
|
1 year ago |
|
nodyang
|
eed38ad76e
|
Merge branch 'dep_plan' into dep
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
# Main/MCEdit/Data/MCProject/SCWSProject2.mprj
|
1 year ago |
|
nodyang
|
2c79df191e
|
代码整理
|
1 year ago |
|
wangsr
|
1925bef7a6
|
add - 糊化机报表 初始化 查询 双击加载 导出 湿混机报表些许问题待完善
|
1 year ago |
|
wangsr
|
a3d5f972db
|
解决冲突 合并
|
1 year ago |
|
wangsr
|
948bdaf7c4
|
add - 湿混机报表 - 功能缺陷
|
1 year ago |
|
wangsr
|
2dbc258001
|
change - 提交
|
1 year ago |
|
wangsr
|
2705805e9e
|
解决冲突
|
1 year ago |
|
wangsr
|
8f7481b3bc
|
Merge branch 'wangsr' into dep_plan
# Conflicts:
# Main/MCEdit/Data/MCProject/SCWSProject2.mprj
|
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
|
6ac73f7201
|
demo
|
1 year ago |
|
wenjy
|
10f3db53bf
|
change - 报警维护
|
1 year ago |
|
nodyang
|
425828021a
|
临时提交
|
1 year ago |
|
wenjy
|
fad533557a
|
change - plc点位标注
|
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
|
896c081d3b
|
修复产线不neng
|
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
|
7cd2db0e45
|
周日提价
|
1 year ago |
|
nodyang
|
a61f54582e
|
周五特别版本
|
1 year ago |
|
nodyang
|
1ec39f960d
|
0719 提交
|
1 year ago |
|
nodyang
|
4495a59df6
|
设备管理
|
1 year ago |
|
nodyang
|
b20ef12c7e
|
asd
|
1 year ago |
|
nodyang
|
485e125ed5
|
ti
|
1 year ago |
|
nodyang
|
0c97c41f7c
|
设备管理
|
1 year ago |