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 07 Apr 2016
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
3:17 下午

adairkang

单个退库单的打印，跟入库单的打印调同样的方法
Options
    • -84
    • +86
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.jsp
    • -0
    • +84
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js
    • -7
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
12:29 下午

jeffli

解决bug：

自定义装配时，如果物品未启用标识牌，会装配失败

优化自定义装配的代码

优化自定义装配的错误提示

Options
    • -208
    • +217
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • -0
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -1
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
12:25 下午

adairkang

入库物品明细统计报表添加供应商过滤
Options
    • -2
    • +2
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • 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
    • -3
    • +46
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntryDetailStatisticView.js
11:30 上午

adairkang

退货明细统计报表，物品名称修改字体大小
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/jasperRtp/returnGoods_child_1.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/returnGoods_child_1.jasper
Tuesday 05 Apr 2016
5:20 下午

adairkang

南院供应室用户不能修改申请单的问题
Options
    • -0
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
5:08 下午

wangyi

明细核算月报区分供应室
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
4:45 下午

shuyongfu

入库单、出库单、采购计划添加后插入到下方grid表格的第一行，入库单的时间可以手工输入指定格式的日期
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
3:42 下午

adairkang

入/出库统计供应商列的字体调整
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/jasperRtp/godownEntrySummary.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/godownEntrySummary.jasper
3:38 下午

jeffli

修改注释
Options
    • -1
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
1:09 下午

terrykwan

解决了包装类型设置页面无法显示的问题
Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/systemsetting/controller/HttpOptionController.java
11:40 上午

adairkang

入库单列表打印配置
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js
12:06 上午

shuyongfu

入库单统计(按供应商)增加单类型的条件，根据单类型可分别统计入库或退库
Options
    • -4
    • +37
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.jsp
Monday 04 Apr 2016
11:32 下午

adairkang

no_comment
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
11:15 下午

adairkang

入库单统计分单类型
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -1
    • +12
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java
    • -1
    • +2
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -2
    • +3
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
5:16 下午

adairkang

入库单列表指印修改

入库单统计报表(按供应商)打印问题

Options
    • -13
    • +30
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
    • -1
    • +1
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/ProjectSpecificMaintainManagerImpl.java
    • -3
    • +38
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
    • -1
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java
    • -14
    • +12
    /ssts-web/src/main/webapp/jasperRtp/godownEntrySummary.jrxml
    • -0
    • +16
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
    • -10
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js
    • -1
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/godownEntrySummary.jasper
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -1
    • +1
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportFormsManagerImpl.java
11:15 上午

shuyongfu

现在器械包定义的handlerDepartCode这个字段已经不用了,所以去掉条件过滤,防止二级供应室用户看不到该字段值不为该用户所在科室的器械包
Options
    • -2
    • +3
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
Sunday 03 Apr 2016
11:28 下午

shuyongfu

添加入库单选择一次性物品时根据一次性物品id加载最近一次入库的一次性物品的供应商、注册证号、生产厂家、灭菌批次、产地等
Options
    • -2
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
9:07 下午

shuyongfu

添加入库单选择一次性物品时根据一次性物品id加载最近一次入库的一次性物品的供应商、注册证号、生产厂家、灭菌批次、产地等
Options
    • -0
    • +7
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java
    • -0
    • +15
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
    • -8
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
    • -0
    • +52
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
7:31 下午

jeffli

解决bug：

修改入库单价格时，发货单总价未更新。

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -0
    • +26
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionUtils.java
  3. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/invoice/service
  4. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/invoice
    • -1
    • +16
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -0
    • +83
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/invoice/service/InvoiceUtils.java