You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
lj_plc/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing
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
..
Alarm change - 保存报警信息 1 year ago
AutoControl change - 自动控制代码重构 1 year ago
Basic add - 输送监视图完成 点位开始维护 换电脑 1 year ago
BinManage 添加项目文件。 2 years ago
Cache change - 报警数据读取 1 year ago
ChemicalWeighingPlc 修复一个版本 1 year ago
DeviceParamManage 删除plc 1 year ago
Entity add - 糊化机报表 初始化 查询 双击加载 导出 湿混机报表些许问题待完善 1 year ago
FinishBatch 修复一个版本 1 year ago
FreeDb 修复一个版本 1 year ago
InterfaceDocking 整改Ip 1 year ago
LjAction 20230707 中午提交代码 1 year ago
LjClick 修复一个版本 1 year ago
LjDevice add - 输送监视图完成 点位开始维护 换电脑 1 year ago
LjDry 修复一个版本 1 year ago
LjElectrical 修复一个版本 1 year ago
LjMaterial MyMCCombobox 添加 1 year ago
LjMetage 修复一个版本 1 year ago
LjMetageFormula add - 输送监视图完成 点位开始维护 换电脑 1 year ago
LjMixFormula add - 输送监视图完成 点位开始维护 换电脑 1 year ago
LjMixManager short 类型问题 1 year ago
LjPlanning add - 干混机糊化机整合 干混机功能添加 1 year ago
LjPressure 修复一个版本 1 year ago
LjProdcutLine add - 输送监视图完成 点位开始维护 换电脑 1 year ago
LjProportional 修复一个版本 1 year ago
LjRecipeData change - 计划配方新增查询功能 1 year ago
LjReport add - 黑粉统计添加设定值显示 1 year ago
LjStock 榄菊新的管理 1 year ago
LjTanNum 榄菊新的管理 1 year ago
LjWeight 修复一个版本 1 year ago
MainDetailControl 自动控制添加日志 1 year ago
ManualControl change - 配置存到数据库 前端页面报警数据位置纠正 1 year ago
MaterialManage E:\mesnac\化工项目源码\源码 1 year ago
MinAn 添加闽安功能 1 year ago
OliveEQSetting 页面整合处理 1 year ago
Pl 整改Ip 1 year ago
PlcSchema 添加项目文件。 2 years ago
Product 修复一个版本 1 year ago
ProjectDebug add - 手动控制添加 1 year ago
Properties change - 加载界面 1 year ago
Report change - 画面展示报表改为PLC读取 1 year ago
Resources change - 加载界面 1 year ago
RgvPlc 添加闽安功能 1 year ago
RoleManage change - 角色信息 2 years ago
ShiftManage 添加项目文件。 2 years ago
Sys 修复一个版本 1 year ago
Technical 修复一个版本 1 year ago
Test Merge branch 'dep' into dep_pf 1 year ago
UserManage 添加项目文件。 2 years ago
BaseDataHelper.cs 添加项目文件。 2 years ago
BasePlcHelper.cs 修复一个版本 1 year ago
ChemicalWeighingAction.cs add - 干混机糊化机整合 干混机功能添加 1 year ago
Global.cs demo 1 year ago
LjHelp.cs 修复一个版本 1 year ago
Loading.Designer.cs change - 加载界面 1 year ago
Loading.cs change - 加载界面 1 year ago
Loading.resx add - 输送监视图完成 点位开始维护 换电脑 1 year ago
LoadingHelper.cs change - 加载界面 1 year ago
Mesnac.Action.ChemicalWeighing.csproj change - 自动控制代码重构 1 year ago
app.config add - 手动控制添加保存功能 1 year ago
packages.config add - 手动控制等待引入PLC 1 year ago