Commit Graph

306 Commits (3c96697d35419202dd04bdff5d605b0a873ba4fe)
 

Author SHA1 Message Date
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 af47d12b9b add - 下班前完善 - 添加按钮链接 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 7963bec699 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 1456c3f30c delete - 删除无用文件 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 a3ba502b80 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago