Commit Graph

667 Commits (7b14d4ec22bcb06c7fc20e5f8797ca8282fa8316)
 

Author SHA1 Message Date
wangsr 9b31b74429 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 2a39faf545 add - 自动控制准备编辑写入plc部分 准备合并 1 year ago
nodyang bb594c19b0 StockMaterrialDbHelp 改成静态 1 year ago
nodyang 15497c35fe GetManScrew 1 year ago
nodyang 29ecb2f5ea Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
nodyang e31425205e merge 1 year ago
nodyang c021fccbf3 DB2105WriteHelper 修复2105启动运行 停止运行 设定 1 year ago
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
wangsr 745a8fdab2 Merge branch 'dep_nodyang' into wangsr 1 year ago
nodyang 8523ffec52 去掉plc 1 year ago
nodyang d7cd1d90bc 整理代码 add 读取配置和 下工艺 1 year ago
wangsr cd3d3fcf1b add - 添加自动控制界面,初步排版完成 1 year ago
nodyang 561213fe66 读取配置 1 year ago
nodyang 16840c81fc 增加点位 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
nodyang a4cd1b8cf5 读取Db3000Help 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 7fb60e4423 Merge branch 'wangsr' of http://175.27.215.92:3000/yangw/lj_plc into wangsr 1 year ago
wangsr 3e03c8da8e merge error 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