forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 46
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 46
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 18115 is being indexed.

Tuesday 16 May 2017
11:50 上午

jeffli

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

jeffli

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

jeffli

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

jeffli

从退货界面发货后，返回退货列表界面
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
11:16 上午

jeffli

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

jeffli

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

chenjiaru

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

chenjiaru

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

adairkang

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

adairkang

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

adairkang

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

cherry

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

jeffli

解决:ZSYY-72

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

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
5:40 下午

jeffli

解决:ZSYY-72

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

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java
5:30 下午

zhonghaowen

修复科室存在模板下，添加相同的物品会自动新增一行
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
5:01 下午

cherry

调整自定义回收回收不了
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/Recyle.java
3:48 下午

zhonghaowen

修改ie8下recyle_recyleSignboardAndDropAndScrap方法通不过
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/Recyle.java
2:53 下午

cherry

回收修改为点击【保存并新建】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/ALL.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/Recyle.java
10:33 上午

zhonghaowen

selenium修复ie8下科室申领模块通不过
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/apply/helper/ApplyActionHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/apply/helper/ApplyHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
10:28 上午

cherry

1.省医版本3加上非整包申请的消毒物品

2.回收和发货调整

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/Recyle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/apply/service/Gdsy3ApplyServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/Delivery.java
Sunday 14 May 2017
6:00 下午

chenjiaru

解决jira问题：ZSYY-69 增加急用物品处理周期统计报表
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycle.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/operationDefine.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycle.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menu.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UrgentNeedGoodsProcessingCycle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
4:45 下午

adairkang

修复材料入筐的测试用例
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/TousseIntoBasketRestrictionsTests.java
Saturday 13 May 2017
11:03 上午

chenjiaru

规范文件的命名
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/operationReservationInvoiceView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/operationReservationInvoice.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/operationReservationInvoiceView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/operationReservationInvoice.jsp
Friday 12 May 2017
5:31 下午

zengjc

待清洗篮筐列表，不添加重复的篮筐条码，避免清洗界面的待清洗篮筐列表出现重复的篮筐.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
3:44 下午

chenjiaru

解决jira问题：ZSYY-67 发货管理增加手术排班物品发放查询
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
2:41 下午

cherry

去掉误注释的代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/ALL.java
2:06 下午

adairkang

中山一院默认启用使用记录快速回收
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
1:52 下午

chenjiaru

解决jira问题：ZSYY-67 发货管理增加手术排班物品发放查询
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice1_child_child.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2_child.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice1.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice1.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice1_child.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice1_child.jrxml
1:48 下午

jeffli

解决：HZSRMYY-20

发货管理列表位置调整

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
12:04 下午

zengjc

修正触摸屏清洗，清洗机没有默认清洗程序出现提示的问题.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js