Commit Graph

322 Commits (8e8d7507b2c894900e0cb9b4f236d16e6934589c)
 

Author SHA1 Message Date
wangsr 6f79836a47 change - 合并问题修改
wangsr 75b3867d42 change - 项目简化
wangsr 7963bec699 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 1456c3f30c delete - 删除无用文件
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
wangsr e8899e6ec7 change - 拉取前提交
wangsr fad95ec358 change - 简化代码初步
wangsr a9a63d5d9e change - 更改布局
wangsr c32d14d2f9 update - 小修改
wangsr 1f219d415c 修复代码
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
wangsr 4bfc54b494 测试提交
wangsr 02c1e461dd add - 榄菊计划管理 新增查询条件
wangsr c5c60daf59 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 8455a4b825 change - 加载界面
nodyang a3ba502b80 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
nodyang e1342383fb 0915 替换plc
wangsr 90c7c0381e Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 34efa803e1 修改推送问题
wangsr d9980be420 合并
wangsr 67ab37d415 Add - LJPlanning-TestAction等待实装
wangsr 65848c2175 add - 添加计划状态下拉框 数据库变更
wangsr 6e98ca3d4c Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 37fcb77890 change - 计划配方新增查询功能
nodyang 8a021e197c 采用胡工 替换西门子
nodyang 33cde15530 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
nodyang 9c5ad7a7c5 准备继承 hsl
nodyang 6eaee007f6 Demo
nodyang af59930b1b ok
nodyang f2fe90ef1a freesql
nodyang c9087e86de 添加数据访问
wangsr 7919c71752 change - 下班前小修改
wangsr a62b3fc913 change - yw保存报表界面美化
wangsr ddf2e523be Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
wangsr 3cda278e1d change - 界面美化
nodyang cd50514e00 修复按钮
wangsr f926545355 change - 修改nodedevice 完善设备监控图 发版前准备
wangsr 63eab8ca08 add - 设备监控界面添加报警
wangsr 37e66a188d add - 报表plchelper数据读取废案
nodyang 94101f3a1d 后台运行
wangsr acebd40093 Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
wangsr 12927af05a change - 展示界面报表添加
nodyang 751b3f53ab Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
nodyang 55a9a78539 0913 整理代码
wangsr ab7419f990 Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
# Conflicts:
#	Main/MCEdit/Data/MCProject/nodeDevice.xml
wangsr 4c5f60e7fb change - 展示界面添加高低料位等
nodyang e9f1825eaf Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
# Conflicts:
#	Main/MCEdit/Data/MCProject/nodeDevice.xml
nodyang 7e71fd990b 2107 add 新增数据库2107
wangsr 96afbeffa4 Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownloadAction.cs
wangsr e74338a03d change - 界面设置