nodyang
|
d4fa9f6fdb
|
DownM8Recip 湿混机 6 7 8 地址不对
|
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
|
9d346c0b69
|
add - 完善自动代码
|
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
|
366640bdca
|
DeviceMaterrial
|
1 year ago |
nodyang
|
25a8cad456
|
merge
|
1 year ago |
wangsr
|
2a39faf545
|
add - 自动控制准备编辑写入plc部分 准备合并
|
1 year ago |
wangsr
|
c1c84b2979
|
Merge branch 'wangsr' of http://175.27.215.92:3000/yangw/lj_plc into wangsr
|
1 year ago |
wangsr
|
27fad81be8
|
add - 自动控制 - 新版
|
1 year ago |
nodyang
|
0125e123f5
|
fix
|
1 year ago |
nodyang
|
d7cd1d90bc
|
整理代码 add 读取配置和 下工艺
|
1 year ago |
nodyang
|
561213fe66
|
读取配置
|
1 year ago |
nodyang
|
ef86b96e76
|
修复一个版本
|
1 year ago |
wangsr
|
6f79836a47
|
change - 合并问题修改
|
1 year ago |
wangsr
|
75b3867d42
|
change - 项目简化
|
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
|
8455a4b825
|
change - 加载界面
|
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
|
9c5ad7a7c5
|
准备继承 hsl
|
1 year ago |
wangsr
|
a62b3fc913
|
change - yw保存报表界面美化
|
1 year ago |
nodyang
|
cd50514e00
|
修复按钮
|
1 year ago |
nodyang
|
7e71fd990b
|
2107 add 新增数据库2107
|
1 year ago |
nodyang
|
a5e0b1e767
|
0912 测试计划的版本呢
|
1 year ago |
nodyang
|
9fbf00b15f
|
mege
|
1 year ago |
nodyang
|
1f0c2da3d3
|
Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
|
1 year ago |
nodyang
|
7848b05546
|
merge
|
1 year ago |
wangsr
|
28de46fb64
|
change - 界面美化
|
1 year ago |
nodyang
|
9f13b74e6d
|
0907 晚上临时提交
|
1 year ago |
wangsr
|
62bbcfaf91
|
解决合并冲突 最终正常期望版本
|
1 year ago |
nodyang
|
e6ce524df2
|
0907
|
1 year ago |
wangsr
|
d8b0eb696d
|
add - 输送监视图完成 点位开始维护 换电脑
|
1 year ago |