Commit Graph

432 Commits (f03460bbdc610d65024a8c9f0da4c594b6ad3fe4)

Author SHA1 Message Date
wangsr c298569b3f add - Plc数据读取-816下班 1 year ago
wangsr 924bdf72db add - 电机调试2(业务偏差) 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 测试代码 2 years ago
nodyang ffc4a8fc8f 小车封装 2 years ago
nodyang a69f8847d8 E:\mesnac\化工项目源码\源码 2 years 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 - 注释修改 3 years ago
wenjy 2c0c501dfb change - 角色信息 3 years ago
wenjy d804444f07 change - 计划重传、终止 3 years ago
wenjy 2b60edee67 读取plc计划执行状态 3 years ago
wenjy 44e64eaf52 change - 计划下传完成判断 3 years ago
wenjy 3580a27deb change - 配方另存 3 years ago
wenjy cac7cddaa3 change - 修改 3 years ago
wenjy e8df0f97a7 添加项目文件。 3 years ago