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
Friday 25 Mar 2016
12:38 上午

shuyongfu

器械包与材料库存的公共方法实现,科室申领根据申请科室过滤处理科室、根据处理科室过滤器械包以及申请单提交时处理供室与申请科室的服务配置校验及处理科室与器械包的处理配置校验
Options
    • -0
    • +38
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManager.java
    • -1
    • +10
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -6
    • +65
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -0
    • +2
    /ssts-web/src/main/resources/strtus_oa.xml
    • -1
    • +13
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -0
    • +122
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
    • -0
    • +67
    /forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java
    • -38
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/GoodsStockManager.java
  10. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service
    • -2
    • +101
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
Thursday 24 Mar 2016
2:49 下午

jeffli

一次性物品入库和出库改造
Options
    • -3
    • +19
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
2:40 下午

jeffli

一次性物品入库和出库改造
Options
    • -0
    • +20
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsBatchStock.java
    • -0
    • +27
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/IdentificationOfDiposableGoods.java
    • -0
    • +20
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java
    • -43
    • +39
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -0
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
    • -2
    • +34
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java
1:31 下午

terrykwan

解决登陆成功后页面会报错的问题
Options
    • -1
    • +1
    /ssts-web/src/main/resources/spring/applicationContext-acegi-security.xml
11:41 上午

adairkang

科室分组过滤的问题
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/divselect.js
11:00 上午

jeffli

一次性物品入库和出库改造，增加仓库处理
Options
    • -11
    • +5
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java
    • -305
    • +225
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
10:42 上午

adairkang

待回收扫描条码问题
Options
    • -1
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
10:19 上午

wangyi

同步4.0代码，解决有丢失、报损情况装配任务页面未删除
Options
    • -21
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
9:11 上午

adairkang

入库单跟仓库的关联
Options
    • -28
    • +28
    /ssts-web/src/test/java/test/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerTests.java
    • -6
    • +77
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
    • -8
    • +8
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAReturnGoodReInvoiceManager.java
    • -1
    • +39
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
Wednesday 23 Mar 2016
10:47 下午

terrykwan

增加了2个批量打印发货计划时，申请单包含敷料包的测试用例
Options
    • -1
    • +74
    /ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByRecyclingNumberTests.java
    • -1
    • +77
    /ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByApplyNumberTests.java
    • -1
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrint2ByApplyNumberTests.java
6:09 下午

shuyongfu

供应室服务临床科室及供应室处理器械包及仓库管理相关功能
Options
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseForm.js
5:29 下午

adairkang

一次性物品数据表查询语句中，对表名的修改及相关实例局部变量命名修改
Options
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakemanager/StockTakeItem.java
    • -6
    • +6
    /ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/service/StockTakeRecordManagerGzzyyfsImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/monthDiposableGoodsReport.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/diposableGoodsTotal.jasper
    • -1
    • +1
    /ssts-web/src/main/webapp/jasperRtp/returnGoods_child_1.jrxml
    • -15
    • +15
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/project/service/ProjectManagerImpl.java
    • -13
    • +13
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -1
    • +5
    /ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
    • -3
    • +3
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManager.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/monthDetail_main_1.jasper
    • -1
    • +1
    /ssts-web/src/main/webapp/jasperRtp/diposableGoodsTotal.jrxml
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsBatch.java
    • -41
    • +41
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManagerImpl.java
    • -2
    • +2
    /ssts-web/src/main/webapp/WEB-INF/dwr.xml
    • -16
    • +16
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
  16. … 30 more files in changeset.
3:09 下午

shuyongfu

供应室服务临床科室及供应室处理器械包及仓库管理相关功能
Options
    • -8
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsView.js
    • -52
    • +79
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsForm.js
    • -5
    • +130
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/action/CssdServiceDeptsAction.java
    • -0
    • +5
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -4
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseView.js
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesView.js
10:01 上午

jeffli

为一次性物品对象增加仓库信息
Options
    • -0
    • +19
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/IdentificationOfDiposableGoods.java
    • -0
    • +19
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsBatchStock.java
    • -0
    • +18
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsStock.java
12:15 上午

shuyongfu

供应室服务临床科室及供应室处理器械包及仓库管理相关功能
Options
    • -0
    • +7
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -0
    • +192
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsForm.js
    • -0
    • +167
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsView.js
    • -0
    • +23
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -6
    • +78
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -0
    • +54
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsView.jsp
    • -0
    • +202
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesForm.js
    • -0
    • +163
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesView.js
    • -0
    • +202
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/cssdhandletousses/action/CssdHandleToussesAction.java
  10. /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/cssdhandletousses/action
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseView.js
    • -164
    • +0
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/cssdhandletousses/CssdHandleToussesAction.java
    • -0
    • +55
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesView.jsp
12:14 上午

shuyongfu

供应室服务临床科室及供应室处理器械包及仓库管理相关功能
Options
    • -1
    • +28
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
    • -12
    • +16
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/WareHouseAction.java
    • -2
    • +0
    /forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java
    • -0
    • +7
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • -4
    • +82
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
  7. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/action
    • -0
    • +35
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehouse/WareHouse.java
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -0
    • +170
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/action/CssdServiceDeptsAction.java
    • -166
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/CssdServiceDeptsAction.java
Tuesday 22 Mar 2016
6:03 下午

jeffli

调整一次性物品数据库设计，增加多仓库支持
Options
    • -17
    • +20
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -20
    • +20
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • -4
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakemanager/StockTakeItem.java
    • -8
    • +8
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/project/service/ProjectManagerImpl.java
    • -2
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java
    • -6
    • +6
    /ssts-web/src/main/java/test/forgon/disinfectsystem/invoicemanager/service/DataGenerater.java
    • -6
    • +6
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
    • -11
    • +11
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBaseDataFromZipManagerImpl.java
    • -17
    • +17
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
    • -0
    • +216
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsBatchStock.java
    • -3
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/IdentificationOfDiposableGoods.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -2
    • +2
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsItemVO.java
    • -14
    • +14
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/ProjectSpecificMaintainManagerImpl.java
    • -2
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManager.java
  16. … 65 more files in changeset.
4:52 下午

adairkang

调拨单类型
Options
    • -0
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java
4:15 下午

shuyongfu

供应室服务临床科室及供应室处理器械包相关功能
Options
    • -1
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/OrgUnitTableManager.java
4:13 下午

shuyongfu

供应室服务临床科室及供应室处理器械包相关功能
Options
    • -0
    • +103
    /forgon-core/src/main/java/com/forgon/directory/model/CssdHandleTousses.java
    • -0
    • +164
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/cssdhandletousses/CssdHandleToussesAction.java
  3. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts
    • -2
    • +19
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • -2
    • +16
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -0
    • +166
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/CssdServiceDeptsAction.java
    • -95
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/CssdHandleTousses.java
    • -0
    • +79
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/OrgUnitTableManager.java
  9. /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/cssdhandletousses
2:57 下午

adairkang

退库单信息中仓库的选择
Options
    • -5
    • +52
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
    • -2
    • +35
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/WareHouseAction.java
2:47 下午

wangyi

增加库存常量字段
Options
    • -3
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/goodsstock/GoodsStock.java
2:43 下午

adairkang

器械包信息列表显示所属仓库
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
1:43 下午

adairkang

器械包已灭菌和消毒物品已消毒时，设置入库的仓库属性(完成灭菌时)，wince和android pda都有调用
Options
    • -0
    • +13
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • -0
    • +50
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -0
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
11:21 上午

wangyi

修复器械包定义标识牌为null时，回收提示要扫描标识牌条码bug
Options
    • -2
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
9:09 上午

adairkang

查询科室的仓库的sql语句

调整部分入库单的代码

入库单添加到默认仓库的处理

Options
    • -0
    • +101
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
    • -64
    • +13
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
    • -7
    • +126
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
    • -2
    • +29
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java
    • -0
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java
    • -0
    • +30
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java
Monday 21 Mar 2016
7:43 下午

shuyongfu

器械包与材料库存实体类及manager接口方法定义
Options
    • -0
    • +38
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/GoodsStockManager.java
  2. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/goodsstock
  3. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock
    • -0
    • +155
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/goodsstock/GoodsStock.java
7:42 下午

shuyongfu

仓库管理-新增、修改、删除功能实现
Options
    • -0
    • +75
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseView.jsp
    • -0
    • +211
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/WareHouseAction.java
    • -0
    • +5
    /ssts-web/src/main/webapp/WEB-INF/dwr.xml
    • -0
    • +160
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseView.js
    • -0
    • +192
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseForm.js
  6. /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java
  8. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action
    • -0
    • +31
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/dwr/WarehouseTableManager.java
    • -0
    • +88
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
    • -0
    • +16
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
  12. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/dwr
6:50 下午

wangyi

触摸屏回收JavaScript代码提取成js文件
Options
    • -0
    • +2138
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -2145
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
4:51 下午

shuyongfu

对接第三方接口属性调整
Options
    • -0
    • +51
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/PatientInfoVO.java