Commit Graph

296 Commits (baea38c619b62ff082208ea9118502b45f61fad3)
 

Author SHA1 Message Date
nodyang baea38c619 LjReport
nodyang 114b0ae6bd 暂时推送
nodyang 89f1f6ec93 临时存放数据
nodyang dfe261ff96 Merge branch 'dep' into dep1011
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
#	Main/MCEdit/MCEdit.csproj
nodyang ef86b96e76 修复一个版本
nodyang d65b6c7475 临时提交
nodyang 9f3c4e30ca Merge branch 'wangsr' into dep
wangsr 8676e8eda5 3000
wangsr a507327a96 临时提交
wangsr 4fb0b10928 半夜需求
wangsr 804e322945 add - hsl通讯展示界面 性能待优化
wangsr dc63fbdaf4 change - 加载时读取配置,修改配置
wangsr 5b71bd3012 add - 添加对接地址
wangsr 948af42a47 add - 手动控制添加保存功能
wangsr 15c2a22cf3 change - 重构手动控制 完善日志 添加焦点控制
wangsr af47d12b9b add - 下班前完善 - 添加按钮链接
wangsr 41fde0575d add - 处理下发请求
wangsr bcd9ccae26 add - 手动控制程序 添加日志 完善代码
wangsr ac92eb3529 add - timeradd
wangsr fb1ff146c0 add - 手动控制完成 下班
wangsr 1c27c80404 add - 手动操控 糊化机新需求 待整合PLC
wangsr ef46dce828 add - 手动控制等待引入PLC
wangsr 865c17e169 add - 手动控制添加
wangsr 868917498f change - 修改物料信息操作错误
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