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
Thursday 18 May 2017
2:51 下午

adairkang

ZSYY-62 丢失和报废功能增加“丢失/报废原因”内容填写区域

objectDao对集合的查询，单次查询的in语句添加数量限制，数量多的时候，多次查询

材料定义的Manager(MaterialDefinitionManager)继承自BasePoManager

Options
    • -9
    • +82
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
    • -4
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
    • -0
    • +27
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java
    • -1
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • -4
    • +6
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
    • too large
    /ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
    • -2
    • +3
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/MaterialInvoiceManagerImpl.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +25
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java
    • -0
    • +25
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
    • -15
    • +9
    /ssts-web/src/test/java/test/forgon/disinfectsystem/importbasedata/TestExportbaseData.java
    • -0
    • +25
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java
    • -2
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTestsForSaveOrUpdateSterilizationRecord.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
  16. … 44 more files in changeset.
10:19 上午

shuyongfu

解决jira问题:ZSSZYY-105 登记使用记录时两个同名器械包植入物数量无法修改
Options
    • -18
    • +63
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/setForeignTousseUseImplantView.js
    • -1
    • +165
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -0
    • +101
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstanceImplantData.java
    • -0
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
10:17 上午

shuyongfu

解决jira问题:ZSYY-57 使用记录录入界面增加器械丢失和报废功能

增加前端对手工直接填写的丢失/报损数量的校验

Options
    • -3
    • +122
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
10:11 上午

shuyongfu

增加注释
Options
    • -0
    • +4
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
10:11 上午

shuyongfu

增加注释
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Wednesday 17 May 2017
10:09 下午

terrykwan

取消对NATIVE_EVENTS的禁用，解决鼠标移动到首页的装配和灭菌图标，下拉菜单不弹出的问题
Options
    • -3
    • +5
    /ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
5:34 下午

cherry

发货、装配、清洗优化调整
Options
    • -49
    • +111
    /ssts-selenium-test/src/test/java/test_4_1/ALL.java
    • -3
    • +3
    /ssts-selenium-test/src/test/java/test_4_1/Wash.java
    • -65
    • +77
    /ssts-selenium-test/src/test/java/test_4_1/Delivery.java
    • -7
    • +16
    /ssts-selenium-test/src/test/java/test_4_1/Assemble.java
2:16 下午

chenjiaru

解决jira问题：ZSYY-69 增加急用物品处理周期统计报表
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
1:55 下午

chenjiaru

解决jira问题：ZSYY-69 增加急用物品处理周期统计报表
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
10:39 上午

zhonghaowen

1.优化all.java的方法

2.utils修改等待页面加载完成最长时间

3.utils增加向页面添加jquery的方法

Options
    • -135
    • +94
    /ssts-selenium-test/src/test/java/test_4_1/ALL.java
    • -5
    • +22
    /ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
9:23 上午

cherry

增加非省医版本3的判断
Options
    • -1
    • +6
    /ssts-selenium-test/src/test/java/test_4_1/Recyle.java
Tuesday 16 May 2017
7:47 下午

chenjiaru

“手术排班物品查询”默认查询类型由“明细”改为“汇总”
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/operationReservationInvoiceView.js
6:15 下午

chenjiaru

解决jira问题：ZSYY-70 标识牌器械包的“已回收”状态分开成单独一个字段
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
5:41 下午

chenjiaru

解决jira问题：ZSYY-70 标识牌器械包的“已回收”状态分开成单独一个字段
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • -1
    • +54
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
    • -0
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
5:17 下午

cherry

all中增加自定义发货及对应的调整
Options
    • -28
    • +15
    /ssts-selenium-test/src/test/java/test_4_1/Delivery.java
    • -0
    • +1
    /ssts-selenium-test/src/test/java/test_4_1/ALL.java
    • -1
    • +2
    /ssts-selenium-test/src/test/java/test_4_1/Recyle.java
4:08 下午

zhonghaowen

修改ie8下借物模块selenium不稳定
Options
    • -2
    • +1
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/BorrowApplyServiceImpl.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
3:22 下午

shuyongfu

解决jira问题:ZSYY-57 使用记录录入界面增加器械丢失和报废功能
Options
    • -22
    • +367
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • -0
    • +83
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -4
    • +93
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordActionBase.java
    • -2
    • +131
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -2
    • +23
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -4
    • +19
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialerrordamage/MaterialErrorDamageDetail.java
    • -0
    • +148
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseMaterialErrorDamage.java
    • -0
    • +19
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java
11:50 上午

jeffli

如果是从退货界面进来发货界面，隐藏辅助发货按钮
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
11:49 上午

jeffli

发货扫描错误时，提示更详细
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
11:45 上午

jeffli

发货扫描错误时，提示更详细
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
11:30 上午

jeffli

从退货界面发货后，返回退货列表界面
Options
    • -0
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
11:16 上午

jeffli

发货扫描错误时，提示是哪个条码的器械包
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
11:12 上午

jeffli

根据发货单退货，在退货界面上只显示普通器械包，敷料包，消毒物品
Options
    • -0
    • +12
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
11:07 上午

chenjiaru

解决jira问题：ZSYY-69 增加急用物品处理周期统计报表
Options
    • -17
    • +17
    /ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycle.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycle.jasper
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
10:01 上午

chenjiaru

解决jira问题：ZSYY-69 增加急用物品处理周期统计报表
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
Monday 15 May 2017
10:02 下午

adairkang

清洗交接项中，添加冗余的器械包条码字段
Options
    • -5
    • +10
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManagerImpl.java
7:58 下午

adairkang

清洗交接项中，添加冗余的器械包条码字段
Options
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/WashTransitionItem.java
7:58 下午

adairkang

清洗交接项中，添加冗余的器械包条码字段
Options
    • -0
    • +1
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManagerImpl.java
6:37 下午

cherry

回收scan方法修改后，回收的其他地方的对应修改
Options
    • -20
    • +39
    /ssts-selenium-test/src/test/java/test_4_1/Recyle.java
5:42 下午

jeffli

解决:ZSYY-72

退货功能增加“发货单退货”和“退货重发”功能

Options
    • -54
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • -0
    • +1540
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.js
    • -1
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
    • -0
    • +105
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.jsp
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp
    • -0
    • +109
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
    • -0
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js