nodyang
|
9f3c4e30ca
|
Merge branch 'wangsr' into dep
|
2 years ago |
wangsr
|
8676e8eda5
|
3000
|
2 years ago |
|
wangsr
|
a507327a96
|
临时提交
|
2 years ago |
|
wangsr
|
4fb0b10928
|
半夜需求
|
2 years ago |
|
wangsr
|
804e322945
|
add - hsl通讯展示界面 性能待优化
|
2 years ago |
|
wangsr
|
dc63fbdaf4
|
change - 加载时读取配置，修改配置
|
2 years ago |
|
wangsr
|
5b71bd3012
|
add - 添加对接地址
|
2 years ago |
|
wangsr
|
948af42a47
|
add - 手动控制添加保存功能
|
2 years ago |
|
wangsr
|
15c2a22cf3
|
change - 重构手动控制 完善日志 添加焦点控制
|
2 years ago |
|
wangsr
|
af47d12b9b
|
add - 下班前完善 - 添加按钮链接
|
2 years ago |
|
wangsr
|
41fde0575d
|
add - 处理下发请求
|
2 years ago |
|
wangsr
|
bcd9ccae26
|
add - 手动控制程序 添加日志 完善代码
|
2 years ago |
|
wangsr
|
ac92eb3529
|
add - timeradd
|
2 years ago |
|
wangsr
|
fb1ff146c0
|
add - 手动控制完成 下班
|
2 years ago |
|
wangsr
|
1c27c80404
|
add - 手动操控 糊化机新需求 待整合PLC
|
2 years ago |
|
wangsr
|
ef46dce828
|
add - 手动控制等待引入PLC
|
2 years ago |
|
wangsr
|
865c17e169
|
add - 手动控制添加
|
2 years ago |
|
wangsr
|
868917498f
|
change - 修改物料信息操作错误
|
2 years ago |
|
wangsr
|
6f79836a47
|
change - 合并问题修改
|
2 years ago |
|
wangsr
|
75b3867d42
|
change - 项目简化
|
2 years ago |
|
wangsr
|
7963bec699
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
2 years ago |
|
wangsr
|
1456c3f30c
|
delete - 删除无用文件
|
2 years 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
|
2 years ago |
|
wangsr
|
e8899e6ec7
|
change - 拉取前提交
|
2 years ago |
|
wangsr
|
fad95ec358
|
change - 简化代码初步
|
2 years ago |
|
wangsr
|
a9a63d5d9e
|
change - 更改布局
|
2 years ago |
|
wangsr
|
c32d14d2f9
|
update - 小修改
|
2 years ago |
|
wangsr
|
1f219d415c
|
修复代码
|
2 years 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
|
2 years ago |
|
wangsr
|
4bfc54b494
|
测试提交
|
2 years ago |
|
wangsr
|
02c1e461dd
|
add - 榄菊计划管理 新增查询条件
|
2 years ago |
|
wangsr
|
c5c60daf59
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
2 years ago |
|
wangsr
|
8455a4b825
|
change - 加载界面
|
2 years ago |
|
nodyang
|
a3ba502b80
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
2 years ago |
|
nodyang
|
e1342383fb
|
0915 替换plc
|
2 years ago |
|
wangsr
|
90c7c0381e
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
2 years ago |
|
wangsr
|
34efa803e1
|
修改推送问题
|
2 years ago |
|
wangsr
|
d9980be420
|
合并
|
2 years ago |
|
wangsr
|
67ab37d415
|
Add - LJPlanning-TestAction等待实装
|
2 years ago |
|
wangsr
|
65848c2175
|
add - 添加计划状态下拉框 数据库变更
|
2 years ago |
|
wangsr
|
6e98ca3d4c
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
2 years ago |
|
wangsr
|
37fcb77890
|
change - 计划配方新增查询功能
|
2 years ago |
|
nodyang
|
8a021e197c
|
采用胡工 替换西门子
|
2 years ago |
|
nodyang
|
33cde15530
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
2 years ago |
|
nodyang
|
9c5ad7a7c5
|
准备继承 hsl
|
2 years ago |
nodyang
|
6eaee007f6
|
Demo
|
2 years ago |
|
nodyang
|
af59930b1b
|
ok
|
2 years ago |
|
nodyang
|
f2fe90ef1a
|
freesql
|
2 years ago |
|
nodyang
|
c9087e86de
|
添加数据访问
|
2 years ago |
|
wangsr
|
7919c71752
|
change - 下班前小修改
|
2 years ago |