我叫锄头
|
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 |
|
wangsr
|
25ac863d22
|
change - 自动维修模式逻辑问题 已修复
|
1 year ago |
nodyang
|
07edd546a8
|
bug
|
1 year ago |
|
nodyang
|
93ba70bafd
|
修复点击按钮
|
1 year ago |
|
wangsr
|
168b7bdcd2
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
079c5c1d64
|
add - 自动控制更改界面布局 添加维修模式
|
1 year ago |
|
nodyang
|
c84878f388
|
2105 准备信号
|
1 year ago |
|
wangsr
|
ac7d7251c5
|
add - 自动准备上线
|
1 year ago |
|
wangsr
|
020548a811
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
f96ab5dfec
|
add - 自动状态改变显示
|
1 year ago |
|
nodyang
|
a594bc6510
|
插入的plc的 前提是 清理所有的step
|
1 year ago |
|
nodyang
|
2e94fb7cb2
|
修复-1
|
1 year ago |
|
wangsr
|
5ad4008138
|
add - 自动增加开关指示
|
1 year ago |
|
wangsr
|
3cc7023fb5
|
change - 水称加入初始化读取
|
1 year ago |
|
wangsr
|
dee332a98f
|
debug - 自动控制问题修改
|
1 year ago |
|
wangsr
|
7fc6077b8c
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs
|
1 year ago |
|
wangsr
|
24c668cb42
|
change - 自动控制单选变色
|
1 year ago |
|
nodyang
|
bf62b0ec69
|
获取控件和修改数数量
|
1 year ago |
|
wangsr
|
b3638888ea
|
finish - 自动控制代码初步完成
|
1 year ago |
|
wangsr
|
8c8dbc7b23
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
62d5726a48
|
change - 优化代码
|
1 year ago |
|
nodyang
|
7debe29fb0
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
nodyang
|
d4fa9f6fdb
|
DownM8Recip 湿混机 6 7 8 地址不对
|
1 year ago |
|
wangsr
|
268504564a
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs
|
1 year ago |
|
wangsr
|
40199b6cde
|
change - 规范代码
|
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
|
48461980dc
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
9d346c0b69
|
add - 完善自动代码
|
1 year ago |
|
nodyang
|
1e30a7d07a
|
GetCodeById
|
1 year ago |
|
nodyang
|
f5b934fdb4
|
GetCodeById 修复不等于0 的
|
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
|
17198e753f
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
nodyang
|
366640bdca
|
DeviceMaterrial
|
1 year ago |
|
wangsr
|
586725012e
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
c42f69ba1f
|
merge
|
1 year ago |
|
nodyang
|
b2476a6af4
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
nodyang
|
6a06438e5b
|
请选择
|
1 year ago |
|
wangsr
|
f48552a8da
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
e8f0b31354
|
merge
|
1 year ago |
|
nodyang
|
476fbd3c57
|
GetDryerMaterrial
|
1 year ago |
|
wangsr
|
3064f8aabf
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs
|
1 year ago |
|
wangsr
|
a9fe7cdc1b
|
change - 添加combobox
|
1 year ago |
|
nodyang
|
492122310d
|
MyMCCombobox 添加
|
1 year ago |
|
nodyang
|
25a8cad456
|
merge
|
1 year ago |
|
wangsr
|
732fd48f6e
|
合并
|
1 year ago |
|
wangsr
|
9b31b74429
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
2a39faf545
|
add - 自动控制准备编辑写入plc部分 准备合并
|
1 year ago |
|
nodyang
|
bb594c19b0
|
StockMaterrialDbHelp 改成静态
|
1 year ago |
|
nodyang
|
29ecb2f5ea
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
nodyang
|
e31425205e
|
merge
|
1 year ago |
|
wangsr
|
72862134be
|
Merge branch 'dep' into wangsr
|
1 year ago |
|
wangsr
|
153d412a3e
|
add - 自动控制代码前后端连接完成 等待插入Plc
|
1 year ago |
|
nodyang
|
67eb1825d0
|
StockMaterrialDbHelp
|
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 |
|
wangsr
|
5b648d2ff8
|
change - 配置存到数据库 前端页面报警数据位置纠正
|
1 year ago |
|
wangsr
|
21d48d9562
|
change - 规整代码 合并前准备
|
1 year ago |
|
wangsr
|
9c858fb669
|
change - 手动控制校验写入是否成功3
|
1 year ago |
|
nodyang
|
2fd7a22c1d
|
修改系统颜色
|
1 year ago |
|
nodyang
|
fdc12243dc
|
添加闽安功能
|
1 year ago |
|
wangsr
|
a4c1deeef1
|
change - 维护DB91 90 1 手动控制添加冷热水交替检测
|
1 year ago |
|
nodyang
|
656c118b10
|
显示下料的接口
|
1 year ago |
|
wangsr
|
87009dfd0b
|
add - 黑粉统计添加设定值显示
|
1 year ago |
|
wangsr
|
da9eb0b193
|
Merge branch 'wangsr' into dep
|
1 year ago |