forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

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

Tuesday 01 Nov 2016
3:24 下午

zhonghaowen

去掉导入多余的包
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
3:21 下午

adairkang

东莞中医院中标签，调整条码的位置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
3:17 下午

chenjiaru

改善：PYQZYY-69 登录用户所在部门，绑定登录电脑的IP
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/strtus_oa.xml
3:12 下午

zhonghaowen

优化采购计划根据关键字搜索单
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchaseTableFilterManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GoodPurchaseTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryTableFilterManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/dwr/table/MaterialEntryTableManager.java
3:09 下午

chenjiaru

改善：PYQZYY-69 登录用户所在部门，绑定登录电脑的IP
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
3:07 下午

jeffli

解决bug：

装配的外部代理灭菌包装配科室名字为空。

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/vo/LoginUserData.java
2:58 下午

zhonghaowen

优化退货记录信息根据关键字搜索单
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/search/service/TBarFilterManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordTableFilterManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/tBarForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.jsp
2:56 下午

chenjiaru

改善：PYQZYY-69 登录用户所在部门，绑定登录电脑的IP
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
2:52 下午

chenjiaru

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/config.js
2:50 下午

chenjiaru

改善：PYQZYY-69 登录用户所在部门，绑定登录电脑的IP
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/ipandorgunitmapping
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/ipandorgunitmapping/service/IpAndOrgUnitMappingManager.java
  3. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/ipandorgunitmapping
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/ipandorgunitmapping/service/IpAndOrgUnitMappingManagerImpl.java
  6. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/userIPAndOrgUnitMapping
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/dwr.xml
  9. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/ipandorgunitmapping/dwr
  10. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/ipandorgunitmapping/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/ipandorgunitmapping/action/IpAndOrgUnitMappingAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portalPage.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/iPAndOrgUnitMapping/iPAndOrgUnitMappingView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/iPAndOrgUnitMapping/iPAndOrgUnitMappingForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/iPAndOrgUnitMapping/iPAndOrgUnitMappingView.jsp
  16. … 11 more files in changeset.
2:47 下午

zhonghaowen

修复通用申请单能查到外部代理灭菌包和外来器械
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
2:12 下午

jeffli

标签打印设计，增加半年期指示线
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
12:38 下午

zengjc

修改版权提示信息.
Options
    • ?
    /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/washForTouchScreen.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/logon.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
12:11 下午

zengjc

一次性物品通过xls导入导出，增加'类别、'物品类型'、'是否消毒中心物品'、'是否打印标签'属性.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
12:07 下午

zengjc

通过zip包导入基础数据，增加清洗分类.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBaseDataFromZipManagerImpl.java
10:27 上午

chenjiaru

改善了发货时扫器械包或者篮筐条码时提示未做生物监测和正在做的生物监测的外来器械包
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
10:11 上午

adairkang

发货扫描条码,器械包状态异常的提示信息修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
10:04 上午

adairkang

中标签两个条码的间距调大,两条线之间的三行数据间隔等分(DGZYY-27)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
9:49 上午

cherry

更新PDA版本4.5.0
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.4.42_20161028.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.0_20161031.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
Monday 31 Oct 2016
7:38 下午

jeffli

解决bug：

已发货的外部代理灭菌申请单无法终止

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
7:33 下午

jeffli

解决bug：

已发货的外部代理灭菌申请单无法终止

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
7:32 下午

adairkang

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/model/KnowledgeFolder5.hbm.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/model/KnowledgeFolder1.hbm.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/model/KnowledgeFolder2.hbm.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/model/KnowledgeFile4.hbm.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/model/KnowledgeFile3.hbm.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/model/KnowledgeFolder3.hbm.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/model/KnowledgeFolder4.hbm.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/model/KnowledgeFile5.hbm.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/model/KnowledgeFile1.hbm.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/model/KnowledgeFile2.hbm.xml
7:31 下午

adairkang

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/resources/com/forgon/knowledge/model/KnowledgeFile4.hbm.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/resources/com/forgon/knowledge/model/KnowledgeFile5.hbm.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/resources/com/forgon/knowledge/model/KnowledgeFile3.hbm.xml
  4. /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/resources/com/forgon/knowledge/model
  5. /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/resources/com/forgon/knowledge
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/resources/com/forgon/knowledge/model/KnowledgeFolder4.hbm.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/resources/com/forgon/knowledge/model/KnowledgeFolder2.hbm.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/resources/com/forgon/knowledge/model/KnowledgeFile2.hbm.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/resources/com/forgon/knowledge/model/KnowledgeFolder1.hbm.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/resources/com/forgon/knowledge/model/KnowledgeFolder5.hbm.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/resources/com/forgon/knowledge/model/KnowledgeFolder3.hbm.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/resources/com/forgon/knowledge/model/KnowledgeFile1.hbm.xml
  13. /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/resources/com
  14. /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/resources/com/forgon
7:27 下午

jeffli

解决bug：

已发货的外部代理灭菌申请单无法终止

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
6:26 下午

jeffli

新增功能：

外部代理灭菌包的器械包也能自动扣减包内一次性物品

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionUtils.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/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
6:21 下午

jeffli

新增功能：

外部代理灭菌包的器械包也能自动扣减包内一次性物品

Options
    • ?
    /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/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
6:21 下午

zhonghaowen

解决GDSRMYY-195:科室申领界面增加批量打印一次性物品发货计划功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
  7. /SterileSupplySystem/branches/V4.1.0/ssts-print/src/main/java/com/forgon/disinfectsystem/print
  8. /SterileSupplySystem/branches/V4.1.0/ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintSummaryVo.java
5:51 下午

terrykwan

提交.project文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/.project
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/.classpath
5:20 下午

adairkang

角色管理Manager添加事务管理
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/service/RoleManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/serviceContext.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/action/RoleAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/service/RoleManagerImpl.java
5:18 下午

terrykwan

删除误提交的文件
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/img