Commit Graph

80 Commits (465c348df0e933f05dbf315419b4c7f21b8f2c74)

Author SHA1 Message Date
nodyang 465c348df0 应用类库
nodyang dd9fcefccf 修改plc
nodyang df5758ff0c Merge branch 'dep' into dep_yangw
wenjy 58cc555f55 change - 超级管理员密码修改
wenjy d5360fe47c change - office引用修改
nodyang 25a475a47f 删除plc
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
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
nodyang 2c79df191e 代码整理
wangsr 10d988c5d7 change - 干混 湿混 糊化 报表均已完成
wangsr 45e545a79d record - 新尝试备份
wangsr 18eb26b929 - change FinishBatchService类自动存盘处理添加
wangsr 1925bef7a6 add - 糊化机报表 初始化 查询 双击加载 导出 湿混机报表些许问题待完善
wangsr a3d5f972db 解决冲突 合并
wangsr 948bdaf7c4 add - 湿混机报表 - 功能缺陷
wangsr 85e2019459 change - 干混机类名修改
wangsr 0b0b801b2d change- run运行问题处理
nodyang ef5ad1188a fixCode
wangsr 35a9e622af Revert "change - 干混机报表导出事件"
This reverts commit 68ef3b8f49.
wangsr 2dbc258001 change - 提交
wangsr 2705805e9e 解决冲突
nodyang ae58b33366 Merge branch 'wangsr' into dep_plan
nodyang e091fb94e8 demo
wangsr 39159ad352 窗口美化 完毕
wangsr febbba11c9 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into wangsr
wangsr 1faaf589c4 change - 接入报警灯
wenjy 969946be45 add - 增加报警灯控制
wenjy 440d9564c2 change - 保存报警信息
wangsr 8f7481b3bc Merge branch 'wangsr' into dep_plan
# Conflicts:
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
wangsr ad016a535e 前端页面修改 -未完成
wangsr 71092f75f6 qqw
nodyang 5bf766ff4a 都没
nodyang 7034f0a654 Merge branch 'dep' into dep_plan
# Conflicts:
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
nodyang 59fb13fa48 修复物料和大仓的关系
wenjy 245656cc68 change - 报警数据读取
nodyang 6ac73f7201 demo
wenjy 30661be234 change - 集成HSL PLC读取模块
wenjy 10f3db53bf change - 报警维护
nodyang 425828021a 临时提交
nodyang e4da793b9c 临时提交代码到服务器
nodyang a441d9ca59 0801 临时提交
nodyang 896c081d3b 修复产线不neng
nodyang 65292edda5 0801 新的分支
nodyang 1c86b66fd1 haiwei
nodyang 8afe01f752 demo
nodyang 1d6383267f 0725 提交的数据
nodyang e068ae7bb0 TestAction
nodyang 7cd2db0e45 周日提价
nodyang a61f54582e 周五特别版本
nodyang 1ec39f960d 0719 提交