Skip to content
Commits on Dec 13, 2012
  1. @hefangli

    提交所修改的内容

    hefangli committed Dec 13, 2012
  2. @hefangli

    Revert "Revert "将修改好的人员信息的内容提交""

    hefangli committed Dec 13, 2012
    This reverts commit c567a6a.
  3. @hefangli
  4. @hefangli
  5. @hefangli

    Revert "将修改好的人员信息的内容提交"

    hefangli committed Dec 13, 2012
    This reverts commit bd9aa35.
  6. @hefangli

    提交修改的内容

    hefangli committed Dec 13, 2012
  7. Merge remote-tracking branch 'hefangli/master1' into DockingForm

    committed Dec 13, 2012
    Conflicts:
    	Application/Code/SqlHelper.cs
    	Application/WorkStation.csproj
    	Application/frmEmployeeEditDelete.cs
    	Application/frmEmployeeNew.cs
    	Application/frmMain.Designer.cs
    	Application/frmReportAnalysisByEmployee.Designer.cs
    	Application/frmReportAnalysisByEmployee.cs
    	Application/frmReportAnalysisByPlan.Designer.cs
  8. @hefangli
  9. @hefangli

    提交内容

    hefangli committed Dec 13, 2012
  10. Merge remote-tracking branch 'hefangli/master1' into DockingForm

    committed Dec 13, 2012
    Conflicts:
    	Application/Code/SqlHelper.cs
    	Application/WorkStation.csproj
    	Application/frmEmployeeEditDelete.cs
    	Application/frmEmployeeNew.cs
    	Application/frmMain.Designer.cs
    	Application/frmReportAnalysisByEmployee.Designer.cs
    	Application/frmReportAnalysisByEmployee.cs
    	Application/frmReportAnalysisByPlan.Designer.cs
  11. Merge remote-tracking branch 'hefangli/master1' into DockingForm

    committed Dec 13, 2012
    Conflicts:
    	Application/Code/SqlHelper.cs
    	Application/WorkStation.csproj
    	Application/frmEmployeeEditDelete.cs
    	Application/frmEmployeeNew.cs
    	Application/frmMain.Designer.cs
    	Application/frmReportAnalysisByEmployee.Designer.cs
    	Application/frmReportAnalysisByEmployee.cs
    	Application/frmReportAnalysisByPlan.Designer.cs
  12. @hefangli
  13. @hefangli

    提交刚刚修改过的内容

    hefangli committed Dec 13, 2012
  14. Merge remote-tracking branch 'qicb/JieMian2' into DockingForm

    committed Dec 13, 2012
    Conflicts:
    	Application/Code/SqlHelper.cs
    	Application/frmCardEditDelete.cs
    	Application/frmCardNew.cs
    	Application/frmCompany.cs
    	Application/frmEmployeeEditDelete.cs
    	Application/frmEmployeeNew.cs
    	Application/frmMain.Designer.cs
    	Application/frmPlanToTask.Designer.cs
    	Application/frmPostEditDelete.cs
    	Application/frmPostNew.cs
    	Application/frmSiteEditDelete.cs
    	Application/frmSiteNew.cs
  15. Merge remote-tracking branch 'qicb/JieMian2' into DockingForm

    committed Dec 13, 2012
    Conflicts:
    	Application/Code/SqlHelper.cs
    	Application/frmCardEditDelete.cs
    	Application/frmCardNew.cs
    	Application/frmCompany.cs
    	Application/frmEmployeeEditDelete.cs
    	Application/frmEmployeeNew.cs
    	Application/frmMain.Designer.cs
    	Application/frmPlanToTask.Designer.cs
    	Application/frmPostEditDelete.cs
    	Application/frmPostNew.cs
    	Application/frmSiteEditDelete.cs
    	Application/frmSiteNew.cs
  16. 卡片人员岗位等继承DockContent

    qicb committed Dec 13, 2012
  17. @hefangli
  18. Merge remote-tracking branch 'qicb/JieMian2' into DockingForm

    committed Dec 13, 2012
    Conflicts:
    	Application/Code/SqlHelper.cs
    	Application/Properties/licenses.licx
    	Application/WorkStation.csproj
    	Application/frmItem.cs
    	Application/frmMain.Designer.cs
    	Application/frmPlanExamine.Designer.cs
    	Application/frmPlanToTask.Designer.cs
    	Application/frmPoint.cs
    	Application/frmReportAnalysisByEmployee.Designer.cs
    	Application/frmReportAnalysisByEmployee.cs
    	Application/frmReportAnalysisByEmployee.resx
    	Application/frmRoute.Designer.cs
    	Application/frmRoute.cs
    	Application/frmRouteNew.cs
  19. Merge remote-tracking branch 'qicb/JieMian2' into DockingForm

    committed Dec 13, 2012
    Conflicts:
    	Application/Code/SqlHelper.cs
    	Application/Properties/licenses.licx
    	Application/WorkStation.csproj
    	Application/frmItem.cs
    	Application/frmMain.Designer.cs
    	Application/frmPlanExamine.Designer.cs
    	Application/frmPlanToTask.Designer.cs
    	Application/frmPoint.cs
    	Application/frmReportAnalysisByEmployee.Designer.cs
    	Application/frmReportAnalysisByEmployee.cs
    	Application/frmReportAnalysisByEmployee.resx
    	Application/frmRoute.Designer.cs
    	Application/frmRoute.cs
    	Application/frmRouteNew.cs
Commits on Dec 12, 2012
  1. @hefangli
  2. 界面功能之初步完成

    qicb committed Dec 12, 2012
  3. 巡检点项,修改好

    qicb committed Dec 12, 2012
  4. 巡检项修改继承

    qicb committed Dec 12, 2012
  5. 主界面

    qicb committed Dec 12, 2012
Commits on Dec 11, 2012
  1. Merge remote-tracking branch 'hefangli/master' into Alpha

    committed Dec 11, 2012
    Conflicts:
    	Application/12.resx
    	Application/12.resx.BACKUP.3676.resx
    	Application/12.resx.LOCAL.3676.resx
    	Application/Code/SqlHelper.cs
    	Application/Program.cs
    	Application/Properties/licenses.licx
    	Application/WorkStation.csproj
    	Application/frmAddPlanToTask.resx
    	Application/frmCardNew.Designer.cs
    	Application/frmCardNew.cs
    	Application/frmEmployeeNew.resx
    	Application/frmEmployeeNew.resx~HEAD
    	Application/frmEmployeeNew.resx~HEAD_0
    	Application/frmItem.Designer.cs
    	Application/frmItem.cs
    	Application/frmItem.resx
    	Application/frmItemAdd.resx
    	Application/frmItemEditDelete.resx
    	Application/frmItemOrPointStatisics.cs
    	Application/frmMachine.cs
    	Application/frmMachine.resx
    	Application/frmMachine.resx~HEAD
    	Application/frmMachineNew.resx
    	Application/frmMain.Designer.cs
    	Application/frmMain.resx
    	Application/frmMainTool.Designer.cs
    	Application/frmMainTool.cs
    	Application/frmMainTool.resx
    	Application/frmPlan.cs
    	Application/frmPlanAdd.Designer.cs
    	Application/frmPlanAdd.cs
    	Application/frmPlanAdd.resx
    	Application/frmPlanExamine.cs
    	Application/frmPlanToTask.Designer.cs
    	Application/frmPlanToTask.cs
    	Application/frmPlanToTask.resx
    	Application/frmPoint.Designer.cs
    	Application/frmPoint.cs
    	Application/frmPoint.resx
    	Application/frmPointChoseRfid.resx
    	Application/frmPointEditDelete.resx
    	Application/frmRoutAdd.Designer.cs
    	Application/frmRoutAdd.cs
    	Application/frmRoutNameAdd.Designer.cs
    	Application/frmRoutNameAdd.cs
    	Application/frmRoutNameAdd.resx
    	Application/frmRoutNew.Designer.cs
    	Application/frmRoutNew.cs
    	Application/frmRoute.Designer.cs
    	Application/frmRoute.cs
    	Application/frmTaskNew.Designer.cs
    	Application/frmTaskNew.cs
  2. 界面

    qicb committed Dec 11, 2012
  3. @hefangli
  4. @hefangli

    提交所修改的内容

    hefangli committed Dec 11, 2012
Something went wrong with that request. Please try again.