Commit Graph

291 Commits (40199b6cde246c3729c36508989a03f8f7574c30)

Author SHA1 Message Date
wangsr 40199b6cde change - 规范代码
nodyang 27ab6500c7 暂存plc 有问题 修复plc 读数有问题
wangsr 034d3b1a92 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 6b66086ba6 merge
nodyang 2f2a247f13 short 类型问题
nodyang 730d508524 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
nodyang 9b486b5c75 修复plc 读取错误
wangsr 48461980dc Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 9d346c0b69 add - 完善自动代码
nodyang 1e30a7d07a GetCodeById
nodyang f5b934fdb4 GetCodeById 修复不等于0 的
wangsr 951df4fd99 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 2a3945d872 add - 手动控制基本完成 - 可以下达数据
nodyang 17198e753f Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
nodyang 366640bdca DeviceMaterrial
wangsr 586725012e Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr c42f69ba1f merge
nodyang b2476a6af4 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
nodyang 6a06438e5b 请选择
wangsr f48552a8da Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr e8f0b31354 merge
nodyang 476fbd3c57 GetDryerMaterrial
wangsr 3064f8aabf Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs
wangsr a9fe7cdc1b change - 添加combobox
nodyang 492122310d MyMCCombobox 添加
nodyang 25a8cad456 merge
wangsr 732fd48f6e 合并
wangsr 9b31b74429 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 2a39faf545 add - 自动控制准备编辑写入plc部分 准备合并
nodyang bb594c19b0 StockMaterrialDbHelp 改成静态
nodyang 29ecb2f5ea Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
nodyang e31425205e merge
wangsr 72862134be Merge branch 'dep' into wangsr
wangsr 153d412a3e add - 自动控制代码前后端连接完成 等待插入Plc
nodyang 67eb1825d0 StockMaterrialDbHelp
wangsr c1c84b2979 Merge branch 'wangsr' of http://175.27.215.92:3000/yangw/lj_plc into wangsr
wangsr 27fad81be8 add - 自动控制 - 新版
nodyang 0125e123f5 fix
nodyang d7cd1d90bc 整理代码 add 读取配置和 下工艺
nodyang 561213fe66 读取配置
wangsr 5b648d2ff8 change - 配置存到数据库 前端页面报警数据位置纠正
wangsr 21d48d9562 change - 规整代码 合并前准备
wangsr 9c858fb669 change - 手动控制校验写入是否成功3
nodyang 2fd7a22c1d 修改系统颜色
nodyang fdc12243dc 添加闽安功能
wangsr a4c1deeef1 change - 维护DB91 90 1 手动控制添加冷热水交替检测
nodyang 656c118b10 显示下料的接口
wangsr 87009dfd0b add - 黑粉统计添加设定值显示
wangsr da9eb0b193 Merge branch 'wangsr' into dep
wangsr 8a033216a2 change - 设备展示界面修改