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
Thursday 18 Aug 2022
2:45 下午

zc.li

解决：NYSY-49 外来器械和外来器械拆分小包显示调整 报表调整
Options
    • -0
    • +12
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UrgentNeedGoodsProcessingCycle.java
    • -1
    • +1
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport_child_child.jasper
    • -0
    • +10
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SecondColumnVo.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport_child.jasper
    • -0
    • +196
    /ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport.jasper
    • -0
    • +74
    /ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport_child.jrxml
    • -0
    • +217
    /ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport_child_child.jrxml
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
2:18 下午

frank.qiu

解决了 GYEY-773 - 回收和装配时的扫描标识牌条码的功能，增加通过RFID阅读器来读取RFID标签中的的器械包标识牌条码
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
2:16 下午

frank.qiu

解决了 GYEY-773 - 回收和装配时的扫描标识牌条码的功能，增加通过RFID阅读器来读取RFID标签中的的器械包标识牌条码
Options
    • -0
    • +346
    /ssts-web/src/main/webapp/disinfectsystem/packing/index.html
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -0
    • +328
    /ssts-web/src/main/webapp/disinfectsystem/packing/setPlugInRFID.js
12:37 下午

frank.qiu

解决了 GYEY-773 - 回收和装配时的扫描标识牌条码的功能，增加通过RFID阅读器来读取RFID标签中的的器械包标识牌条码
Options
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/connect_1.png
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -4
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/connect_2_1.png
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/usb.png
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/connect_2_2.png
12:04 下午

shuyongfu

处理:ZJYY-108 PDA预回收功能优化：扫“手术间”、“科室”、“标识牌”条码筛选待回收的申请单、单内物品可设置排序、增加已处理物品颜色标识、物品加急标识

DGSHLYY-6 PDA【回收清点】模块在待回收列表扫描录入了使用记录的标识牌或包外唯一标签条码，可以打开对应的申请单

Options
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.30_20220818_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.30_20220818_v4_1_nologo_release.apk
11:29 上午

yuandongxiao

selenium3：优化高级视图点击菜单代码
Options
    • -57
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/enterpriseview/EnterpriseViewPage.java
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestMaterialStockManagement.java
    • -74
    • +18
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/enterpriseview/EnterpriseViewProxy.java
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestDisposableGoodsManagement.java
    • -45
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/enterpriseview/EnterpriseViewHandle.java
11:25 上午

frank.qiu

解决了 GYEY-773 - 回收和装配时的扫描标识牌条码的功能，增加通过RFID阅读器来读取RFID标签中的的器械包标识牌条码
Options
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/usb.png
11:22 上午

frank.qiu

解决了 GYEY-773 - 回收和装配时的扫描标识牌条码的功能，增加通过RFID阅读器来读取RFID标签中的的器械包标识牌条码
Options
    • -0
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • -0
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • -1
    • +82
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
10:06 上午

jason

解决jira问题：ZJYY-108 PDA预回收功能优化：扫“手术间”、“科室”、“标识牌”条码筛选待回收的申请单、单内物品可设置排序、增加已处理物品颜色标识、物品加急标识
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
Wednesday 17 Aug 2022
6:29 下午

yuandongxiao

selenium3提交测试用例：扫描灭菌篮筐发货、辅助发货
Options
    • -8
    • +132
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/delivery/DeliveryHandle.java
    • -1
    • +34
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json
    • -4
    • +47
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/delivery/DeliveryProxy.java
    • -2
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/pack/PackPage.java
    • -4
    • +84
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/delivery/DeliveryPage.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/recycle/RecyclePage.java
    • -114
    • +118
    /ssts-web/src/main/webapp/disinfectsystem/config/autotest/config.js
    • -0
    • +38
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestDelivery.java
5:58 下午

shuyongfu

处理:ZJYY-108 PDA预回收功能优化：扫“手术间”、“科室”、“标识牌”条码筛选待回收的申请单、单内物品可设置排序、增加已处理物品颜色标识、物品加急标识

DGSHLYY-6 PDA【回收清点】模块在待回收列表扫描录入了使用记录的标识牌或包外唯一标签条码，可以打开对应的申请单

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.30_20220817_v4_1_6p_release.apk
5:06 下午

jason

解决jira问题：ZJYY-108 PDA预回收功能优化：扫“手术间”、“科室”、“标识牌”条码筛选待回收的申请单、单内物品可设置排序、增加已处理物品颜色标识、物品加急标识(扫描标识牌或器械包实例条码，打开包含该器械包的使用记录转换的待回收申请单)
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
3:28 下午

jason

解决jira问题：ZJYY-108 PDA预回收功能优化：扫“手术间”、“科室”、“标识牌”条码筛选待回收的申请单、单内物品可设置排序、增加已处理物品颜色标识、物品加急标识(器械包种类查询条件需要包含其所有子类)
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
2:09 下午

zc.li

完善：GDSZYY-182 外来器械包数据调整
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:23 上午

yuandongxiao

selenium3:修改用例数据
Options
    • -4
    • +4
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json
11:21 上午

zc.li

完善：GDSZYY-182 外来器械包数据调整
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:13 上午

jason

解决jira问题： BJDXZLYY-31 库位管理模块增加与卡迪斯智能货柜系统进行对接功能
Options
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageRecordManagerImpl.java
10:37 上午

jason

解决jira问题： BJDXZLYY-31 库位管理模块增加与卡迪斯智能货柜系统进行对接功能(服务器响应超时提示信息修改)
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageRecordManagerImpl.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/StorageRecordAction.java
10:30 上午

shuyongfu

处理:ZJYY-108 PDA预回收功能优化：扫“手术间”、“科室”、“标识牌”条码筛选待回收的申请单、单内物品可设置排序、增加已处理物品颜色标识、物品加急标识

DGSHLYY-6 PDA【回收清点】模块在待回收列表扫描录入了使用记录的标识牌或包外唯一标签条码，可以打开对应的申请单

Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
10:25 上午

frank.qiu

解决了 BJDXZLYY-31 - 库位管理模块增加与卡迪斯智能货柜系统进行对接功能
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/goodsAccess.js
10:16 上午

zc.li

完善：GDSZYY-182 数据调整
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
Tuesday 16 Aug 2022
5:43 下午

jason

解决jira问题： BJDXZLYY-31 库位管理模块增加与卡迪斯智能货柜系统进行对接功能(服务器响应超时提示信息修改；库位编码(托盘号)异常情况处理)
Options
    • -0
    • +16
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageRecordManagerImpl.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/StorageRecordAction.java
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/config.js
3:43 下午

zc.li

完善：GDSZYY-182 数据调整
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:39 下午

zc.li

完善：GDSZYY-182 数据调整
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
2:55 下午

jason

解决jira问题：ZSSXLRMYY-217 包定义的是否装配字段为否的物品，录入清洗记录后，器械包信息的清洗记录应可查到回收及清洗信息(保存清洗记录时，联动修改不装配的器械包实例上的清洗信息)
Options
    • -1
    • +1
    /forgon-tools/src/main/java/com/forgon/Constants.java
    • too large
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
10:51 上午

yuandongxiao

selenium3：修复自动化数据运行报错的问题
Options
    • -1
    • +1
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json
Monday 15 Aug 2022
6:57 下午

frank.qiu

解决了 SSTS-562 - 器械包工作量统计报表，当查询条件选择申请科室 过多时，后台会提示“Request header is too large”，并且不会查询出数据
Options
    • too large
    /ssts-web/src/main/webapp/js/common.js
5:41 下午

yuandongxiao

selenium3提交测试用例：今天本组装配记录修改包实例信息
Options
    • -1
    • +157
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/pack/PackPage.java
    • -0
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestMainProcess.java
    • -0
    • +23
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestPack.java
    • -0
    • +57
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/pack/PackProxy.java
    • -1
    • +134
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/pack/PackHandle.java
    • -0
    • +18
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json
5:40 下午

zc.li

完善：GDSZYY-182 数据调整
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
2:32 下午

zc.li

完善：GDSZYY-182 数据调整
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java