forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 50
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 50
Total Lines of Code (LoC): 0
Net change in LoC this week: 0

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
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 26990 is being indexed.

Tuesday 24 Sep 2019
9:38 上午

CCT

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js
Monday 23 Sep 2019
2:24 下午

yuandongxiao

selenium代码提交：优化自动化测试脚本，使其与机柜电脑兼容
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
10:21 上午

zc.li

完善:ASSJMSZXYY-34.修复从高级视图进外来器械申请单添加外来器械包,js会报错的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
Saturday 21 Sep 2019
6:12 下午

shuyongfu

解决:GGSRMYY-105 物品签收功能改进

1.解决待签收列表有非当天发货的包未显示成黄色背景色的问题

2.解决s200pda扫码的问题(进入科室签收<版本2>-器械包签收页面后,整个app扫码功能不能使用)

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.83_20190921_v4_1_release.apk
5:17 下午

yuandongxiao

selenium代码提交：优化自动化测试脚本，使其与机柜电脑兼容
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
4:04 下午

shuyongfu

清理之前版本没用的pda更新包
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.82_20190830_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.76_20190604_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.83_20190909_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.82_20190828_v4_1_release.apk
4:03 下午

shuyongfu

解决:GGSRMYY-105 物品签收功能改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.83_20190921_v4_1_release.apk
3:43 下午

zc.li

解决：ASSZDWY-53。第2点：如果后台程序检查到了材料定义不存在，要把异常信息传递到前台，提示给用户。例如发现剪刀的材料定义不存在，则提示：

清洗篮筐内的物品【剪刀】的材料定义不存在，不能添加清洗记录，请检查！

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifiedItemManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
2:51 下午

yuandongxiao

selenium代码提交：优化自动化测试脚本，使其与机柜电脑兼容
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
10:49 上午

zengyuan

贵港市人民医院GGSRMYY-105 发货单签收增加扫描包条码签收功能 修改签收记录列表点击行以及鼠标移到表格行上的样式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/common.css
10:19 上午

zc.li

解决:ASSJMSZXYY-34.回收时拆包的外来器械进行发货，价格是0元的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Friday 20 Sep 2019
5:03 下午

zengyuan

广东省人民医院GDSRMYY-511 物品绑定功能的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindHandler.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
4:47 下午

zc.li

完善：GGSRMYY-104。优化提示。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/jasperreportsView.jsp
4:35 下午

zc.li

解决：GGSRMYY-104。质量监测报表查询清质量监测数据量大时打印预览空白，关闭预览后报错的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/jasperreportsView.jsp
4:32 下午

shuyongfu

版本号由4.6.82调整到4.6.83,新增以下内容

1.GGSRMYY-105 物品签收功能改进

2.HBDXFSYY-1 海信PDA扫描接口开发

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.83_20190909_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
3:43 下午

jason

按照签收记录创建时间createDate查找签收记录dwr，修改signDate注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/dwr/table/SignRecordTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/signRecord/SignRecord.java
3:33 下午

shuyongfu

处理Jira问题:GGSRMYY-105 物品签收功能改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManagerImpl.java
2:58 下午

zengyuan

贵港市人民医院GGSRMYY-105 发货单签收增加扫描包条码签收功能 修改为签收时间排序
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js
10:40 上午

yuandongxiao

selenium代码提交：

增加以下场景：

1.外部代理灭菌单申领

2.回收终止

3.回收未清洗删除装配任务

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/constant/Constants.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/chain/ComboFillFormHandler.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
Wednesday 18 Sep 2019
6:05 下午

zengyuan

售后-中山大学附属第一医院ASSZDFY-37 灭菌记录信息表单的页面布局优化 上次优化的基础再优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
3:55 下午

zc.li

完善DGZYY-156.场景5二次清洗;场景7,8,9.修复清洗材料总数没有过滤被终止物品数量的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifiedItemManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifiedItemManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifiedItem.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManager.java
Tuesday 17 Sep 2019
6:05 下午

zengyuan

售后-贵港市人民医院ASSGGSRMYY-32 一次性物品申请单填写了备注内容，点开发货计划，备注没显示出来
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
5:58 下午

zc.li

完善GDSRMYY-510:表名不正确的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseMorrowSend.js
5:50 下午

zengyuan

贵港市人民医院GGSRMYY-105 发货单签收增加扫描包条码签收功能 修改签收日期为服务器日期
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js
5:40 下午

zc.li

撤回：ASSGGSRMYY-32后台代码。改为在前台处理
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
5:12 下午

jason

物品签收默认不传签收记录ID
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
3:03 下午

zc.li

提交：ASSGGSRMYY-32后台代码。一次性物品申请单填写了备注内容，点开发货计划，备注没显示出来的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
Monday 16 Sep 2019
9:11 下午

jason

解决jira问题：贵港市人民医院GGSRMYY-105 发货单签收增加扫描包条码签收功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
8:39 下午

zengyuan

贵港市人民医院GGSRMYY-105 发货单签收增加扫描包条码签收功能 签收记录默认设置显示当天日期
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js
2:25 下午

jason

修改后台返回的提示信息名称'msg'为'message'
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java