Commit Graph

628 Commits (fe8587cf03313acc58a3c64a670645b6c3be0f1c)
 

Author SHA1 Message Date
wangsr ac92eb3529 add - timeradd 1 year ago
wangsr fb1ff146c0 add - 手动控制完成 下班 1 year ago
wangsr 1c27c80404 add - 手动操控 糊化机新需求 待整合PLC 1 year ago
wangsr ef46dce828 add - 手动控制等待引入PLC 1 year ago
wangsr 865c17e169 add - 手动控制添加 1 year ago
wangsr 868917498f change - 修改物料信息操作错误 1 year ago
wangsr 6f79836a47 change - 合并问题修改 1 year ago
wangsr 75b3867d42 change - 项目简化 1 year ago
wangsr 7963bec699 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 1456c3f30c delete - 删除无用文件 1 year ago
wangsr 0cf3236699 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.Designer.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.cs
1 year ago
wangsr e8899e6ec7 change - 拉取前提交 1 year ago
wangsr fad95ec358 change - 简化代码初步 1 year ago
wangsr a9a63d5d9e change - 更改布局 1 year ago
wangsr c32d14d2f9 update - 小修改 1 year ago
wangsr 1f219d415c 修复代码 1 year ago
wangsr 46ce634bd5 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/InItDbAction.cs
1 year ago
wangsr 4bfc54b494 测试提交 1 year ago
wangsr 02c1e461dd add - 榄菊计划管理 新增查询条件 1 year ago
wangsr c5c60daf59 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 8455a4b825 change - 加载界面 1 year ago
nodyang a3ba502b80 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
nodyang e1342383fb 0915 替换plc 1 year ago
wangsr 90c7c0381e Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 34efa803e1 修改推送问题 1 year ago
wangsr d9980be420 合并 1 year ago
wangsr 67ab37d415 Add - LJPlanning-TestAction等待实装 1 year ago
wangsr 65848c2175 add - 添加计划状态下拉框 数据库变更 1 year ago
wangsr 6e98ca3d4c Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 37fcb77890 change - 计划配方新增查询功能 1 year ago
nodyang 8a021e197c 采用胡工 替换西门子 1 year ago
nodyang 33cde15530 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
nodyang 9c5ad7a7c5 准备继承 hsl 1 year ago
nodyang 6eaee007f6 Demo 1 year ago
nodyang af59930b1b ok 1 year ago
nodyang f2fe90ef1a freesql 1 year ago
nodyang c9087e86de 添加数据访问 1 year ago
wangsr 7919c71752 change - 下班前小修改 1 year ago
wangsr a62b3fc913 change - yw保存报表界面美化 1 year ago
wangsr ddf2e523be Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907 1 year ago
wangsr 3cda278e1d change - 界面美化 1 year ago
nodyang cd50514e00 修复按钮 1 year ago
wangsr f926545355 change - 修改nodedevice 完善设备监控图 发版前准备 1 year ago
wangsr 63eab8ca08 add - 设备监控界面添加报警 1 year ago
wangsr 37e66a188d add - 报表plchelper数据读取废案 1 year ago
nodyang 94101f3a1d 后台运行 1 year ago
wangsr acebd40093 Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907 1 year ago
wangsr 12927af05a change - 展示界面报表添加 1 year ago
nodyang 751b3f53ab Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907 1 year ago
nodyang 55a9a78539 0913 整理代码 1 year ago