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
Saturday 16 Apr 2016
5:34 下午

shuyongfu

消毒供应中心物品(一次性物品与材料)领用功能
Options
    • -17
    • +85
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
    • -1
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -20
    • +27
    /ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/service/ReceiveRecordManagerImpl.java
    • -1
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/util/DisposableGoodsUtils.java
    • -2
    • +5
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
    • -0
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java
    • -0
    • +7
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java
    • -25
    • +137
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js
    • -1
    • +1
    /ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/dwr/table/ReceiveRecordTableManager.java
    • -2
    • +10
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
    • -12
    • +12
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
5:14 下午

jeffli

修改能功能：

核算月报和明细核算月报里面，将器械包和材料分开统计

Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:06 下午

adairkang

修改明细核算月报的报表内容
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jasper
    • -10
    • +10
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jrxml
    • -25
    • +25
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml
3:38 下午

adairkang

明细核算月报添加类型列
Options
    • -1
    • +8
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jasper
    • -1
    • +11
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jasper
3:14 下午

jeffli

修改能功能：

核算月报和明细核算月报里面，将器械包和材料分开统计

Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:11 下午

shuyongfu

材料发货明细po类增加结算价格属性
Options
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returnmaterialrecord/ReturnMaterialItem.java
3:02 下午

shuyongfu

材料丢失与报废补充减少库存及名字调整
Options
    • -1
    • +2
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingdamagerecord/service/RecyclingDamageRecordManagerImpl.java
3:00 下午

shuyongfu

删除重复代码
Options
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
2:58 下午

shuyongfu

供应室领用字段类型调整
Options
    • -0
    • +29
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/receiverecord/ReceiveRecordItem.java
    • -0
    • +42
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/receiverecord/ReceiveRecord.java
2:12 下午

adairkang

修改出错的提示信息(把标题栏error去掉)
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
    • -2
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/serialnumconfig/serialNumConfigForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierForm.js
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js
  16. … 5 more files in changeset.
1:17 下午

jeffli

修改能功能：

核算月报和明细核算月报里面，将器械包和材料分开统计

Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
12:39 下午

adairkang

no_comment
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntryDetailStatisticView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntryStatisticView.js
12:36 下午

jeffli

修改能功能：

核算月报和明细核算月报里面，将器械包和材料分开统计

Options
    • -0
    • +21
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/DepartmentMonthDetailItem.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
12:29 下午

adairkang

调整过滤条件form的高度，以适应1024*768的分辨率
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.js
12:28 下午

shuyongfu

材料发货单po类增加结算科室属性
Options
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialInvoice.java
12:21 下午

adairkang

调整代码
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:59 上午

adairkang

入退库物品统计报表(按供应商)添加物品类型过滤，选择是一次性物品还是材料
Options
    • -5
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialmanager/MaterialEntryItem.java
    • -1
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java
    • -1
    • +4
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -0
    • +10
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -0
    • +47
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +25
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryItemManager.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java
    • -1
    • +4
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • -0
    • +39
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryItemManagerImpl.java
Friday 15 Apr 2016
7:46 下午

adairkang

入退库物品统计报表，过滤掉调拨单产生的入退库单
Options
    • -1
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
6:42 下午

adairkang

一次性物品入库单和退库单及材料的入库单退库单的类型过滤
Options
    • -0
    • +30
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/util/GodownEntryUtil.java
    • -0
    • +28
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/util/MaterialEntryUtil.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
6:35 下午

shuyongfu

增加材料发货单、材料发货明细、材料退货单、材料退货明细四个po类
Options
  1. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returnmaterialrecord
    • -0
    • +106
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialInvoiceItem.java
    • -0
    • +187
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returnmaterialrecord/ReturnMaterialRecord.java
    • -0
    • +94
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returnmaterialrecord/ReturnMaterialItem.java
    • -0
    • +188
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialInvoice.java
5:49 下午

adairkang

入库物品统计报表及入库物品明细统计报表分一次性物品和材料过滤

获取一次性物品和材料的store添加物品类型的条件，如果没有指定，则获取所有

Options
    • -2
    • +48
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntryDetailStatisticView.js
    • -1
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -28
    • +46
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -3
    • +34
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • -3
    • +54
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntryStatisticView.js
    • -1
    • +7
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntryDetailStatisticView.jsp
4:48 下午

jeffli

同步4.0的修改
Options
    • -0
    • +163
    /ssts-web/src/main/webapp/debug/print/printDebug.js
4:48 下午

jeffli

同步4.0的修改
Options
    • -102
    • +135
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
    • -0
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • -0
    • +22
    /ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/dwr/table/IDCardDefinitionTableManager.java
    • -25
    • +89
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
11:07 上午

jeffli

测试用例调整
Options
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java
Thursday 14 Apr 2016
7:26 下午

jeffli

增加功能：

明细核算月报可以按一次性物品类别过滤

Options
    • -1
    • +1
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -4
    • +36
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
6:43 下午

wangyi

修复回收 物品删除后又添加问题bug
Options
    • -0
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
6:18 下午

jeffli

增加功能：

核算月报可以按一次性物品类别过滤（器械包不受影响）

Options
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAReturnGoodReInvoiceManager.java
    • -1
    • +1
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -1
    • +1
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +7
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.1.2_4.1.3.sql
    • -10
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsItem.java
    • -0
    • +37
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java
    • -0
    • +24
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -1
    • +1
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
    • -2
    • +2
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -4
    • +37
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js
6:02 下午

adairkang

退货明细打印，取消金额和单价列，调整名称和失效时期的长度
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
5:18 下午

adairkang

采购计划导出功能
Options
    • -0
    • +24
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.js
    • -0
    • +7
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManager.java
    • -22
    • +122
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManagerImpl.java
    • -0
    • +17
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/exportGoodPurchasePlan.jsp
2:38 下午

adairkang

入库单是否显示发货单和生物检测报告可配
Options
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js
    • -10
    • +26
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js