forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 37
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 37
Total Lines of Code (LoC): 0
Net change in LoC this week: 0

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 24761 is being indexed.

Thursday 01 Nov 2018
5:08 下午

shuyongfu

解决Jira问题:

XJJQZYY-21 PDA上退货扫描退货科室条码提示查无此物品

XJJQZYY-17 PDA端支持敷料包退货

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
5:04 下午

LiHaiFeng

添加slickgrid插件库,使用记录slickgrid页面
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/images/down.gif
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.headerbuttons.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/SlickGrid-master/SlickGrid-master/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/SlickGrid-master/tests/grid/index.html
  5. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/SlickGrid-master/images
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/lib/jquery.sparkline-2-1-2.min.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/lib/jquery.sparkline.min.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/SlickGrid-master/images/info.gif
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/SlickGrid-master/controls/slick.gridmenu.js
  10. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/images
  11. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/tests/plugins
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/examples/example-plugin-headerbuttons.html
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/SlickGrid-master/images/GrpCheckboxN.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/SlickGrid-master/images/down.gif
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/examples/example7-events.html
  16. … 540 more files in changeset.
4:24 下午

shuyongfu

解决Jira问题:GZYKDXFSKQ-19 器械包定义固定条码打印不了
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
4:02 下午

shuyongfu

解决Jira问题:GZYKDXFSKQ-11 回收界面添加保存并打印并新建按钮
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingPrintData.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingPrintItem.java
3:48 下午

shuyongfu

注释补充
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/MonthGoodsDetailVo.java
9:58 上午

weizhenyu

代码优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/css/washingApplication/washingApplication.scss
9:58 上午

weizhenyu

代码优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/css/deliveryPlanApplication/deliveryPlanApplication.scss
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/css/deliveryPlanApplication/deliveryPlanApplication.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/css/deliveryPlanApplication/deliveryPlanApplication.css.map
9:52 上午

zengyuan

提交console.log，以及系统管理的部分页面
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/img/page-prev-disabled.gif
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/js/systemManage
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-select-master
  4. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-select-master/dist/js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/directPacking.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/systemManage/logManagement.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-select-master/dist/js/bootstrap-select.min.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-select-master/.gitignore
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/js/systemManage/systemInformation.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/systemManage/auth/distributionAuth.jsp
  12. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-select-master/dist/css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/css/systemManage/authorityManagement.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/systemManage/auth/roleList.jsp
  16. … 37 more files in changeset.
9:46 上午

LiHaiFeng

去掉console
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilizationLoad/sterilizationLoad.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/record.js
Wednesday 31 Oct 2018
5:09 下午

shuyongfu

controller增加字符编码集定义
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/controller/SterilisationController.java
5:08 下午

shuyongfu

解决Jira问题:ZSLY-365 器械包与材料回写的定时器增加相关的日志，进行排查
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/inventory/service/WriteBackInventoryMaintainManagerImpl.java
2:27 下午

shuyongfu

增加新框架主页的系统退出功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/pages/index.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/log/action/LogAction.java
2:24 下午

shuyongfu

解决Jira问题:ZSLY-365 器械包与材料回写的定时器增加相关的日志，进行排查
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/log/model/Log.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/inventory/service/WriteBackInventoryMaintainManagerImpl.java
11:14 上午

weizhenyu

页面的优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/deliveryPlanApplication/deliveryPlanApplication.jsp
11:13 上午

weizhenyu

发货计划的提交保存的仓库ID问题导致的无法提交
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryPlanApplication/deliveryPlanApplication.js
10:44 上午

simon.bai

ssts-rebuild : 科室申领更新
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleInformation.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinition.js
10:28 上午

weizhenyu

添加清理扫码输入框的值
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.js
Tuesday 30 Oct 2018
9:19 下午

terrykwan

提交针对新框架的测试用例的代码的修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/Login.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/ALL.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/apply/helper/ApplyHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/SstsApp.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/apply/applyConstants/ApplyBtnEnum.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/apply/applyConstants/DeskIconEnum.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/Constants.java
7:56 下午

shuyongfu

解决科室申领列表数据未显示的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/controller/RecyclingApplicationController.java
5:53 下午

weizhenyu

处理了代码优化后的不能删除的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.js
4:17 下午

weizhenyu

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.js
3:49 下午

weizhenyu

提升了页面的加载速度
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/css/washingApplication/washingApplication.css.map
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/css/washingApplication/washingApplication.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/css/washingApplication/washingApplication.scss
3:48 下午

weizhenyu

提升了页面的加载速度
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/washingApplication.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/inputPrint.js
3:48 下午

weizhenyu

提升了页面的加载速度
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/washingApplication/washingApplication.jsp
3:13 下午

simon.bai

ssts-rebuild : 科室申领更新
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/css/common/dingxiang-common.css
11:46 上午

shuyongfu

解决Jira问题:SZNSRMYY-15 新版本器械包工作量报表过滤功能消失
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:18 上午

shuyongfu

解决Jira问题:SZNSRMYY-15 新版本器械包工作量报表过滤功能消失
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
10:38 上午

zengyuan

提交首页a标签加上id
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js
10:34 上午

yanweining

审核页面：去掉console.log()
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
Monday 29 Oct 2018
8:49 下午

terrykwan

提交新UI的selenium测试的代码，从源代码复制出来，放到了selenium2包里
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/apply/helper/ApplyHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/SettingConstants.java
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/factory
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/apply/ComboApplyTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/apply/applyConstants/ApplyGoodPrefixEnum.java
  6. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2
  7. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/apply/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/apply/service/BorrowApplyServiceImpl.java
  9. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/sterilization
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/apply/chain/GdsyApplyHandler.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/Intervene.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/Regular_Monitor.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/example/MyTest.java
  14. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/tools/crypto
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/Review.java
  16. … 68 more files in changeset.