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 19 May 2017
4:31 下午

adairkang

将layer版本升级到v3.0.3,解决在弹出的窗口中，有textarea的时候，再次打开无法输入的问题(获取不到焦点)

解决在扫描标识牌后，保存报错的问题。（将!=""的判断改为isUndifinedOrNullOrEmpty的调用)

Options
  1. /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/layer-v3.0.3/layer/skin/myskin
    • -2
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/basketLoadGoodsView.jsp
  3. /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/layer-v3.0.3
  4. /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/layer-v3.0.3/layer
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/layer-v3.0.3/layer/skin/default/icon.png
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/layer-v3.0.3/layer/skin/default/loading-2.gif
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/layer-v3.0.3/layer/skin/myskin/default/xubox_loading3.gif
  8. /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/layer-v3.0.3/layer/mobile
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/layer-v3.0.3/layer/layer.js
    • -2
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/layer-v3.0.3/layer/skin/myskin/default/xubox_loading2.gif
    • -2
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
    • -2
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setMaterialRecycleAmount.jsp
  14. /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/layer-v3.0.3/layer/skin/myskin/default
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/layer-v3.0.3/layer/skin/myskin/default/xubox_ico0.png
  16. … 22 more files in changeset.
3:16 下午

chenguina

PDA版本更新至4.5.62
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.60_20170504.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.62_20170512.apk
3:02 下午

jeffli

解决bug：

根据退货记录发货，打开界面时，会提示物品不在发货计划中

Options
    • -3
    • +17
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
11:35 上午

chenjiaru

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

jeffli

解决：GDSRMYY-316

装配管理界面，“包装类型”位置与上面没对齐

优化装配界面布局

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
10:05 上午

jeffli

手术预约单合并发货
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
10:00 上午

jeffli

增加测试用例：手术预约单合并发货
Options
    • -0
    • +304
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/OperationReservationMergeInvoiceTests.java
    • -3
    • +14
    /ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
10:00 上午

jeffli

手术预约单合并发货
Options
    • -0
    • +19
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
    • -0
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • -0
    • +17
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java
Thursday 18 May 2017
11:56 下午

shuyongfu

手术预约接口调整,推送的数据的默认科室改成可配置
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • -8
    • +7
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManagerImpl.java
    • -4
    • +43
    /ssts-webservice/src/main/java/net/gzsums/www/esb/MessageServiceSoapImpl.java
9:59 下午

chenjiaru

提交“灭菌模块”的自动化测试的代码
Options
    • -5
    • +33
    /ssts-selenium-test/src/test/java/test_4_1/sterilization/SterilizationTest.java
5:59 下午

chenjiaru

提交“灭菌模块”的自动化测试的代码
Options
    • -19
    • +129
    /ssts-selenium-test/src/test/java/test_4_1/sterilization/SterilizationTest.java
    • -13
    • +27
    /ssts-selenium-test/src/test/java/test_4_1/sterilization/service/impl/ZsyySterilization.java
    • -20
    • +24
    /ssts-selenium-test/src/test/java/test_4_1/ALL.java
    • -16
    • +29
    /ssts-selenium-test/src/test/java/test_4_1/sterilization/service/impl/GdsySterilization.java
    • -0
    • +2
    /ssts-selenium-test/src/test/java/test_4_1/Disinfection.java
    • -13
    • +29
    /ssts-selenium-test/src/test/java/test_4_1/sterilization/service/impl/Zd5ySterilization.java
    • -0
    • +8
    /ssts-selenium-test/src/test/java/test_4_1/sterilization/helper/SterilizationHelper.java
4:39 下午

adairkang

没有未补充的丢失报损的材料的时候，使用记录录的丢失报损也显示不了的问题
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
3:45 下午

adairkang

丢失报废的弹出窗口中，添加阻止浏览器在按backspace的时候返回
Options
    • -0
    • +36
    /ssts-web/src/main/webapp/js/common.js
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
3:33 下午

shuyongfu

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

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

Options
    • -3
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
3:14 下午

adairkang

历史回收记录，丢失报废备注不可修改
Options
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
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