Checkout
Tools

 

wangyi in forgon-ssts-v4.1

About

587 commits
  • Committer is not mapped to a user
  • First commit: 17 March 2016
  • Last commit: 25 April 2017
Last Week All Time
Commits: 0 587
Files changed: 0 0
Change in LOC: 0 0

Line History

Line Count Graph
Line Count Graph

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
 
Tuesday 25 Apr 2017
11:17 上午

wangyi

回收测试优化
Options
    • ?
    /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/awaitForRecycleList.jsp
Monday 24 Apr 2017
6:05 下午

wangyi

注入manager未设置set方法
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
2:36 下午

wangyi

回收保存时修改相关联的预回收单信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
11:27 上午

wangyi

回收页面元素加id
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
11:04 上午

wangyi

回收取消登录两次操作
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/ALL.java
Friday 21 Apr 2017
7:01 下午

wangyi

回收增加切换篮筐功能
Options
    • ?
    /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/ALL.java
11:03 上午

wangyi

完成：CDSLQYQYYY-2，装配增加包装人
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js
Thursday 20 Apr 2017
7:05 下午

wangyi

回收测试用例优化
Options
    • ?
    /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/ALL.java
Wednesday 19 Apr 2017
4:40 下午

wangyi

部分完成：CDSLQYQYYY-7，，回收器械包设置备注信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java
    • ?
    /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/touchScreen/recycle/recycleForTouchScreen.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
Tuesday 18 Apr 2017
5:43 下午

wangyi

修复删除清洗记录时，如果篮筐实例并非最新的篮筐实例，这个时候不能回滚篮筐状态
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
2:52 下午

wangyi

完成：DGDHYY-18，清洗完成后支持可以删除
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
2:49 下午

wangyi

一次性物品盘点js页面提交
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
11:27 上午

wangyi

完成：DGDHYY-103。一次性物品增加是否盘点属性
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsStock.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
Thursday 13 Apr 2017
4:39 下午

wangyi

回收测试用例优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/ALL.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
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
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
Tuesday 11 Apr 2017
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
Monday 10 Apr 2017
3:51 下午

wangyi

修复消毒物品申请后快速回收篮筐上限未生效问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
Thursday 06 Apr 2017
3:43 下午

wangyi

完成：HZSRMYY-19，选择科室、器械包增加退格键
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectUser.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/pic_bg.jpg
Wednesday 05 Apr 2017
7:30 下午

wangyi

完成：HZSRMYY-15，将外来器械类型过滤（待回收）改成（待归还）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
6:22 下午

wangyi

完成：HZSRMYY-17,装配任务内有外来器械包，父类节点默认展开。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
Saturday 01 Apr 2017
5:44 下午

wangyi

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
5:18 下午

wangyi

修复批量加急只加急了一个包
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
5:11 下午

wangyi

增加触摸屏回收扫描器械包条码包类型是否符合该回收单验证
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
2:43 下午

wangyi

修改：PYQZYY-149，停用的外来器械包在外来器械包管理里面不显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
2:38 下午

wangyi

完成：ZSSXLRMYY-98，器械包加急功能改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
Friday 31 Mar 2017
5:51 下午

wangyi

丢失、报损页面修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
11:33 上午

wangyi

加备注信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingdamagerecord/RecyclingDamageItem.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingerror/RecyclingError.java
11:04 上午

wangyi

标识牌回收丢失不能保存bug
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java