nodyang
|
baea38c619
|
LjReport
|
1 year ago |
|
nodyang
|
114b0ae6bd
|
暂时推送
|
1 year ago |
|
nodyang
|
89f1f6ec93
|
临时存放数据
|
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 |
|
nodyang
|
d65b6c7475
|
临时提交
|
1 year ago |
|
nodyang
|
9f3c4e30ca
|
Merge branch 'wangsr' into dep
|
1 year ago |
wangsr
|
8676e8eda5
|
3000
|
1 year ago |
|
wangsr
|
a507327a96
|
临时提交
|
1 year ago |
|
wangsr
|
4fb0b10928
|
半夜需求
|
1 year ago |
|
wangsr
|
804e322945
|
add - hsl通讯展示界面 性能待优化
|
1 year ago |
|
wangsr
|
dc63fbdaf4
|
change - 加载时读取配置，修改配置
|
1 year ago |
|
wangsr
|
5b71bd3012
|
add - 添加对接地址
|
1 year ago |
|
wangsr
|
948af42a47
|
add - 手动控制添加保存功能
|
1 year ago |
|
wangsr
|
15c2a22cf3
|
change - 重构手动控制 完善日志 添加焦点控制
|
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
|
868917498f
|
change - 修改物料信息操作错误
|
1 year ago |
|
wangsr
|
6f79836a47
|
change - 合并问题修改
|
1 year ago |
|
wangsr
|
75b3867d42
|
change - 项目简化
|
1 year ago |
|
wangsr
|
0cf3236699
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.Designer.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.cs
|
1 year ago |
|
wangsr
|
e8899e6ec7
|
change - 拉取前提交
|
1 year ago |
|
wangsr
|
fad95ec358
|
change - 简化代码初步
|
1 year ago |
|
wangsr
|
a9a63d5d9e
|
change - 更改布局
|
1 year ago |
|
wangsr
|
c32d14d2f9
|
update - 小修改
|
1 year ago |
|
wangsr
|
1f219d415c
|
修复代码
|
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
|
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
|
e1342383fb
|
0915 替换plc
|
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
|
a62b3fc913
|
change - yw保存报表界面美化
|
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 |
|
nodyang
|
55a9a78539
|
0913 整理代码
|
1 year ago |
|
nodyang
|
7e71fd990b
|
2107 add 新增数据库2107
|
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
|
aeab567cc7
|
修补缺失的点位
|
1 year ago |
|
nodyang
|
9fbf00b15f
|
mege
|
1 year ago |
|
nodyang
|
1f0c2da3d3
|
Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
|
1 year ago |
|
nodyang
|
7848b05546
|
merge
|
1 year ago |
|
wangsr
|
28de46fb64
|
change - 界面美化
|
1 year ago |
|
nodyang
|
9f13b74e6d
|
0907 晚上临时提交
|
1 year ago |
|
wangsr
|
62bbcfaf91
|
解决合并冲突 最终正常期望版本
|
1 year ago |
|
nodyang
|
e6ce524df2
|
0907
|
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
|
b27477df99
|
change - 按钮逻辑修改
|
1 year ago |
|
nodyang
|
d48a870f9f
|
页面整合处理
|
1 year ago |
|
nodyang
|
a1c9ba3aac
|
生产计划
|
1 year ago |
|
nodyang
|
57880f5e4e
|
0830 提交
|
1 year ago |
|
nodyang
|
1c0fbf79e8
|
重量 参数管理
|
1 year ago |
|
nodyang
|
1b2f8d16c7
|
SaveWetMixerReport
|
1 year ago |
|
nodyang
|
9af634d4b3
|
Fix
|
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 |
|
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 |
|
wangsr
|
f3f6e1afc3
|
add - 添加界面
|
1 year ago |
|
nodyang
|
6895e8cde4
|
整理代码
|
1 year ago |
|
nodyang
|
d03d423814
|
比例阀
|
1 year ago |
|
nodyang
|
24400a59c9
|
阀门
|
1 year ago |
|
wangsr
|
dfd2e0c826
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
39d8fdd960
|
change - text limit
|
1 year ago |
|
nodyang
|
440a6da24f
|
压力管理
|
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
|
716d43eaf8
|
change - 设备压力参数管理维护
|
1 year ago |
|
nodyang
|
48e1497789
|
Merge branch 'wangsr' into dep_yangw
# Conflicts:
# Mesnac.DoUtils/DoControl.cs
|
1 year ago |
|
wangsr
|
6f0a34056e
|
提交准备合并
|
1 year ago |
|
wangsr
|
6ee566826c
|
change - PlcCommunication代码优化
|
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
|
af10a16d38
|
add - 8/23下班 添加马达初始化数据块监测类（阶段）
|
1 year ago |
|
wangsr
|
b82b87a847
|
change - 电机初始化状态监测
|
1 year ago |
|
wangsr
|
8331712550
|
add - 阀门数据类状态监测 维护nodeDevice
|
1 year ago |
|
wangsr
|
a42944f15d
|
change - 榄菊设备参数压力管理 partchange
|
1 year ago |
|
wangsr
|
6c0ba7c4db
|
change - 大小写问题
|
1 year ago |
|
wangsr
|
be5c0bc9a1
|
Revert "change - Timer完善 增加 等待加入多綫程"
This reverts commit e00504ce9a.
|
1 year ago |
|
wangsr
|
e06d8c8d68
|
Merge branch 'dep_yangw' into wangsr
|
1 year ago |
|
wangsr
|
e00504ce9a
|
change - Timer完善 增加 等待加入多綫程
|
1 year ago |
|
nodyang
|
465c348df0
|
应用类库
|
1 year ago |
|
wangsr
|
6bc53e73d9
|
Merge branch 'dep_yangw' into wangsr2
# Conflicts:
# Main/MCEdit/Data/MCProject/nodeDataSource.xml
|
1 year ago |
|
nodyang
|
dd9fcefccf
|
修改plc
|
1 year ago |
|
wangsr
|
b19a0c0b27
|
漏
|
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 |
|
wangsr
|
b43b08586a
|
add - 阀门数据块监测 - 电机代码待优化
|
1 year ago |
|
wangsr
|
fa6c6e84bc
|
add - 电机数据块状态检测 - 待添加Timer
|
1 year ago |
|
nodyang
|
df5758ff0c
|
Merge branch 'dep' into dep_yangw
|
1 year ago |
|
wangsr
|
c298569b3f
|
add - Plc数据读取-816下班
|
1 year ago |
|
wangsr
|
924bdf72db
|
add - 电机调试2（业务偏差）
|
1 year ago |
 wenjy
|
58cc555f55
|
change - 超级管理员密码修改
|
1 year ago |
|
wenjy
|
d5360fe47c
|
change - office引用修改
|
1 year ago |
|
wangsr
|
da6ba6e358
|
add - 阀门控制调试
|
1 year ago |
|
wangsr
|
33807824bd
|
add - 加入简易报警灯控制和部分日志
|
1 year ago |
|
wangsr
|
61e5d44119
|
change - PLC电机控制代码完善
|
1 year ago |
|
nodyang
|
25a475a47f
|
删除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
|
10d988c5d7
|
change - 干混 湿混 糊化 报表均已完成
|
1 year ago |
|
wangsr
|
45e545a79d
|
record - 新尝试备份
|
1 year ago |
|
wangsr
|
18eb26b929
|
- change FinishBatchService类自动存盘处理添加
|
1 year ago |
|
wangsr
|
1925bef7a6
|
add - 糊化机报表 初始化 查询 双击加载 导出 湿混机报表些许问题待完善
|
1 year ago |
|
wangsr
|
a3d5f972db
|
解决冲突 合并
|
1 year ago |
|
wangsr
|
948bdaf7c4
|
add - 湿混机报表 - 功能缺陷
|
1 year ago |
|
wangsr
|
85e2019459
|
change - 干混机类名修改
|
1 year ago |
|
wangsr
|
0b0b801b2d
|
change- run运行问题处理
|
1 year ago |
|
nodyang
|
ef5ad1188a
|
fixCode
|
1 year ago |
|
wangsr
|
35a9e622af
|
Revert "change - 干混机报表导出事件"
This reverts commit 68ef3b8f49.
|
1 year ago |
|
wangsr
|
2dbc258001
|
change - 提交
|
1 year ago |
|
wangsr
|
2705805e9e
|
解决冲突
|
1 year ago |
|
nodyang
|
ae58b33366
|
Merge branch 'wangsr' into dep_plan
|
1 year ago |
|
nodyang
|
e091fb94e8
|
demo
|
1 year ago |
|
wangsr
|
39159ad352
|
窗口美化 完毕
|
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
|
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 |
|
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 |
|
wenjy
|
245656cc68
|
change - 报警数据读取
|
1 year ago |
|
nodyang
|
6ac73f7201
|
demo
|
1 year ago |
|
wenjy
|
30661be234
|
change - 集成HSL PLC读取模块
|
1 year ago |
|
wenjy
|
10f3db53bf
|
change - 报警维护
|
1 year ago |
|
nodyang
|
425828021a
|
临时提交
|
1 year ago |
|
nodyang
|
e4da793b9c
|
临时提交代码到服务器
|
1 year ago |
|
nodyang
|
a441d9ca59
|
0801 临时提交
|
1 year ago |
|
nodyang
|
896c081d3b
|
修复产线不neng
|
1 year ago |
|
nodyang
|
65292edda5
|
0801 新的分支
|
1 year ago |
|
nodyang
|
1c86b66fd1
|
haiwei
|
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 |
|
nodyang
|
021aae2686
|
最近调试
|
1 year ago |
|
nodyang
|
fb8f844d46
|
设备管理
|
1 year ago |
|
nodyang
|
f03b412359
|
qw3
|
1 year ago |
|
nodyang
|
0394fd935d
|
周日提交
|
1 year ago |
|
nodyang
|
eaf940b8cd
|
ToSingle 仓库
|
1 year ago |
|
nodyang
|
b213bf6e6e
|
20230707 中午提交代码
|
1 year ago |
|
nodyang
|
042dc669da
|
20230707昨日提交
|
1 year ago |
|
nodyang
|
12f23cdb56
|
修复完成
|
1 year ago |
|
nodyang
|
c971b5330b
|
临时提交
|
1 year ago |
|
nodyang
|
9cb1a81080
|
0628 对plc 就行测试
|
1 year ago |
|
nodyang
|
5287b9e0b5
|
nodeDevice 点位维持成功
|
1 year ago |
|
nodyang
|
ba97852627
|
dll testActioc 测试代码
|
1 year ago |
|
nodyang
|
ffc4a8fc8f
|
小车封装
|
1 year ago |
|
nodyang
|
a69f8847d8
|
E:\mesnac\化工项目源码\源码
|
1 year ago |
baogq
|
5c20c450f9
|
20220907保存最新源码
|
2 years ago |
|
baogq
|
3c99b28127
|
监控界面V1.0
|
2 years ago |
|
baogq
|
6d879836fa
|
提交最新源码
|
2 years ago |
|
baogq
|
f473200669
|
提交最新源码
|
2 years ago |
|
wenjy
|
0daec0fed8
|
change - 注释修改
|
2 years ago |
|
wenjy
|
2c0c501dfb
|
change - 角色信息
|
2 years ago |
|
wenjy
|
d804444f07
|
change - 计划重传、终止
|
2 years ago |
|
wenjy
|
2b60edee67
|
读取plc计划执行状态
|
2 years ago |
|
wenjy
|
44e64eaf52
|
change - 计划下传完成判断
|
2 years ago |
|
wenjy
|
3580a27deb
|
change - 配方另存
|
2 years ago |
|
wenjy
|
cac7cddaa3
|
change - 修改
|
2 years ago |
|
wenjy
|
e8df0f97a7
|
添加项目文件。
|
2 years ago |