wangsr
|
ac187e588e
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs
# DataBlockHelper/DBHelpers/DB2105Helper.cs
|
12 months ago |
|
wangsr
|
c7656457e9
|
add - 日志控制抽离 添加单独日志查询界面
|
12 months ago |
我叫锄头
|
d6fba409f8
|
RunStatus
|
12 months ago |
|
我叫锄头
|
0d00e4ccff
|
修改数据区,把手动称量变成自动称量区域
|
12 months ago |
|
我叫锄头
|
42a8b09541
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
12 months ago |
|
我叫锄头
|
4a6be9a74c
|
ReadFeededDry
|
12 months ago |
|
wangsr
|
fc608412e9
|
change - 手动日志抽离
|
12 months ago |
|
wangsr
|
a8df236d9c
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
12 months ago |
|
wangsr
|
bc0f71814b
|
change - 去掉老代码注释
|
12 months ago |
|
我叫锄头
|
9e69b8b71f
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
|
12 months ago |
|
我叫锄头
|
14d60578cd
|
机台不显示
|
12 months ago |
|
wangsr
|
a8f9e02d7f
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
12 months ago |
|
wangsr
|
bb9e0220ad
|
add - 输送界面 前端和plc数据连接 添加报警
|
12 months ago |
|
我叫锄头
|
b0556171c9
|
水称调整
|
12 months ago |
|
我叫锄头
|
6748c7fe4c
|
干混机称量准备好
|
12 months ago |
|
wangsr
|
aaa4338292
|
add - 上一提交遗漏
|
12 months ago |
|
wangsr
|
3f15104ee0
|
add - 输送前后端连接 准备对点位
|
12 months ago |
|
我叫锄头
|
d2a47627bc
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
12 months ago |
|
我叫锄头
|
038843b98a
|
WetGelatDownload 手动下料
|
12 months ago |
|
wangsr
|
03523bd0ac
|
change - use goto
|
12 months ago |
|
wangsr
|
6d2d3d0529
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
12 months ago |
|
wangsr
|
cb428310be
|
change - 优化代码
|
12 months ago |
|
我叫锄头
|
fa6c67e67f
|
7 8号的湿混机器显示称量位数不对
|
12 months ago |
|
我叫锄头
|
5b7fd0cc53
|
DM2DSF01L_Set
|
12 months ago |
|
我叫锄头
|
2cbd5417d9
|
Revert "yang 4特殊处理下 采用2109 采用一次赋值"
This reverts commit b530e3b261.
|
12 months ago |
|
我叫锄头
|
b530e3b261
|
yang 4特殊处理下 采用2109 采用一次赋值
|
12 months ago |
|
wangsr
|
d2d8ac85ab
|
change - 四个产线类型改八个
|
12 months ago |
|
wangsr
|
e59f052e1f
|
add - 添加产线种类显示
|
12 months ago |
|
wangsr
|
cd3cee5246
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
12 months ago |
|
wangsr
|
7d172eef65
|
change - 设备细节更改
|
12 months ago |
|
我叫锄头
|
71e4afb05d
|
GetLGInfo
|
12 months ago |
|
我叫锄头
|
a24ed4c363
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
12 months ago |
|
我叫锄头
|
a6567eda2a
|
有烟无烟的接口
|
12 months ago |
|
wangsr
|
6a80c9d015
|
change - 自动控制速度参数验证
|
12 months ago |
|
wangsr
|
73389d51b4
|
change - 代码错误修改
|
12 months ago |
|
wangsr
|
c5187c76c0
|
add - 自动干混添加速度
|
12 months ago |
|
wangsr
|
765dedaf93
|
add - 手动控制添加请求接料按钮
|
12 months ago |
|
wangsr
|
399af4525e
|
change - 更改滚动条代码
|
12 months ago |
|
我叫锄头
|
eef0f2f153
|
mege
|
12 months ago |
|
wangsr
|
5ab7ddf522
|
add - 报警滚动条
|
12 months ago |
|
我叫锄头
|
26dc8dd35c
|
修改testaction
|
12 months ago |
|
我叫锄头
|
6a639b5912
|
HslMoveText
|
12 months ago |
|
我叫锄头
|
bcb198e65a
|
水称下传 水秤添加 differ 和 stand
|
1 year ago |
|
我叫锄头
|
333de46638
|
加冷水
|
1 year ago |
|
wangsr
|
77f07468a3
|
add - 自动控制水称添加偏差值 设备细节报表界面添加车次 时间格式更改
|
1 year ago |
|
我叫锄头
|
85446cfce6
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
我叫锄头
|
249eb1e1bc
|
读取报表 和消除报警
|
1 year ago |
|
wangsr
|
9c1b313c1f
|
add - 设备细节画面完整报表
|
1 year ago |
|
wangsr
|
5353c33893
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
4fce1247ef
|
change - plcreadchange
|
1 year ago |
|
我叫锄头
|
692ee290bc
|
ReportReadDb 整理报表的读取
|
1 year ago |
|
我叫锄头
|
80b7eb2ef0
|
湿混机 干混机 糊化机实体类
|
1 year ago |
|
wangsr
|
c0bb2f6f1a
|
change - 小bug
|
1 year ago |
|
wangsr
|
465f35da13
|
add - 添加 报表细节
|
1 year ago |
|
我叫锄头
|
378c57118d
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
我叫锄头
|
e7ad3b2e9d
|
yang 4特殊处理下 采用2107
|
1 year ago |
|
wangsr
|
82630f1bcd
|
change - true false 改为 文字显示
|
1 year ago |
|
wangsr
|
9778e9d2c6
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
33f325e450
|
change - 设备细节画面添加报表
|
1 year ago |
|
我叫锄头
|
586d3879a8
|
DB3000 修复 7 和8
|
1 year ago |
|
wangsr
|
3ef1d680a4
|
change - 强制排水优化
|
1 year ago |
|
wangsr
|
4e9dcd6bd2
|
change - 强制排水错误修改
|
1 year ago |
|
wangsr
|
92ee1aec3f
|
change - 自动控制添加干混机控制步骤 删除plc校对功能（不完善）信息展示界面删除报警时间
|
1 year ago |
|
我叫锄头
|
1356676b13
|
解决大于400 不统计数据的问题
|
1 year ago |
|
wangsr
|
633a70b20d
|
delete - 删除错误提示
|
1 year ago |
|
wangsr
|
d0af57087e
|
add - 强制手动加水
|
1 year ago |
|
wangsr
|
d66d412077
|
add - 强制水称控制
|
1 year ago |
|
wangsr
|
db3fc8b4f4
|
change - 数字显示替换 添加搅拌总锅数统计
|
1 year ago |
|
wangsr
|
f4eb4b7dd4
|
change - 添加hsl数字led显示 待测试
|
1 year ago |
|
wangsr
|
0b9c8b3233
|
add - 控件可行性分析
|
1 year ago |
|
我叫锄头
|
c795500b11
|
Demo
|
1 year ago |
|
wangsr
|
4ea06e3a12
|
Merge branch 'wangsr' into dep
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs
|
1 year ago |
|
我叫锄头
|
f4f432fbe4
|
excle
|
1 year ago |
|
我叫锄头
|
98b1e57476
|
去掉excle
|
1 year ago |
|
我叫锄头
|
1096f7527e
|
排水限制
|
1 year ago |
|
我叫锄头
|
e5497ecfc9
|
【自动】修复排水的问题
|
1 year ago |
|
我叫锄头
|
082249068a
|
LED灯
|
1 year ago |
|
wangsr
|
e83ec7e87d
|
change - 添加验证 优化代码
|
1 year ago |
|
wangsr
|
98bd3c57c4
|
delete - 小简化
|
1 year ago |
|
wangsr
|
502ca66d25
|
准备简化项目
|
1 year ago |
|
wangsr
|
9057fb6d9b
|
change - 自动控制plc校验
|
1 year ago |
|
wangsr
|
9d14708a28
|
add - 添加称量中是否排水验证
|
1 year ago |
|
wangsr
|
0fdf1f661f
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
0eadc42fff
|
add - 湿混糊化plc下发验证
|
1 year ago |
|
我叫锄头
|
2af54fb64f
|
对接接口
|
1 year ago |
|
wangsr
|
2e2603aae2
|
change - 界面时间不同改变颜色
|
1 year ago |
|
wangsr
|
18c2186017
|
add - 自动添加复制粘贴配置
|
1 year ago |
|
wangsr
|
7ae0b0f22c
|
add - 自动控制添加下料检测 展示界面添加混炼完成指示无故熄灭报警
|
1 year ago |
|
我叫锄头
|
18e0614a3d
|
LSCREWBIG
|
1 year ago |
|
wangsr
|
2d2adbedf7
|
add - 湿混等待统计添加报表导出功能 监控界面小改
|
1 year ago |
|
wangsr
|
7d43083004
|
change - 湿混时间统计日期统计问题
|
1 year ago |
|
wangsr
|
ce5cc9974b
|
change - 湿混机统计时间显示错误
|
1 year ago |
|
wangsr
|
2e8dde6a35
|
add - 增加防止下错料验证
|
1 year ago |
|
wangsr
|
1cbb7eb74d
|
change - 报表时分秒显示
|
1 year ago |
|
wangsr
|
d1c66df369
|
add - 输送界面准备完毕 添加湿混机对接RGV时间统计
|
1 year ago |
|
wangsr
|
60898a6830
|
change - 准备输送界面 代码简化
|
1 year ago |
|
wangsr
|
2defa0a367
|
Merge branch 'dep' into dep_pf
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ChemicalWeighingPlc/PlcPlanHelper.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/FinishBatchHelper.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/ReportGelDoserHelper.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/LjFormulaDetailDownEntity.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjClick/FormClientManager.Designer.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjClick/FormClientManager.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjClick/FormClientManager.resx
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjClick/InitFormAction.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjHelp.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/MetageHelp.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownToDatabase.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownloadAction.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/PauseAction.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/WeightSettingPlc.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Pl/PlcConnect.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/PptPlan/AutoDownloadAction.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Sys/TimerRunService.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/DeleteAction.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/FrmRecipe.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/ModifyRecipeAction.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/SelectRecipe.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/SetCratParam.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/SetCratParamForm.cs
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
# DataBlockHelper/DataBlockHelper.csproj
# DataBlockHelper/Entity/ClickEntity.cs
# DataBlockHelper/PlcConnect.cs
# Main/MCEdit/Data/MCProject/SCWSProject2.mprj
# Main/MCEdit/Data/MCProject/nodeForm/Form1.xml
|
1 year ago |
|
wangsr
|
564616b7bf
|
change - 自动控制代码重构
|
1 year ago |
|
wangsr
|
051c41da3d
|
add - 干混机糊化机整合 干混机功能添加
|
1 year ago |
|
wangsr
|
4ef5cc7372
|
自动控制添加日志
|
1 year ago |