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 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
2 years ago
..
Db 修复代码 2 years ago
Entity merge 2 years ago
AddAction.cs 临时提交 2 years ago
DelAction.cs 修复代码 2 years ago
DownToDatabase.cs change - 加载界面 2 years ago
DownloadAction.cs change - 简化代码初步 2 years ago
FrmPlanning.Designer.cs change - 简化代码初步 2 years ago
FrmPlanning.cs 0907 晚上临时提交 2 years ago
FrmPlanning.resx 0801 临时提交 2 years ago
FrmWeiRecipeDataAdd.Designer.cs Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 2 years ago
FrmWeiRecipeDataAdd.cs change - 拉取前提交 2 years ago
FrmWeiRecipeDataAdd.resx change - 更改布局 2 years ago
InItDbAction.cs Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 2 years ago
LjPlanningDb.cs update - 小修改 2 years ago
LjPlanningPlcHelp.cs 0912 测试计划的版本呢 2 years ago
LjPlanningView.cs 0907 晚上临时提交 2 years ago
PauseAction.cs 准备继承 hsl 2 years ago
RestartAction.cs fixCode 2 years ago
SelectAction.cs add - 榄菊计划管理 新增查询条件 2 years ago
UnitView.cs merge 2 years ago
UpdateAction.cs add - 输送监视图完成 点位开始维护 换电脑 2 years ago