我叫锄头
|
692ee290bc
|
ReportReadDb 整理报表的读取
|
12 months ago |
|
我叫锄头
|
80b7eb2ef0
|
湿混机 干混机 糊化机实体类
|
12 months ago |
wangsr
|
c0bb2f6f1a
|
change - 小bug
|
12 months ago |
|
wangsr
|
465f35da13
|
add - 添加 报表细节
|
12 months ago |
|
我叫锄头
|
378c57118d
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
12 months ago |
|
我叫锄头
|
e7ad3b2e9d
|
yang 4特殊处理下 采用2107
|
12 months ago |
|
wangsr
|
82630f1bcd
|
change - true false 改为 文字显示
|
12 months ago |
|
wangsr
|
9778e9d2c6
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
12 months ago |
|
wangsr
|
33f325e450
|
change - 设备细节画面添加报表
|
12 months ago |
|
我叫锄头
|
586d3879a8
|
DB3000 修复 7 和8
|
12 months ago |
|
wangsr
|
3ef1d680a4
|
change - 强制排水优化
|
12 months ago |
|
wangsr
|
4e9dcd6bd2
|
change - 强制排水错误修改
|
12 months ago |
|
wangsr
|
92ee1aec3f
|
change - 自动控制添加干混机控制步骤 删除plc校对功能（不完善）信息展示界面删除报警时间
|
12 months ago |
|
我叫锄头
|
1356676b13
|
解决大于400 不统计数据的问题
|
12 months ago |
|
wangsr
|
633a70b20d
|
delete - 删除错误提示
|
12 months ago |
|
wangsr
|
d0af57087e
|
add - 强制手动加水
|
12 months ago |
|
wangsr
|
d66d412077
|
add - 强制水称控制
|
12 months ago |
|
wangsr
|
db3fc8b4f4
|
change - 数字显示替换 添加搅拌总锅数统计
|
12 months ago |
|
wangsr
|
f4eb4b7dd4
|
change - 添加hsl数字led显示 待测试
|
12 months ago |
|
wangsr
|
0b9c8b3233
|
add - 控件可行性分析
|
12 months ago |
|
我叫锄头
|
c795500b11
|
Demo
|
12 months ago |
|
wangsr
|
4ea06e3a12
|
Merge branch 'wangsr' into dep
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs
|
12 months ago |
|
我叫锄头
|
f4f432fbe4
|
excle
|
12 months ago |
|
我叫锄头
|
98b1e57476
|
去掉excle
|
12 months ago |
|
我叫锄头
|
1096f7527e
|
排水限制
|
12 months ago |
|
我叫锄头
|
e5497ecfc9
|
【自动】修复排水的问题
|
12 months 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 |
|
wangsr
|
8a033216a2
|
change - 设备展示界面修改
|
1 year ago |
|
nodyang
|
1846848362
|
去掉一个引用
|
1 year ago |
|
wangsr
|
26d450e609
|
change - 文字错误更改 螺旋正反转显示实现 dbhelper错误更改
|
1 year ago |
|
wangsr
|
5ca78fc6ef
|
change - 更改日志记录方式 重构手动控制日志记录
|
1 year ago |
|
wangsr
|
513884b90f
|
change - 添加DB2119数据块 手动控制更新新数据块 添加螺旋称量值
|
1 year ago |
|
nodyang
|
c434a64a2a
|
点击变颜色
|
1 year ago |
|
wangsr
|
72d675cb2f
|
change - 设备细节画面报警重构 - 部分完成
|
1 year ago |
|
nodyang
|
799c0ea68c
|
1 在湿混机下面加个Rva 小车 信息。 监控有没有报警
|
1 year ago |
|
nodyang
|
d4223bf026
|
对接闽安系统 点击按钮提示正在上料
|
1 year ago |
|
wangsr
|
1f52509a44
|
change - 画面展示报表改为PLC读取
|
1 year ago |
|
nodyang
|
b8fd1abf49
|
整改Ip
|
1 year ago |
|
wangsr
|
5c12ca24f1
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
8e8d7507b2
|
change - 修改黑粉统计班次时间
|
1 year ago |
|
wangsr
|
b8e602f016
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/PlcAddressUtil.cs
|
1 year ago |
|
wangsr
|
fc6fd3ebd0
|
改地址
|
1 year ago |
|
wangsr
|
f94f1bf911
|
change - 设备细节画面添加湿混机运转报警指示
|
1 year ago |
|
nodyang
|
d531a2699d
|
添加一个标识 来测试plc 得通讯能力
|
1 year ago |
|
nodyang
|
f30896869a
|
PlcAddressUtil 修改Plc得地址
|
1 year ago |
|
nodyang
|
112fbef84d
|
即使网络不同 也不会影响上位机的使用
|
1 year ago |
|
nodyang
|
61c4818106
|
1 去掉湿混机 8个点击按钮
2 添加日志搜索功能
3 通过按钮点击 增加日志
|
1 year ago |
|
wangsr
|
a2ab66c4cc
|
change - MCRun最新部署 设备细节画面整合报表和图像代码
|
1 year ago |
|
wangsr
|
ebbe6ffcc0
|
debug - 实时刷新手动控制读取数据
|
1 year ago |
|
wangsr
|
b1158a6a17
|
debug - 实例化代码缺少 - 修复
|
1 year ago |
|
wangsr
|
5b089e9709
|
change - PLC读取机制更改为一次读取整个数据块，性能优化成功 add - 黑粉统计报表添加最近班次统计功能
|
1 year ago |
|
nodyang
|
23b27f9eb8
|
提供思路的版本
|
1 year ago |
|
nodyang
|
90662b1bcd
|
优化代码
|
1 year ago |
|
nodyang
|
d1b58cc778
|
Merge branch 'dep' into dep_nodyang
|
1 year ago |
|
nodyang
|
9c975c936b
|
正式的dep
|
1 year ago |
|
nodyang
|
f815fe9bca
|
时间改为8
|
1 year ago |
|
wangsr
|
3c96697d35
|
change - 统计报表时间不精确问题解决
|
1 year ago |
|
wangsr
|
d54cd8c9a4
|
add - 黑粉统计添加明细和查询 change - 设备细节画面性能优化、错误校对
|
1 year ago |
|
nodyang
|
0c76f9fdaa
|
测试的plc
|
1 year ago |
|
nodyang
|
1f6bf2fda2
|
Merge branch 'dep1011' into dep_nodyang
|
1 year ago |
|
nodyang
|
b2af627760
|
接口
|
1 year ago |
|
nodyang
|
50858979e4
|
Merge
|
1 year ago |
|
nodyang
|
d8d71bf3f0
|
merge
|
1 year ago |
|
nodyang
|
a0ee2a8868
|
Merge branch 'dep' into dep1011
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
|
1 year ago |
|
nodyang
|
4618441c44
|
删除么有用的报表
|
1 year ago |
|
nodyang
|
dfcfd01e71
|
添加日报表
|
1 year ago |
|
nodyang
|
baea38c619
|
LjReport
|
1 year ago |
|
nodyang
|
114b0ae6bd
|
暂时推送
|
1 year ago |
|
nodyang
|
89f1f6ec93
|
临时存放数据
|
1 year ago |
|
nodyang
|
dfe261ff96
|
Merge branch 'dep' into dep1011
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
# Main/MCEdit/Data/MCProject/SCWSProject2.mprj
# Main/MCEdit/MCEdit.csproj
|
1 year ago |
|
nodyang
|
ef86b96e76
|
修复一个版本
|
1 year ago |
|
nodyang
|
d65b6c7475
|
临时提交
|
1 year ago |
|
nodyang
|
9f3c4e30ca
|
Merge branch 'wangsr' into dep
|
1 year ago |
|
wangsr
|
8676e8eda5
|
3000
|
1 year ago |
|
wangsr
|
a507327a96
|
临时提交
|
1 year ago |
|
wangsr
|
4fb0b10928
|
半夜需求
|
1 year ago |
|
wangsr
|
804e322945
|
add - hsl通讯展示界面 性能待优化
|
1 year ago |
|
wangsr
|
dc63fbdaf4
|
change - 加载时读取配置，修改配置
|
1 year ago |
|
wangsr
|
5b71bd3012
|
add - 添加对接地址
|
1 year ago |
|
wangsr
|
948af42a47
|
add - 手动控制添加保存功能
|
1 year ago |
|
wangsr
|
15c2a22cf3
|
change - 重构手动控制 完善日志 添加焦点控制
|
1 year ago |
|
wangsr
|
41fde0575d
|
add - 处理下发请求
|
1 year ago |
|
wangsr
|
bcd9ccae26
|
add - 手动控制程序 添加日志 完善代码
|
1 year ago |
|
wangsr
|
ac92eb3529
|
add - timeradd
|
1 year ago |
|
wangsr
|
fb1ff146c0
|
add - 手动控制完成 下班
|
1 year ago |
|
wangsr
|
1c27c80404
|
add - 手动操控 糊化机新需求 待整合PLC
|
1 year ago |
|
wangsr
|
ef46dce828
|
add - 手动控制等待引入PLC
|
1 year ago |
|
wangsr
|
865c17e169
|
add - 手动控制添加
|
1 year ago |
|
wangsr
|
868917498f
|
change - 修改物料信息操作错误
|
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
|
c5c60daf59
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
8455a4b825
|
change - 加载界面
|
1 year ago |
|
nodyang
|
e1342383fb
|
0915 替换plc
|
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
|
8a021e197c
|
采用胡工 替换西门子
|
1 year ago |
|
nodyang
|
33cde15530
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
nodyang
|
9c5ad7a7c5
|
准备继承 hsl
|
1 year ago |
|
nodyang
|
6eaee007f6
|
Demo
|
1 year ago |
|
nodyang
|
af59930b1b
|
ok
|
1 year ago |
|
nodyang
|
f2fe90ef1a
|
freesql
|
1 year ago |
|
nodyang
|
c9087e86de
|
添加数据访问
|
1 year ago |
|
wangsr
|
a62b3fc913
|
change - yw保存报表界面美化
|
1 year ago |
|
nodyang
|
cd50514e00
|
修复按钮
|
1 year ago |
|
wangsr
|
f926545355
|
change - 修改nodedevice 完善设备监控图 发版前准备
|
1 year ago |
|
wangsr
|
63eab8ca08
|
add - 设备监控界面添加报警
|
1 year ago |
|
wangsr
|
37e66a188d
|
add - 报表plchelper数据读取废案
|
1 year ago |
|
nodyang
|
94101f3a1d
|
后台运行
|
1 year ago |
|
nodyang
|
55a9a78539
|
0913 整理代码
|
1 year ago |
|
nodyang
|
7e71fd990b
|
2107 add 新增数据库2107
|
1 year ago |
|
nodyang
|
a5e0b1e767
|
0912 测试计划的版本呢
|
1 year ago |
|
wangsr
|
8942b48b85
|
Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
|
1 year ago |
|
wangsr
|
918040618a
|
change - 中横线改下划线
|
1 year ago |
|
nodyang
|
d14fa8de9d
|
demo
|
1 year ago |
|
nodyang
|
aeab567cc7
|
修补缺失的点位
|
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 |
|
nodyang
|
1761df780f
|
Merge branch 'dep0901' into dep
|
1 year ago |
|
nodyang
|
4e0213df1b
|
榄菊新的管理
|
1 year ago |
|
nodyang
|
c72bd4553b
|
add 重新编辑配方
|
1 year ago |
|
wangsr
|
b27477df99
|
change - 按钮逻辑修改
|
1 year ago |
|
nodyang
|
d48a870f9f
|
页面整合处理
|
1 year ago |
|
nodyang
|
a1c9ba3aac
|
生产计划
|
1 year ago |
|
nodyang
|
57880f5e4e
|
0830 提交
|
1 year ago |
|
nodyang
|
1c0fbf79e8
|
重量 参数管理
|
1 year ago |
|
nodyang
|
1b2f8d16c7
|
SaveWetMixerReport
|
1 year ago |
|
nodyang
|
9af634d4b3
|
Fix
|
1 year ago |
|
wangsr
|
bbdba86dd4
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
0eb4288d01
|
change - 改名
|
1 year ago |
|
nodyang
|
18634444a4
|
fix
|
1 year ago |
|
wangsr
|
8a6fecc6cb
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
|
wangsr
|
cfa80ec7f3
|
change - 三通阀逻辑控制完善
|
1 year ago |
|
nodyang
|
8f5e9f0fc9
|
fix配方
|
1 year ago |
|
wangsr
|
5e39f02bd1
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
# Main/MCRun/Data/MCProject/nodeDevice.xml
|
1 year ago |
|
wangsr
|
f3f6e1afc3
|
add - 添加界面
|
1 year ago |