Commit Graph

72 Commits (621656aee13fcc2e4db5a57847d3540d18a01ea8)

Author SHA1 Message Date
杨威 1ffa8dbe00 更新目录 6 months ago
杨威 085da24bf0 榄菊设备参数压力管理 6 months ago
杨威 dd46574c71 维护页面 6 months ago
杨威 28763fc356 新的报表 6 months ago
我叫锄头 b6e1ba1a7d 整体更新 11 months ago
我叫锄头 3614c7bcce 删除不需要的 11 months ago
我叫锄头 c7169d5c45 干混机报表 11 months ago
我叫锄头 f6c30743da 玉米粉报表 11 months ago
我叫锄头 c62d1a6eaa overy 11 months ago
我叫锄头 cf6410ca4b 显示压力气阀 11 months ago
wangsr fee7750e88 add - 添加输送参数设置 12 months ago
wangsr c7656457e9 add - 日志控制抽离 添加单独日志查询界面 12 months ago
wangsr d66d412077 add - 强制水称控制 1 year ago
wangsr d1c66df369 add - 输送界面准备完毕 添加湿混机对接RGV时间统计 1 year ago
wangsr 60898a6830 change - 准备输送界面 代码简化 1 year ago
wangsr 27fad81be8 add - 自动控制 - 新版 1 year ago
wangsr cd3d3fcf1b add - 添加自动控制界面,初步排版完成 1 year ago
wangsr 26d450e609 change - 文字错误更改 螺旋正反转显示实现 dbhelper错误更改 1 year ago
wangsr 5ca78fc6ef change - 更改日志记录方式 重构手动控制日志记录 1 year ago
nodyang a0ee2a8868 Merge branch 'dep' into dep1011
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
1 year ago
nodyang dfcfd01e71 添加日报表 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
wangsr 804e322945 add - hsl通讯展示界面 性能待优化 1 year ago
wangsr 865c17e169 add - 手动控制添加 1 year ago
wangsr 1456c3f30c delete - 删除无用文件 1 year ago
nodyang 4e0213df1b 榄菊新的管理 1 year ago
nodyang d48a870f9f 页面整合处理 1 year ago
nodyang 1c0fbf79e8 重量 参数管理 1 year ago
nodyang 18634444a4 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
nodyang 6895e8cde4 整理代码 1 year ago
nodyang 24400a59c9 阀门 1 year ago
nodyang f195102a8a 整理代码 1 year ago
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
wangsr 1925bef7a6 add - 糊化机报表 初始化 查询 双击加载 导出 湿混机报表些许问题待完善 1 year ago
wangsr a3d5f972db 解决冲突 合并 1 year ago
wangsr 2dbc258001 change - 提交 1 year ago
wangsr 2705805e9e 解决冲突 1 year ago
wangsr 8f7481b3bc Merge branch 'wangsr' into dep_plan
# Conflicts:
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
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 6ac73f7201 demo 1 year ago
nodyang 425828021a 临时提交 1 year ago
wenjy 8e286eeb01 add - 设备细节界面 1 year ago
nodyang e4da793b9c 临时提交代码到服务器 1 year ago
nodyang 65292edda5 0801 新的分支 1 year ago