Commit Graph

459 Commits (d0af57087eb1e4d09b250ef6ebfb5d2a5041015b)
 

Author SHA1 Message Date
wangsr 5ad4008138 add - 自动增加开关指示 1 year ago
nodyang 5a2b9e5c2b 修复水秤的bug 变异量不对 1 year ago
wangsr 3cc7023fb5 change - 水称加入初始化读取 1 year ago
wangsr dee332a98f debug - 自动控制问题修改 1 year ago
wangsr 7fc6077b8c Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs
1 year ago
wangsr 24c668cb42 change - 自动控制单选变色 1 year ago
nodyang bf62b0ec69 获取控件和修改数数量 1 year ago
wangsr b3638888ea finish - 自动控制代码初步完成 1 year ago
wangsr 8c8dbc7b23 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 62d5726a48 change - 优化代码 1 year ago
nodyang 7debe29fb0 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
nodyang d4fa9f6fdb DownM8Recip 湿混机 6 7 8 地址不对 1 year ago
wangsr 268504564a Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs
1 year ago
wangsr 40199b6cde change - 规范代码 1 year ago
nodyang fa35c70ad8 souce 1 year ago
nodyang 27ab6500c7 暂存plc 有问题 修复plc 读数有问题 1 year ago
wangsr 034d3b1a92 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 6b66086ba6 merge 1 year ago
nodyang 2f2a247f13 short 类型问题 1 year ago
nodyang 730d508524 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
nodyang 9b486b5c75 修复plc 读取错误 1 year ago
wangsr 48461980dc Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 9d346c0b69 add - 完善自动代码 1 year ago
nodyang 1e30a7d07a GetCodeById 1 year ago
nodyang f5b934fdb4 GetCodeById 修复不等于0 的 1 year ago
nodyang 441698afe2 DB2105WriteHelper 添加干混机 湿混机 下料 拍冷热水的按钮事件 1 year ago
wangsr 951df4fd99 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 2a3945d872 add - 手动控制基本完成 - 可以下达数据 1 year ago
nodyang 17198e753f Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
nodyang 366640bdca DeviceMaterrial 1 year ago
wangsr 586725012e Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr c42f69ba1f merge 1 year ago
nodyang b2476a6af4 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
nodyang 6a06438e5b 请选择 1 year ago
wangsr f48552a8da Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr e8f0b31354 merge 1 year ago
nodyang 476fbd3c57 GetDryerMaterrial 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 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