forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 62
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 62
Total Lines of Code (LoC): 4,714,781
Net change in LoC this week: 2,406

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
Tuesday 15 Aug 2017
6:05 下午

chenjiaru

解决jira问题的两个：

1、ZSYY-113 一次性物品申请单录单界面调整

2、ZSYY-108 科室申领中申请单录入界面优化调整

Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -3
    • +3
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManager.java
    • -2
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java
    • -0
    • +1616
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
    • -0
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java
    • -120
    • +58
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js
    • -1
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • -0
    • +6
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
    • -50
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionHelper.java
    • -0
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java
    • -6
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
  16. … 12 more files in changeset.
5:44 下午

cherry

回收和灭菌的修改
Options
    • -21
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
    • -1
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java
4:22 下午

zengjc

中大附一，提交定时处理接口数据的文件.
Options
    • -0
    • +14
    /ssts-web/src/main/resources/spring/projects/zsyy/timer.xml
4:15 下午

jeffli

解决：ZSYY-117

外来器械小标签格式调整

Options
    • -1
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
3:32 下午

shuyongfu

解决jira问题:CDSLQYQYYY-21 标签类型删除
Options
    • -3
    • +25
    /ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java
    • -9
    • +55
    /ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java
    • -1
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js
    • -2
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js
    • -3
    • +18
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • -2
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardFormExt4.js
11:38 上午

shuyongfu

解决jira问题:CDSLQYQYYY-19 运作监控报表，科室过滤后，清洗、装配等环节没生效
Options
    • -15
    • +7
    /ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
    • -0
    • +4
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/PkRoomControlHelper.java
    • -0
    • +4
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java
    • -0
    • +4
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RvRoomControlHelper.java
    • -0
    • +5
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java
11:26 上午

chenjiaru

修改测试用例的基础数据
Options
    • -2
    • +2
    /ssts-web/src/main/java/test/forgon/constant/Constants.java
    • too large
    /ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
10:47 上午

jeffli

解决：GDSRMYY-358

外来器械有某一部分没有灭菌时无法发货

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
9:55 上午

jeffli

中大附一标识牌打印，同步现场修改
Options
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
Monday 14 Aug 2017
9:09 下午

adairkang

CDSLQYQYYY-17 PC端发货界面增加“保存并打印”按钮。
Options
    • -3
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
9:04 下午

adairkang

当前页和总页数水平对齐
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/print/printConfig.js
8:01 下午

jeffli

解决：GDSRMYY-358

外来器械有某一部分没有灭菌时无法发货

Options
    • -2
    • +11
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -1
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java
    • -88
    • +226
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAForeignTousseGoodsInvoiceManager.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
7:43 下午

shuyongfu

针对省医的一次性物品与其平台设计对接进行各个业务实现细化重构及清理一些无用的代码
Options
    • -1
    • +14
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
    • -1
    • +1
    /ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/inventorymanagement/gdsy/dao/InventoryDaoImpl.java
    • -1
    • +14
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • -26
    • +6
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsBatch.java
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/disposablegoods/DisposableGoodsInventory.java
    • -0
    • +10
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/WriteBackInventoryDao.java
    • -0
    • +64
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/DisposableGoodsStorageAdjustVo.java
    • -23
    • +49
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -36
    • +28
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
    • -22
    • +39
    /ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/service/ReceiveRecordManagerImpl.java
    • -56
    • +0
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
    • -2
    • +48
    /ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/inventorymanagement/gdsy/dao/WriteBackInventoryDaoImpl.java
  16. … 6 more files in changeset.
6:12 下午

cherry

增加外部代理灭菌的流程
Options
    • -8
    • +8
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java
    • -4
    • +8
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json
    • -39
    • +113
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
5:30 下午

shuyongfu

增加一次性物品入库单、退库单、供应室领用等页面的按钮隐藏配置项
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
5:29 下午

shuyongfu

增加一次性物品入库单、退库单、供应室领用等页面的按钮隐藏配置项
Options
    • -51
    • +47
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
    • -9
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownOutToSupplyRoomView.js
    • -2
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownOutView.js
5:10 下午

shuyongfu

解决使用记录人员汇总报表，点击后js报错
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordOperatorTotalView.jsp
4:42 下午

chenjiaru

修改测试用例的基础数据
Options
    • too large
    /ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
4:08 下午

adairkang

陈国强发回来新的回收清单打印配置文件
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/recyclingDetailPrintConfig.js
11:42 上午

adairkang

修改问题:器械包材料数量修改为0后，界面显示原来数值，但是保存后那个材料的数量还是修改为了0
Options
    • -1
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
Sunday 13 Aug 2017
1:47 下午

terrykwan

改进waitUntilUrlChange方法，如果URL与期望值不符合，抛出异常。之前不会抛出异常
Options
    • -4
    • +16
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
Saturday 12 Aug 2017
8:55 下午

adairkang

GDSRMYY-351 外来器械包定义数量为0可以保存
Options
    • -7
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js
8:46 下午

adairkang

ZSYY-87 发货数量依据回收单配置功能调整，添加回收申请单不发货科室配置 添加配置项
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • -3
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
6:52 下午

adairkang

ZSYY-87 发货数量依据回收单配置功能调整，添加回收申请单不发货科室配置
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
5:53 下午

adairkang

ZSYY-87 发货数量依据回收单配置功能调整，添加回收申请单不发货科室配置

重构 SupplyRoomConfigManager继承BasePoManager

回收申请单不发货科室的判断

Options
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrint2ByApplyNumberTests.java
    • -31
    • +19
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • -33
    • +22
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
    • -4
    • +7
    /ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByRecyclingNumberTests.java
    • -10
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
    • -4
    • +7
    /ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByApplyNumberTests.java
    • -6
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/dwr/table/SupplyRoomConfigTableManager.java
    • -4
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java
    • -26
    • +25
    /ssts-web/src/test/java/test/forgon/disinfectsystem/borrow/BorrowApplicationTest.java
    • -16
    • +14
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoicePlanManagerTest.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestRecyclingApplication.java
    • -2
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/RecyclingApplicationManagerTests.java
    • too large
    /ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
5:03 下午

adairkang

重构
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -2
    • +5
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
4:47 下午

adairkang

回收申请单的判断方法及重构
Options
    • -12
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
4:41 下午

adairkang

添加注释
Options
    • -3
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
4:07 下午

adairkang

ZSYY-87 发货数量依据回收单配置功能调整，添加回收申请单不发货科室配置
Options
    • -0
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • -2
    • +149
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
    • -0
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
2:47 下午

adairkang

科室供应室页面命名修改
Options
    • -144
    • +144
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js