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.

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
..
Form1Action.cs	0913 整理代码	1 year ago
TestAction.cs	Merge branch 'dep' into dep_pf	1 year ago
TestFrm.cs	提交最新源码	2 years ago
TestMDown.cs	添加项目文件。	2 years ago
TestTrigerAlarmAction.cs	fix	1 year ago