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
Sunday 10 Apr 2016
1:07 上午

shuyongfu

1.回收扫描已禁用或已删除的标识牌的条码时的信息提示

2.增加器械包库存(基数)查询页面

3.新增器械包时,默认时添加至一级供应室处理的器械包配置

4.一次性物品定义、库存、发货单等列表位置与殉宽度调整

Options
    • -0
    • +22
    /ssts-web/src/main/resources/spring/projects/gzfdzl/applicationContext-his-gzfdzl.xml
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -2
    • +3
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
  4. /ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock
    • -0
    • +148
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java
    • -0
    • +5
    /ssts-web/src/main/webapp/WEB-INF/dwr.xml
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -0
    • +136
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • -0
    • +5
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js
    • -3
    • +19
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -1
    • +0
    /ssts-web/src/main/resources/config/gzfdzl/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -0
    • +9
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -0
    • +50
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp
    • -0
    • +8
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
Friday 08 Apr 2016
5:41 下午

shuyongfu

复大肿瘤jdbc连his数据库邮jtds驱动更改为微软官网驱动
Options
    • -2
    • +2
    /ssts-web/src/main/resources/spring/projects/gzfdzl/applicationContext-his-gzfdzl.xml
3:14 下午

wangyi

科室改名处理
Options
    • -0
    • +3
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • -2
    • +42
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -17
    • +24
    /forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java
11:01 上午

jeffli

解决bug：

器械包管理上传图片显示成功，但实际并没有图片。

Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/imagefilemanager/ImageFile.java
    • -95
    • +101
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java
Thursday 07 Apr 2016
7:40 下午

adairkang

发货物品查询添加外部编码并排序

器械包没有外部编码，排在后面，代码的处理顺序调了位置

Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_child.jasper
    • -4
    • +11
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_main.jrxml
    • -4
    • +14
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_child.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_main.jasper
    • -0
    • +12
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/InvoiceQueryItem.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
6:16 下午

jeffli

优化功能：

删除一次性物品定义时，判断是否有库存记录，如果有则不允许删除

屏蔽一次性物品库存管理界面上的操作按钮

Options
    • -1
    • +1
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
    • -5
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js
    • -25
    • +48
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
5:54 下午

adairkang

入库单跟调拨单对选择打印的处理
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
5:41 下午

shuyongfu

复大南院发货不成功旧数据引起的小问题处理
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
5:04 下午

adairkang

提示的标题
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
4:41 下午

wangyi

申请单支持中文检索器械包
Options
    • -1
    • +3
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
4:05 下午

adairkang

调拨单打印物品批次，一次选多个物品的问题

入库单打印批次的方法改为调用公共的方法

Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js
    • -43
    • +43
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
2:57 下午

adairkang

调拨单后台的处理代码
Options
    • -0
    • +6
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -3
    • +14
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
2:52 下午

adairkang

调拨单明细及批次打印

调拨单出入库方都能看到单

调拨单列表添加出库仓库及入库仓库列

Options
    • -15
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
    • -0
    • +46
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js
    • -1
    • +74
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js
    • -18
    • +270
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.jsp
12:13 下午

jeffli

修改功能：

一次性物品库存管理，不显示库存为0的批次

Options
    • -0
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • -1
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -0
    • +11
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
11:58 上午

adairkang

no_comment
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
11:25 上午

wangyi

修复打开外来器械申请单报空指针错
Options
    • -49
    • +51
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
11:17 上午

shuyongfu

调整物品宽度，新加的明细添至第一行
Options
    • -3
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js
11:07 上午

jeffli

优化消毒物品发货扫描和提交的速度
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
10:50 上午

adairkang

发货报表界面调整
Options
    • -19
    • +6
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_main.jrxml
    • -19
    • +6
    /ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_main.jasper
8:56 上午

adairkang

发货物品查询添加汇总查询
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_child.jasper
    • -0
    • +44
    /forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java
    • -0
    • +96
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_child.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_main.jasper
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -1
    • +14
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -1
    • +1
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • -0
    • +26
    /forgon-tools/src/main/java/com/forgon/tools/util/BaseUtils.java
    • -0
    • +6
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -0
    • +141
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_main.jrxml
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -1
    • +16
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/InvoiceQueryItem.java
    • -4
    • +38
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js
2:03 上午

shuyongfu

录入物品采购计划，选择物品后自动带出上一次录入的数据，增加进价
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.js
2:00 上午

shuyongfu

1.发货单列表的备注列前移，可以不用向右移动横向滚动条就能看到
Options
    • -1
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.js
    • -0
    • +8
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManager.java
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • -0
    • +23
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManagerImpl.java
    • -1
    • +86
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GoodPurchaseTableManager.java
Wednesday 06 Apr 2016
8:22 下午

wangyi

物资收发明细仓库汇总
Options
    • -2
    • +14
    /ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/service/StockTakeRecordManagerImpl.java
8:19 下午

wangyi

修复明细核算月报消毒物品去掉下划线后获取材料数量错误bug
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
8:17 下午

wangyi

格式化代码
Options
    • -5
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
    • -4
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsBatchStock.java
    • -9
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsBatch.java
6:13 下午

adairkang

修改公共的日期比较函数

入库单列表和退库单列表过滤，点重置没有清除过滤条件的问题

Options
    • -5
    • +11
    /ssts-web/src/main/webapp/js/common.js
    • -7
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
    • -7
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
5:25 下午

adairkang

一次性物品退库单列表打印，并添加过滤
Options
    • -0
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.jsp
    • -5
    • +13
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • -0
    • +33
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js
    • -2
    • +207
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
    • -2
    • +28
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js
    • -31
    • +34
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
3:27 下午

jeffli

完善功能：

修改器械包名时同步修改其他的表

修改仓库名时同步修改其他的表

Options
    • -5
    • +6
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -3
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
3:20 下午

adairkang

合并入\退库单的打印
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
3:18 下午

adairkang

添加退库单的打印配置
Options
    • -0
    • +39
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js