forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 46
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 46
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 17760 is being indexed.

Thursday 13 Apr 2017
2:19 下午

cherry

去掉不需要的数据 以免有误解
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/zjyy
  2. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/zsykzx
  3. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/gxzyyf1
  4. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/dgszyy
  5. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/dysyy
  6. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/dgjszx
  7. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/hdqrmyy
  8. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/sznsfy
  9. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/zsly
  10. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/dgsdhyy
  11. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/gzzyyfs
  12. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/gzspyqzyy
  13. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/gd2zyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
  15. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/jmrmyy
  16. … 9 more files in changeset.
11:09 上午

jeffli

如果不是供应室用户，隐藏申请单退货按钮
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
9:36 上午

jeffli

普通退货和申请单退货增加申领规格的处理
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ApplicationSpecificationHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
Wednesday 12 Apr 2017
7:21 下午

wangyi

回收测试用例优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/Recyle.java
7:10 下午

adairkang

成都龙泉医院包定义配置了不打印科室，但是却打出了科室的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/print/printConfig.js
7:06 下午

shuyongfu

小黎发回来的现场配置,广东省医增加申领物品显示一次性物品外部编码的配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
7:02 下午

shuyongfu

陈国强发回来的现场配置,中大附一增加加急功能配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
7:02 下午

adairkang

ZSSZYY-99 一次性物品发货单、一次性物品入库单格式修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js
6:35 下午

wangyi

回收测试用例修复
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/Recyle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
5:22 下午

shuyongfu

解决二级供应室的使用记录转申请单的测试用例不通过的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java
5:03 下午

zhonghaowen

修复oracle下科室申领测试用例不通过
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestDisposableGoodRecyclingApplication.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestDisinfectGoodRecyclingApplication.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestTousseRecyclingApplication.java
4:36 下午

wangyi

修复回收部分通不过的测试用例
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/all/settings.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/Recyle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
2:59 下午

adairkang

DGZYY-89 对发货单的调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js
10:54 上午

adairkang

删除不需要的引用
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
10:02 上午

adairkang

巫劲封发回来的成都龙泉医院的打印文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/print/printConfig.js
12:40 上午

terrykwan

改进iFrame的切换方式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
Tuesday 11 Apr 2017
11:39 下午

terrykwan

去掉不必要的包引用，解决编译失败的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/Recyle.java
10:59 下午

terrykwan

增加查找ExtJS组合框的方法，增加可靠性
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/Apply.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/ALL.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
7:41 下午

wangyi

解决主页面切换到触摸屏页面报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/Recyle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/Login.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
7:21 下午

adairkang

消毒物品在名称中打印出两个科室的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
6:46 下午

jeffli

申请单退货，如果单类型为自定义，外来器械，外部代理灭菌，不显示退货按钮
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
6:43 下午

jeffli

申请单退货，默认数量改为0
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
6:21 下午

chenjiaru

解决jira问题：ZSWY-69 外来器械使用后交接报表的查询很慢，要2-3分钟才能加载完成
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:33 下午

chenjiaru

解决jira问题：ZSWY-69 外来器械使用后交接报表的查询很慢，要2-3分钟才能加载完成
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifiedItem.java
4:42 下午

jeffli

调整测试用例
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAForeignTousseGoodsInvoiceManager.java
4:36 下午

shuyongfu

解决jira问题:

LJSRMYY-2 开发与手麻的接口,定时器改成每10分钟执行一次

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/ljsrmyy/timer.xml
4:35 下午

shuyongfu

解决jira问题:

LJSRMYY-2 开发与手麻的接口

以及中六、中山眼科之前4.0代码的调整

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/ljsrmyy/timer.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/ljsrmyy/HerpPathManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/ljsrmyy/applicationContext-path.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/CommonHerpPathManagerImpl.java
3:31 下午

jeffli

申请单退货功能修改，退货完成后返回申领界面
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnDisposableGoodsByInvoicePlan.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoicePlan.js
3:05 下午

jeffli

增加配置项，是否启用申请单退货功能

enableReturnGoodsByInvoicePlan

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
2:34 下午

zhonghaowen

科室申领相关测试用例提交
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/tousseDefinition/MaterialDataProvider.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestDressingRecyclingApplication.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/constants/ForeignTousseConstant.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/application/ApplicationDataProvider.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/tousseDefinition/TousseDefinitionDataProvider.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/borrow/BorrowApplicationTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestTousseRecyclingApplication.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestDisposableGoodRecyclingApplication.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestForeignTousseGoodRecyclingApplication.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/application/AllTests.xml
  11. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/application/assertThat
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/constants/enums/DisposableGoodEnum.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestCustomRecyclingApplication.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/constants/CustomTousseConstant.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/application/CustomTousseRecyclingApplicationProvider.java
  16. … 11 more files in changeset.