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 12 Aug 2017
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
11:21 上午

adairkang

科室供应室类型重命名
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java
    • -31
    • +30
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
    • -2
    • +2
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/customform/formInstanceReportView.jsp
    • -4
    • +4
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
    • -1
    • +1
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
    • -1
    • +3
    /ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/service/StockTakeRecordManagerImpl.java
    • -7
    • +6
    /ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -1
    • +1
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
    • -2
    • +2
    /ssts-stockmanage/src/main/java/com/forgon/disinfectsystem/stockmanage/departmentstock/service/DepartmentStockManagerImpl.java
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
  16. … 16 more files in changeset.
Friday 11 Aug 2017
5:06 下午

yanweining

ZSYKZX-77:同步入库单页面，物品清单需要显示"物资编码"字段信息
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/datasynchronization/inventory/showStorageEntryItem.jsp
4:13 下午

cherry

增加退出后杀掉32位ie进程
Options
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Consume.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Materials_Godown_Entry.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Reject.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/PackingHistory.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Apply.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/UserRecord.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java
3:30 下午

shuyongfu

小周已经在成都龙泉现场增加了配置项外来器械申请时显示原始包定义还是显示最近一次申请的包定义,值为true(表示显示原始包定义)
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js
2:14 下午

adairkang

简单重构
Options
    • -7
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
2:08 下午

zengjc

年度消毒供应中心统计报表，列宽加长.
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/yearWorkloadReport2.jasper
    • -2
    • +2
    /ssts-web/src/main/webapp/jasperRtp/yearWorkloadReport2.jrxml
2:06 下午

terrykwan

改进日志输出方式
Options
    • -3
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
2:05 下午

terrykwan

改进提示信息
Options
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
1:17 下午

terrykwan

提高容错性
Options
    • -3
    • +18
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
11:11 上午

zengjc

修复东莞中医院，年度消毒工作中心统计报表辅料包和辅料包材料统计不对的问题.
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
Thursday 10 Aug 2017
11:46 下午

terrykwan

优化代码
Options
    • -20
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
    • -4
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/service/BorrowApplyServiceImpl.java
    • -4
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/helper/ApplyHelper.java
11:43 下午

shuyongfu

windowOnLoaded变量误删的代码恢复.(用于自动化测试的判定变量)
Options
    • -0
    • +3
    /ssts-web/src/main/webapp/homepage/portalPage.js
10:55 下午

adairkang

GDSRMYY-352 外来器械一键入框时总会有两件物品没有入到篮筐中
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -0
    • +9
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
10:42 下午

terrykwan

代码重构与优化
Options
    • -15
    • +26
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
    • -5
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
    • -4
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/service/BorrowApplyServiceImpl.java
    • -4
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/helper/ApplyHelper.java
9:04 下午

zengjc

东莞中医院工作量持续收集统计报表，‘手术包次日下送件数’发生数为0时，也显示总数.
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
8:42 下午

zengjc

修正东莞中医院年度消毒供应中心清洗器械、清洗机使用次数统计等不正确的问题.
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
6:54 下午

yanweining

GZFDZL-108:在一次性物品盘点管理上增加一栏失效日期
Options
    • -0
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/action/InventoryRecordAction.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js
4:58 下午

adairkang

PDA审核人编码为空的问题
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
4:35 下午

adairkang

CDSLQYQYYY-17 PC端发货界面增加“保存并打印”按钮
Options
    • -1
    • +2
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • -136
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -0
    • +140
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrintModule.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js
    • -1
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp
    • -2
    • +18
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp
    • -3
    • +7
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
4:02 下午

zengjc

解决jira问题DGZYY-113，工作质量持续收集统计报表修改.
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:39 下午

shuyongfu

解决jira问题:GXZYYFY-23 切换科室选择下拉框的选项显示不全

另外还有以下几处调整:

1.退出系统增加日志

2.中大五院的告警提示不显示"已过期的器械包"告警数据

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
    • -14
    • +54
    /ssts-web/src/main/webapp/homepage/portalPage.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js
2:05 下午

liuliben

解决：在消毒供应中心物品领用界面，添加材料时，文本框里的文字不会自动清空
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js
1:46 下午

jeffli

解决：ZSSZYY-107

在器械包信息界面看到器械包的任务组不是装配对应时的那个任务组

Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
11:59 上午

liuliben

材料，器械包，外来器械停用显示改进
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp