wangsr
|
72862134be
|
Merge branch 'dep' into wangsr
|
1 year ago |
|
wangsr
|
153d412a3e
|
add - 自动控制代码前后端连接完成 等待插入Plc
|
1 year ago |
nodyang
|
67eb1825d0
|
StockMaterrialDbHelp
|
1 year ago |
|
wangsr
|
c1c84b2979
|
Merge branch 'wangsr' of http://175.27.215.92:3000/yangw/lj_plc into wangsr
|
1 year ago |
|
wangsr
|
27fad81be8
|
add - 自动控制 - 新版
|
1 year ago |
|
nodyang
|
0125e123f5
|
fix
|
1 year ago |
|
nodyang
|
d7cd1d90bc
|
整理代码 add 读取配置和 下工艺
|
1 year ago |
|
nodyang
|
561213fe66
|
读取配置
|
1 year ago |
|
wangsr
|
5b648d2ff8
|
change - 配置存到数据库 前端页面报警数据位置纠正
|
1 year ago |
|
wangsr
|
21d48d9562
|
change - 规整代码 合并前准备
|
1 year ago |
|
wangsr
|
9c858fb669
|
change - 手动控制校验写入是否成功3
|
1 year ago |
|
nodyang
|
2fd7a22c1d
|
修改系统颜色
|
1 year ago |
|
nodyang
|
fdc12243dc
|
添加闽安功能
|
1 year ago |
|
wangsr
|
a4c1deeef1
|
change - 维护DB91 90 1 手动控制添加冷热水交替检测
|
1 year ago |
|
nodyang
|
656c118b10
|
显示下料的接口
|
1 year ago |
|
wangsr
|
87009dfd0b
|
add - 黑粉统计添加设定值显示
|
1 year ago |
|
wangsr
|
da9eb0b193
|
Merge branch 'wangsr' into dep
|
1 year ago |
|
wangsr
|
8a033216a2
|
change - 设备展示界面修改
|
1 year ago |
|
nodyang
|
1846848362
|
去掉一个引用
|
1 year ago |
|
wangsr
|
26d450e609
|
change - 文字错误更改 螺旋正反转显示实现 dbhelper错误更改
|
1 year ago |
|
wangsr
|
5ca78fc6ef
|
change - 更改日志记录方式 重构手动控制日志记录
|
1 year ago |
|
wangsr
|
513884b90f
|
change - 添加DB2119数据块 手动控制更新新数据块 添加螺旋称量值
|
1 year ago |
|
nodyang
|
c434a64a2a
|
点击变颜色
|
1 year ago |
|
wangsr
|
72d675cb2f
|
change - 设备细节画面报警重构 - 部分完成
|
1 year ago |
|
nodyang
|
799c0ea68c
|
1 在湿混机下面加个Rva 小车 信息。 监控有没有报警
|
1 year ago |
|
nodyang
|
d4223bf026
|
对接闽安系统 点击按钮提示正在上料
|
1 year ago |
|
wangsr
|
1f52509a44
|
change - 画面展示报表改为PLC读取
|
1 year ago |
|
nodyang
|
b8fd1abf49
|
整改Ip
|
1 year ago |
|
wangsr
|
5c12ca24f1
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
8e8d7507b2
|
change - 修改黑粉统计班次时间
|
1 year ago |
|
wangsr
|
b8e602f016
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/PlcAddressUtil.cs
|
1 year ago |
|
wangsr
|
fc6fd3ebd0
|
改地址
|
1 year ago |
|
wangsr
|
f94f1bf911
|
change - 设备细节画面添加湿混机运转报警指示
|
1 year ago |
|
nodyang
|
d531a2699d
|
添加一个标识 来测试plc 得通讯能力
|
1 year ago |
|
nodyang
|
f30896869a
|
PlcAddressUtil 修改Plc得地址
|
1 year ago |
|
nodyang
|
112fbef84d
|
即使网络不同 也不会影响上位机的使用
|
1 year ago |
|
nodyang
|
61c4818106
|
1 去掉湿混机 8个点击按钮
2 添加日志搜索功能
3 通过按钮点击 增加日志
|
1 year ago |
|
wangsr
|
a2ab66c4cc
|
change - MCRun最新部署 设备细节画面整合报表和图像代码
|
1 year ago |
|
wangsr
|
ebbe6ffcc0
|
debug - 实时刷新手动控制读取数据
|
1 year ago |
|
wangsr
|
b1158a6a17
|
debug - 实例化代码缺少 - 修复
|
1 year ago |
|
wangsr
|
5b089e9709
|
change - PLC读取机制更改为一次读取整个数据块，性能优化成功 add - 黑粉统计报表添加最近班次统计功能
|
1 year ago |
|
nodyang
|
23b27f9eb8
|
提供思路的版本
|
1 year ago |
|
nodyang
|
90662b1bcd
|
优化代码
|
1 year ago |
|
nodyang
|
d1b58cc778
|
Merge branch 'dep' into dep_nodyang
|
1 year ago |
|
nodyang
|
9c975c936b
|
正式的dep
|
1 year ago |
|
nodyang
|
f815fe9bca
|
时间改为8
|
1 year ago |
|
wangsr
|
3c96697d35
|
change - 统计报表时间不精确问题解决
|
1 year ago |
|
wangsr
|
d54cd8c9a4
|
add - 黑粉统计添加明细和查询 change - 设备细节画面性能优化、错误校对
|
1 year ago |
|
nodyang
|
0c76f9fdaa
|
测试的plc
|
1 year ago |
|
nodyang
|
1f6bf2fda2
|
Merge branch 'dep1011' into dep_nodyang
|
1 year ago |
|
nodyang
|
b2af627760
|
接口
|
1 year ago |
|
nodyang
|
50858979e4
|
Merge
|
1 year ago |
|
nodyang
|
d8d71bf3f0
|
merge
|
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
|
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 |