forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 59
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 59
Total Lines of Code (LoC): 4,711,364
Net change in LoC this week: 3,161

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

Subversion Details

1 property
  • svn:global-ignores = .gradle .settings bin build rebel.xml
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Tuesday 17 Oct 2017
12:15 上午

shuyongfu

解决jira问题:GDSRMYY-376 盘点功能细化,可对batchId进行盘点
Options
    • -1
    • +14
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManager.java
    • -0
    • +582
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm2.js
    • -0
    • +27
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakemanager/InventoryItem.java
    • -0
    • +4
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/action/InventoryRecordAction.java
    • -0
    • +20
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryDiposableGoodsItem.java
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/disposablegoods/service/DisposableGoodsServiceContext.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -0
    • +83
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -0
    • +598
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryrecordView2.js
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -12
    • +258
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
    • -1
    • +22
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/dwr/table/InventoryRecordTableManager.java
    • -0
    • +57
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryrecordView2.jsp
Monday 16 Oct 2017
11:20 下午

chenjiaru

解决jira问题：ZSYY-142 器械包申请单列表优化
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/homepage/recyclingAppcationShow.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • -7
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
    • -36
    • +63
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
7:46 下午

yanweining

zzsy：lnvoicePlanFromHERP——Mapper.xml 代码更新
Options
    • -3
    • +3
    /ssts-web/src/main/resources/config/zsyy/mybatis/InvoicePlanFromHERP_Mapper.xml
7:35 下午

chenjiaru

修改注释
Options
    • -2
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManager.java
5:55 下午

cherry

增加审核页面修改灭菌程序、包装类型场景
Options
    • -0
    • +51
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java
    • -1
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
5:48 下午

adairkang

QYSRMYY-13
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
10:22 上午

jeffli

中山一院消毒供应项目ZSYY-170

器械包发货提示成聚合包无法发货

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
10:19 上午

jeffli

中山一院消毒供应项目ZSYY-147

装配任务今天本组装配记录优化

Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionUtils.java
    • -0
    • +32
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
Saturday 14 Oct 2017
8:59 下午

chenjiaru

解决jira问题: ZSYY-166 PC添加灭菌记录增加科室物品列表
Options
    • -7
    • +14
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -26
    • +40
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
4:26 下午

shuyongfu

一次性物品盘点表单页面的一次性物品名称下拉的下拉选项宽度调整为500
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js
4:24 下午

shuyongfu

回收清点页面增加对json3 js文件的引件,以防部分版本浏览器报"JSON"未定义的错误
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
4:20 下午

chenjiaru

解决jira问题： GDSRMYY-383 临床界面中申领物品改为申领敷料
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.jsp
4:19 下午

shuyongfu

ext资源文件引入重复,删除其中一个
Options
    • -1
    • +0
    /ssts-web/src/main/webapp/common/include_Ext2_Js.jsp
4:16 下午

shuyongfu

省医发货回写细微调整,单次发货涉及生成多张发货单时,拼接首单号和尾单号之间加上-隔开
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
2:11 下午

chenjiaru

修复灭菌物品视图十位条码的器械包，条码看不全的缺陷
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
Friday 13 Oct 2017
4:03 下午

chenjiaru

解决jira问题： ZSSXLRMYY-140 “自动加急”功能，器械包发货后联动修改器械包加急状态。
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
3:16 下午

shuyongfu

运作监控调整、回收申请信息列的时间过滤由原来的申请时间过滤改为按申请时间或回收时间过滤,页面也有个别小调整
Options
    • -2
    • +2
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
    • -2
    • +3
    /ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
2:12 下午

shuyongfu

解决jira问题:HZSRMYY-37 干预管理-使用记录无法修改时间

删除使用记录时增加对原外来器械申请单的处理

Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
2:02 下午

chenjiaru

解决jira问题： ZSSXLRMYY-140 “自动加急”功能，器械包发货后联动修改器械包加急状态。
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
11:54 上午

shuyongfu

解决jira问题:HZSRMYY-37 干预管理-使用记录无法修改时间

删除使用记录时增加对原外来器械申请单的处理

Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
11:30 上午

shuyongfu

解决jira问题:HZSRMYY-37 干预管理-使用记录无法修改时间

删除使用记录时增加对原外来器械申请单的处理

Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
Thursday 12 Oct 2017
11:30 下午

shuyongfu

解决jira问题:HZSRMYY-37 干预管理-使用记录无法修改时间
Options
    • -246
    • +29
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereUseRecordForm.js
    • -0
    • +53
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/dwr/table/UseRecordTableManager.java
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -113
    • +50
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereUseRecordView.js
    • -8
    • +24
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • -2
    • +8
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • -0
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
11:12 下午

chenjiaru

解决jira问题： ZSSXLRMYY-140 “自动加急”功能，器械包发货后联动修改器械包加急状态。
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
9:45 下午

chenjiaru

增加注释
Options
    • -2
    • +17
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java
    • -16
    • +15
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
    • -5
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
    • -3
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java
    • -4
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -0
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
    • -9
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManager.java
    • -0
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionUtils.java
6:15 下午

jeffli

中山一院消毒供应项目ZSYY-144

增加重新装配功能

Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
6:07 下午

cherry

1.优化ie8下的材料发货不稳定

2.增加回收添加质量监测的场景

3.增加回收还物单的场景

Options
    • -6
    • +9
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java
    • -25
    • +29
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
    • -1
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
2:10 下午

yanweining

一次性物品入、退库管理，一次性物品入、退库单干预管理。通过关键词查询：由拆分被拼接的关键字来获得物品名称改为直接获得物品名称参数
Options
    • -2
    • +79
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
    • -1
    • +17
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
    • -1
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownEntryView.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownOutView.jsp
    • -1
    • +17
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownOutView.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.jsp
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownEntryView.jsp
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.jsp
    • -1
    • +19
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
1:40 下午

jeffli

中山一院消毒供应项目ZSYY-167

装配任务扫描标识牌没有自动显示装配按钮

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
10:57 上午

shuyongfu

解决jira问题:ZJYY-6 制作webservice登陆认证接口

针对pda的登录进行相关的处理

Options
    • -10
    • +15
    /ssts-web/src/main/java/com/forgon/disinfectsystem/security/userdetails/DaoUserDetailSSTSImpl.java
10:53 上午

shuyongfu

合并转换申请单增加配置项
Options
    • -97
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordMergeConvert.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/fsfy/config.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js