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
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
12:46 下午

adairkang

器械包设置仓库属性

测试用例通过101，失败26，跳过25

Options
    • -4
    • +7
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTests.java
    • -0
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java
    • -4
    • +7
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/TousseInstanceReviewManagerTests.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
10:36 上午

adairkang

器械包实例添加对应的仓库

器械包发货的测试用例能通过

Options
    • -12
    • +14
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAForeignTousseGoodsInvoiceManager.java
    • -7
    • +8
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAForeignProxyTousseGoodsInvoiceManager.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAAssembleSendGoodsInvoiceManagerTests.java
    • -0
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForComboFormTests.java
    • -17
    • +19
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAORInvoiceManagerTests.java
    • -5
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDABorrowTousseGoodsInvoiceManager.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoicePlanManagerTest.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDADisinfectGoodsInvoiceManager.java
    • -16
    • +18
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAProxyTousseGoodsInvoiceManager.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/ScanBasketInvoiceTests.java
    • -0
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestInvoiceManagerForTousse.java
    • -6
    • +20
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/InvoicePlanManagerTests.java
12:00 上午

shuyongfu

屏蔽无关紧要的异常信息输出
Options
    • -1
    • +1
    /forgon-tools/src/main/java/com/forgon/tools/db/resultset/ResultSetUtil.java
Wednesday 13 Apr 2016
11:49 下午

shuyongfu

灭菌完成后,器械包实例的灭菌程序改成与灭菌单的灭菌程序一致,使发货统计按灭菌程序的统计数据准确
Options
    • -0
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
7:58 下午

adairkang

科室名称及编码使用常量
Options
    • -0
    • +8
    /ssts-web/src/test/java/test/forgon/constant/Constants.java
    • -10
    • +11
    /ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java
    • -6
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/UnPackingDisinfectGoodsInstanceTests.java
    • -2
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDADisinfectGoodsInvoiceManager.java
    • -7
    • +8
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForComboFormTests.java
    • -7
    • +8
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAProxyTousseGoodsInvoiceManager.java
    • -1
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDABorrowTousseGoodsInvoiceManager.java
    • -41
    • +41
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAReturnGoodReInvoiceManager.java
    • -1
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDADuplicateInvoice.java
    • -4
    • +5
    /ssts-web/src/test/java/test/forgon/tools/json/JSONTest.java
    • -1
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDATousseInvoiceManager.java
    • -36
    • +36
    /ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestRecyclingApplication.java
    • -8
    • +9
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDASimpleTousseComplexStatusInvoiceManagerTests.java
    • -12
    • +13
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestInvoiceManagerForTousse.java
    • -3
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAAssembleSendGoodsInvoiceManagerTests.java
    • -4
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/webservice/service/ServiceManagerTests.java
7:43 下午

jeffli

增加一次性物品相关信息
Options
    • -0
    • +38
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/receiverecord/ReceiveRecordItem.java
6:31 下午

jeffli

测试用例调整
Options
    • -83
    • +26
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestInvoiceManagerForTousse.java
    • -5
    • +11
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForComboFormTests.java
5:58 下午

adairkang

手术室编码
Options
    • -3
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/InvoicePlanManagerTests.java
    • -1
    • +13
    /ssts-web/src/test/java/test/forgon/constant/Constants.java
    • -38
    • +39
    /ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestRecyclingApplication.java
    • -8
    • +8
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/ScanBasketInvoiceTests.java
    • -7
    • +7
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
5:32 下午

adairkang

添加测试用例中使用的常量类，记录使用的常量值
Options
    • -1
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAAssembleSendGoodsInvoiceManagerTests.java
    • -1
    • +7
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/ScanBasketInvoiceTests.java
    • -1
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestRecyclingApplication.java
  4. /ssts-web/src/test/java/test/forgon/constant
    • -13
    • +14
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • -11
    • +14
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForComboFormTests.java
    • -1
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/InvoicePlanManagerTests.java
    • -2
    • +7
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/UnPackingDisinfectGoodsInstanceTests.java
    • -1
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingRecordTests.java
    • -1
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java
    • -4
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java
    • -1
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDADiposableGoodsInvoiceManager.java
    • -7
    • +8
    /ssts-web/src/test/java/test/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerTests.java
    • -0
    • +13
    /ssts-web/src/test/java/test/forgon/constant/Constants.java
    • -2
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAReturnGoodReInvoiceManager.java
5:14 下午

wangyi

器械包发货统计报表去掉分页
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jasper
4:15 下午

jeffli

一次性物品测试用例调整
Options
    • -1
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • -36
    • +20
    /ssts-web/src/test/java/test/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerTests.java
    • -0
    • +12
    /ssts-web/src/test/java/test/forgon/disinfectsystem/ExpectedException.java
4:15 下午

adairkang

添加打印消毒物品标签时，打印失效日期，可配置
Options
    • -0
    • +4
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • -0
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js
    • -3
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
12:07 下午

adairkang

解决bug:导出物资收发明细时，报getOutputStream() has already been called for this response异常
Options
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/exportGoodsDetail.jsp
11:17 上午

adairkang

入库单添加有无生物检测报告及有无发票的处理
Options
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.jsp
    • -19
    • +146
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
    • -0
    • +13
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
10:30 上午

jeffli

一次性物品测试用例调整
Options
    • -573
    • +281
    /ssts-web/src/test/java/test/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerTests.java
Tuesday 12 Apr 2016
7:20 下午

wangyi

入库物品统计增加有无发货查询
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.jsp
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -5
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java
    • -8
    • +37
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.js
    • -6
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java
    • -1
    • +1
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java