nodyang
|
9379b9d227
|
Merge branch 'wangsr' into dep
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
# Main/MCEdit/Data/MCProject/SCWSProject2.mprj
|
1 year ago |
|
nodyang
|
eed38ad76e
|
Merge branch 'dep_plan' into dep
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
# Main/MCEdit/Data/MCProject/SCWSProject2.mprj
|
1 year ago |
|
nodyang
|
2c79df191e
|
代码整理
|
1 year ago |
wangsr
|
10d988c5d7
|
change - 干混 湿混 糊化 报表均已完成
|
1 year ago |
|
wangsr
|
45e545a79d
|
record - 新尝试备份
|
1 year ago |
|
wangsr
|
18eb26b929
|
- change FinishBatchService类自动存盘处理添加
|
1 year ago |
|
wangsr
|
1925bef7a6
|
add - 糊化机报表 初始化 查询 双击加载 导出 湿混机报表些许问题待完善
|
1 year ago |
|
wangsr
|
a3d5f972db
|
解决冲突 合并
|
1 year ago |
|
wangsr
|
948bdaf7c4
|
add - 湿混机报表 - 功能缺陷
|
1 year ago |
|
wangsr
|
85e2019459
|
change - 干混机类名修改
|
1 year ago |
|
wangsr
|
0b0b801b2d
|
change- run运行问题处理
|
1 year ago |
|
wangsr
|
310c518435
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
2eead45dcd
|
change - 還原
|
1 year ago |
|
nodyang
|
ef5ad1188a
|
fixCode
|
1 year ago |
|
wangsr
|
35a9e622af
|
Revert "change - 干混机报表导出事件"
This reverts commit 68ef3b8f49.
|
1 year ago |
|
wangsr
|
2dbc258001
|
change - 提交
|
1 year ago |
|
wangsr
|
d2a83d1392
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
# Main/MCEdit/Data/MCProject/SCWSProject2.mprj
|
1 year ago |
|
wangsr
|
2705805e9e
|
解决冲突
|
1 year ago |
|
wangsr
|
68ef3b8f49
|
change - 干混机报表导出事件
|
1 year ago |
|
wangsr
|
845d3aa2c0
|
add - 干混机报表事件：初始化、查询、双击加载明细、导出
|
1 year ago |
|
wangsr
|
e369e85122
|
add - 干混机报表事件：初始化、查询、明细加载、导出
|
1 year ago |
 wenjy
|
918e13579f
|
change - 报警逻辑代码优化
|
1 year ago |
|
wenjy
|
1704350b44
|
change - 报警读取逻辑代码优化
|
1 year ago |
|
wenjy
|
fcd32f6ee7
|
change - 报表数据保存代码优化
|
1 year ago |
|
wenjy
|
4a9bef5fac
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wenjy
|
3c9dd0e37f
|
change - 代码整理
|
1 year ago |
|
wangsr
|
5fae34a7e4
|
Merge remote-tracking branch 'origin/dep' into dep
|
1 year ago |
|
wangsr
|
f59f92144c
|
change - 数据源修改
|
1 year ago |
|
wenjy
|
ae8f502a86
|
add - 干混机报表数据保存
|
1 year ago |
|
nodyang
|
ae58b33366
|
Merge branch 'wangsr' into dep_plan
|
1 year ago |
|
nodyang
|
e091fb94e8
|
demo
|
1 year ago |
|
wangsr
|
127f02c930
|
222
|
1 year ago |
|
wangsr
|
fbf5894f9f
|
测试
|
1 year ago |
|
wenjy
|
fcdf6ce7d6
|
change - 干混机报表数据读取
|
1 year ago |
|
wangsr
|
39159ad352
|
窗口美化 完毕
|
1 year ago |
|
wangsr
|
069ce8225d
|
Merge branch 'dep' into wangsr
|
1 year ago |
|
wangsr
|
00ebb2f69d
|
报警灯完善
|
1 year ago |
|
wenjy
|
c29239fef0
|
change - 初始化引擎时加载Hsl、报警灯模块
|
1 year ago |
|
wangsr
|
febbba11c9
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into wangsr
|
1 year ago |
|
wangsr
|
1faaf589c4
|
change - 接入报警灯
|
1 year ago |
|
wenjy
|
969946be45
|
add - 增加报警灯控制
|
1 year ago |
|
wenjy
|
22b6de500b
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wenjy
|
440d9564c2
|
change - 保存报警信息
|
1 year ago |
|
wangsr
|
8f7481b3bc
|
Merge branch 'wangsr' into dep_plan
# Conflicts:
# Main/MCEdit/Data/MCProject/SCWSProject2.mprj
|
1 year ago |
|
wangsr
|
ad016a535e
|
前端页面修改 -未完成
|
1 year ago |
|
wangsr
|
71092f75f6
|
qqw
|
1 year ago |
|
wangsr
|
90d62551a6
|
Merge branch 'dep_plan' into wangsr
# Conflicts:
# Main/MCEdit/Data/MCProject/SCWSProject2.mprj
|
1 year ago |
|
nodyang
|
5bf766ff4a
|
都没
|
1 year ago |
|
nodyang
|
7034f0a654
|
Merge branch 'dep' into dep_plan
# Conflicts:
# Main/MCEdit/Data/MCProject/SCWSProject2.mprj
|
1 year ago |
|
nodyang
|
59fb13fa48
|
修复物料和大仓的关系
|
1 year ago |