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 28 Jul 2016
4:16 下午

shuyongfu

解决jira问题:ZSSXLRMYY-4 器械包出库时自动减去材料或者一次性物品数量，然后费用进到报表
Options
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
4:07 下午

shuyongfu

解决jira问题:ZSSXLRMYY-4 器械包出库时自动减去材料或者一次性物品数量，然后费用进到报表
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -0
    • +40
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
4:01 下午

adairkang

注释
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
2:55 下午

wangyi

加急回收优化
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
1:51 下午

shuyongfu

装配历史记录的一次性物品扣减库存项po类及一次性物品明细增加关联装配历史及明细记录的字段
Options
    • -2
    • +30
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/DiposableGoodsItem.java
    • -0
    • +110
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingRecordOutItem.java
11:42 上午

wangyi

加急数量不能大于会输数量验证修改
Options
    • -5
    • +5
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
11:21 上午

zhonghaowen

解决申请单提交的时候部分会显示加急数量为null的情况
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
11:16 上午

wangyi

触摸控回收消毒物品，可以输入数量修改材料数量
Options
    • -1
    • +29
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
10:42 上午

zhonghaowen

TousseDefinitionManagerImpl类 handleUrgentAmountAndAmount方法增加判断urgentAmount是否为空
Options
    • -0
    • +3
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
10:34 上午

zengjc

添加灭菌记录加急处理,解决jira问题ZSSXLRMYY-40
Options
    • -0
    • +18
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
    • -2
    • +19
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -0
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseSimpleVO.java
    • -7
    • +8
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -0
    • +40
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
10:24 上午

chenjiaru

解决：GZFDZL-60 组织机构与人员同步，手工配置一个用户多个科室后进行同步，旧数据会被覆盖
Options
    • -0
    • +1
    /forgon-core/src/main/resources/com/forgon/directory/model/OrgUserRelation.hbm.xml
    • -0
    • +14
    /forgon-core/src/main/java/com/forgon/directory/model/OrgUserRelation.java
    • -16
    • +83
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • -3
    • +16
    /forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
10:12 上午

shuyongfu

解决jira问题:ZSSXLRMYY-44 批量打印时会漏打明细
Options
    • -1
    • +2
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
10:08 上午

shuyongfu

解决jira问题:DGDHYY-11 使用记录转化为申请单后单据变成通用申请单
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
10:00 上午

zhonghaowen

去掉重复提交的加急数量属性
Options
    • -11
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java
9:47 上午

zhonghaowen

ZSSXLRMYY-36:机械包加急功能

GDSRMYY-76:填写'通用申请单'时根据申请科室来显示对应科室的'申领模版' 添加用户切换模板前保留之前选定的数据功能

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
9:45 上午

zhonghaowen

ZSSXLRMYY-36:机械包加急功能
Options
    • -0
    • +37
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -1
    • +18
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -0
    • +22
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java
    • -0
    • +6
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -1
    • +7
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
9:43 上午

adairkang

东华发货单打印

科室互借添加打印功能

Options
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/borrowRecord/borrowRecordView.jsp
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • -10
    • +67
    /ssts-web/src/main/webapp/disinfectsystem/borrowRecord/borrowRecordView.js
    • -1
    • +80
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js
    • -17
    • +15
    /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java
9:42 上午

zhonghaowen

StringTools工具类新增handleNullOrZero方法
Options
    • -1
    • +15
    /forgon-tools/src/main/java/com/forgon/tools/string/StringTools.java
9:38 上午

shuyongfu

解决jira问题:DGDHYY-11 使用记录转化为申请单后单据变成通用申请单
Options
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • -2
    • +6
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js
    • -1
    • +3
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
9:35 上午

shuyongfu

解决盘盈盘亏明细的小数点明细问题
Options
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownStockTakeView.js
Wednesday 27 Jul 2016
7:31 下午

shuyongfu

明细核算月报二级供应室自动发货的消毒物品材料计算错误的修改,由于二级供应室的消毒物品自动发货未关联到申请单所以未查到相应的器械包定义及材料数量,后期再处理
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
7:28 下午

jeffli

解决bug：

外部代理灭菌没有生成包实例也能发货。

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
5:23 下午

wangyi

修复外部代理灭菌处理科室只显示一个bug
Options
    • -4
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js
4:55 下午

jeffli

固定标签（包括消毒物品和普通固定标签）发货，按失效期从小到大的顺序来发。
Options
    • -3
    • +5
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • -2
    • +0
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
4:48 下午

wangyi

快速回收加急处理
Options
    • -3
    • +9
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -1
    • +38
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
4:44 下午

zengjc

审核加急提示颜色改为蓝色.
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
4:24 下午

adairkang

发货时,扫描固定条码的包，如果发货数量大于配置的单次扫描数量，会报库存不足的问题
Options
    • -6
    • +10
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -0
    • +12
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/vo/InvoicePrintVo.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -2
    • +17
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
4:14 下午

zengjc

器械包审核，添加加急显示，如果是加急,则显示红色的'是'.
Options
    • -1
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
3:47 下午

zengjc

添加注释
Options
    • -1
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
3:43 下午

zengjc

器械包导入,更新供应室处理器械包配置.
Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java