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
Thursday 14 Jul 2016
6:58 下午

adairkang

手工入库，手工退库、同步入库、同步退库、导入入库及调拨单给新字段赋值
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -2
    • +2
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -6
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java
    • -1
    • +1
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • -2
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java
    • -2
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
    • -8
    • +3
    /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java
    • -1
    • +7
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
    • -2
    • +2
    /ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/service/ReceiveRecordManagerImpl.java
    • -2
    • +2
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -2
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
    • -0
    • +2
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -0
    • +13
    /forgon-core/src/main/java/com/forgon/directory/acegi/tools/AcegiHelper.java
6:36 下午

wangyi

盘点生成的盘盈入库/盘亏出库单赋值科室编码/科室名称
Options
    • -3
    • +6
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakemanager/InventoryRecord.java
6:18 下午

wangyi

修复 消毒物品/自定义器械包/外来器械包，相同名称的包装配后器械包实例对应的包定义关联错误bug
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
6:03 下午

shuyongfu

修改科室后增加对一次性物品入/退库单新增的两个科室名称字段进行联动修改
Options
    • -1
    • +7
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
5:33 下午

jeffli

修改目标科室编码类型
Options
    • -3
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java
5:17 下午

zengjc

监测范围增加选项'无'选项，解决jira问题GDSRMYY-52
Options
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoringconfig/QualityMonitoringConfig.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualitymonitoringConfigView.js
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualitymonitoringConfigView.jsp
4:35 下午

adairkang

使用记录报表添加一次性物品的统计(GZFDZL-52),暂时还有过滤没有做好
Options
    • -3
    • +17
    /ssts-web/src/main/webapp/jasperRtp/useRecordTotalView.jrxml
    • -0
    • +7
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UseRecordItemBean.java
    • -0
    • +12
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UseRecordEnteringBean.java
    • -1
    • +1
    /ssts-web/src/main/webapp/jasperRtp/useRecordOperatorTotalView.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/useRecordOperatorSubView.jasper
    • -0
    • +9
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/useRecordTotalViewSub.jasper
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -1
    • +18
    /ssts-web/src/main/webapp/jasperRtp/useRecordTotalViewSub.jrxml
    • -6
    • +31
    /ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/useRecordOperatorTotalView.jasper
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/useRecordTousseSubView.jasper
    • -1
    • +20
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/useRecordTotalView.jasper
3:52 下午

wangyi

增加质量监测打开历史单据，能看到扫描的篮筐
Options
    • -1
    • +4
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/service/QualityMonitoringManagerImpl.java
    • -64
    • +1
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/action/QualityMonitoringAction.java
    • -0
    • +20
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoring.java
    • -58
    • +65
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js
3:25 下午

jeffli

入库单增加科室名称和编码属性
Options
    • -10
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java
3:20 下午

jeffli

入库单增加科室名称和id属性
Options
    • -0
    • +36
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java
2:35 下午

wangyi

增加自定义器械包旧数据升级脚本
Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.2.4_4.2.5.sql
1:49 下午

jeffli

修改注释
Options
    • -7
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js
1:39 下午

jeffli

调整小榄医院小标签，中标签样式
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/print/printConfig.js
12:51 下午

adairkang

no_comment
Options
    • -1
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java
    • -5
    • +24
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/dwr/table/BarcodeTableManager.java
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManager.java
12:50 下午

adairkang

发货单的仓库设置为申请科室仓库
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
12:00 下午

shuyongfu

科室申领js调整
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
11:06 上午

zengjc

灭菌炉灭菌次数统计报表增加按'灭菌目地'过滤统计次数，解决jira问题ZSSXLRMYY-20
Options
    • -1
    • +1
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • -1
    • +38
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountView.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
10:51 上午

shuyongfu

解决jira问题:GDSRMYY-85

在'灭菌物品装载'界面中通过扫描器械包条码把器械包装载到灭菌筐时,该器械包的信息没有从'待灭菌装载器械包信息'中消失(BUG)

Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
10:32 上午

adairkang

保存的时候页面报错的问题
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
10:11 上午

adairkang

发货后器械包入申请科室仓库，而不是结算科室仓库
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
Wednesday 13 Jul 2016
7:38 下午

wangyi

自定义器械包回收修改材料数量
Options
    • -0
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
    • -8
    • +13
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -36
    • +97
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -1
    • +40
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -26
    • +0
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -16
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/untracableTousseForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -4
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
    • -10
    • +54
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -0
    • +152
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setMaterialRecycleAmount.jsp
    • -6
    • +0
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • -6
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialinstance/MaterialInstance.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • -3
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
  16. … 4 more files in changeset.
6:41 下午

zengjc

解决打开清洗记录，责任人有数据，但保存提示不存在的问题.
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
6:18 下午

zengjc

解决外来器械回收篮筐在添加清洗记录时，排序乱问题.
Options
    • -0
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
6:13 下午

wangyi

去掉packingAmount字段
Options
    • -10
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifiedItem.java
6:03 下午

jeffli

调整小榄医院中标签样式
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/print/printConfig.js
5:58 下午

jeffli

优化外来器械发货代码

解决bug：

外来器械同样的包发货时，可能导致部分包实例状态变为已发货，实际上没有关联的发货记录。

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
5:17 下午

adairkang

外来器械提前归还，终止发货计划，删除装配任务
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +7
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
    • -11
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • -0
    • +6
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java
    • -1
    • +61
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • -0
    • +7
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
4:53 下午

zengjc

解决清洗记录扫描没有实例的篮筐条码，报异常的问题.
Options
    • -2
    • +7
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • -0
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
4:36 下午

jeffli

解决bug：

一个科室填了多个外来器械申请单，申请了同一个物品，在发货计划那里看到的待发数量总是为1

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
4:07 下午

zengjc

去掉调试信息
Options
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js