Commit Graph

671 Commits (d2f472e9569e4a7ac2b2913108426cf669294fad)
 

Author SHA1 Message Date
我叫锄头 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
wangsr 9a62b74eaa Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr b5a7c0624a change - 维护DB90 DB1 1 year ago
我叫锄头 1356676b13 解决大于400 不统计数据的问题 1 year ago
wangsr 633a70b20d delete - 删除错误提示 1 year ago
wangsr d0af57087e add - 强制手动加水 1 year ago
我叫锄头 152a0224fb Db2119WriteHelper 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
我叫锄头 fbc7dda5e9 解密 1 year ago
我叫锄头 80c55ca30d ReloadStream 1 year ago
我叫锄头 628c767f95 RSCREWBIG 1 year ago
wangsr 564616b7bf change - 自动控制代码重构 1 year ago
wangsr 051c41da3d add - 干混机糊化机整合 干混机功能添加 1 year ago