Commit Graph

9 Commits (b2476a6af4f4b549d003ca78c6fa6f336c1d5f93)

Author SHA1 Message Date
wangsr e8f0b31354 merge 1 year ago
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
1 year ago
wangsr a9fe7cdc1b change - 添加combobox 1 year ago
nodyang 492122310d MyMCCombobox 添加 1 year ago
nodyang 25a8cad456 merge 1 year ago
wangsr 732fd48f6e 合并 1 year ago
wangsr 2a39faf545 add - 自动控制准备编辑写入plc部分 准备合并 1 year ago
wangsr 153d412a3e add - 自动控制代码前后端连接完成 等待插入Plc 1 year ago
wangsr 27fad81be8 add - 自动控制 - 新版 1 year ago