forgon-ssts-v4.1 / SterileSupplySystem / branches

V4.1.0

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

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

Friday 14 Mar
6:15 下午

jason

解决jira问题：QHRSGZZYY-2【小程序】新增小程序平台以及外来申请单厂商下单功能
Options
    • ?
    ./ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
    • ?
    ./ssts-web/src/main/java/com/forgon/disinfectsystem/directory/controller/UserController.java
    • ?
    ./ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
  4. ./ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/qhrsgzzyy
    • ?
    ./ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/vo/WeChatMiniProgForeignTousseApplicationVo.java
    • ?
    ./forgon-core/src/main/java/com/forgon/security/action/UserAction.java
    • ?
    ./ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/vo/WeChatMiniProgForeignTousseMaterialVo.java
    • ?
    ./ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    ./ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/controller/ForeignTousseApplicationWeChatMiniProgramController.java
    • ?
    ./forgon-core/src/main/java/com/forgon/directory/service/SysUserManager.java
  11. ./ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/vo
    • ?
    ./ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/vo/ForeignTousseSaveVo.java
    • ?
    ./ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dto/WeChatMiniProgForeignTousseMaterialDto.java
    • ?
    ./forgon-core/src/main/java/com/forgon/directory/action/UserAction.java
    • ?
    ./ssts-web/src/main/webapp/systemmanage/userExtViewForDisable.js
  16. … 18 more files in changeset.
2:38 下午

zc.li

增加c3p0日志输出到log4j文件 启动时需配置jvm参数 -Dcom.mchange.v2.log.MLog=com.mchange.v2.log.log4j.Log4jMLog；增加获取连接池信息接口 ；修复一些连接可能泄露的地方
Options
    • ?
    ./build.gradle
2:23 下午

shuyongfu

处理:HNSETYY-8 【PDA】新增功能模块【消毒供应室中心物品领用】
Options
    • ?
    ./ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    ./ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/service/ReceiveRecordManagerImpl.java
    • ?
    ./forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
    • ?
    ./ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/action/ReceiveRecordAction.java
    • ?
    ./build.gradle
    • ?
    ./ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/receiverecord/ReceiveRecord.java
    • ?
    ./ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/service/ReceiveRecordManager.java
11:57 上午

jason

解决jira问题： SSTS-740 - 【发货管理】一次性物品的显示模式改进(显示为树状形态)
Options
    • ?
    ./ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/model/DiposableGoodsItemVo.java
    • ?
    ./ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/vo/InvoiceDiposableGoodsItemSummaryVo.java
    • ?
    ./ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • ?
    ./ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • ?
    ./ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/vo/InvoiceDiposableGoodsItemVo.java
    • ?
    ./ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    ./ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/model/DiposableGoodsInvoiceItemVo.java
11:46 上午

jason

解决jira问题： SSTS-740 - 【发货管理】一次性物品的显示模式改进(显示为树状形态)
Options
    • ?
    ./ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • ?
    ./ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    ./ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/model/DiposableGoodsItemVo.java
    • ?
    ./ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • ?
    ./ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/model/DiposableGoodsInvoiceItemVo.java
11:43 上午

zc.li

提交小程序后台基础代码 QHRSGZZYY-2 增加供应商
Options
    • ?
    ./ssts-web/src/main/java/com/forgon/wechat/service/UserInfoOfProjectManagerImpl.java
    • ?
    ./ssts-web/src/main/java/com/forgon/wechat/service/UserInfoManagerImpl.java
    • ?
    ./ssts-web/src/main/java/com/forgon/wechat/dto/SaveUserInfoOfProjectDTO.java
    • ?
    ./ssts-web/src/main/java/com/forgon/wechat/entry/UserInfoOfProject.java
11:36 上午

frank.qiu

解决了 SSTS-740 - 【发货管理】一次性物品的显示模式改进(显示为树状形态)
Options
    • ?
    ./ssts-web/src/main/webapp/ext/fontSize15/styles/common.css
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/interfere/invoice/invoiceView.js
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/signForInvoiceWin.js
    • ?
    ./ssts-web/src/main/webapp/ext/fontSize12/styles/common.css
10:44 上午

zc.li

增加c3p0日志输出到log4j文件 启动时需配置jvm参数 -Dcom.mchange.v2.log.MLog=com.mchange.v2.log.log4j.Log4jMLog；增加获取连接池信息接口 ；修复一些连接可能泄露的地方
Options
    • ?
    ./ssts-web/build.gradle
10:43 上午

frank.qiu

SSTS-740样式改动比较大，先格式化
Options
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/interfere/invoice/invoiceView.js
10:37 上午

frank.qiu

SSTS-740样式改动比较大，先格式化
Options
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/interfere/invoice/invoiceView.js
10:02 上午

jason

解决jira问题：DGSDBZXYY-251【加急告警】enableTousseVoluntarilyUrgent配置项新增加急提醒详细模式
Options
    • ?
    ./ssts-web/src/main/java/com/forgon/disinfectsystem/urgentgoodswarning/service/UrgentGoodsWarningManagerImpl.java
Thursday 13 Mar
6:46 下午

zc.li

增加c3p0日志输出到log4j文件 启动时需配置jvm参数 -Dcom.mchange.v2.log.MLog=com.mchange.v2.log.log4j.Log4jMLog；增加获取连接池信息接口 ；修复一些连接可能泄露的地方
Options
    • ?
    ./ssts-web/src/main/webapp/WEB-INF/spring/applicationContext.xml
6:02 下午

zc.li

增加c3p0日志输出到log4j文件 启动时需配置jvm参数 -Dcom.mchange.v2.log.MLog=com.mchange.v2.log.log4j.Log4jMLog；增加获取连接池信息接口 ；修复一些连接可能泄露的地方
Options
    • ?
    ./ssts-web/src/main/webapp/WEB-INF/spring/applicationContext.xml
5:39 下午

zc.li

增加c3p0日志输出到log4j文件 启动时需配置jvm参数 -Dcom.mchange.v2.log.MLog=com.mchange.v2.log.log4j.Log4jMLog；增加获取连接池信息接口 ；修复一些连接可能泄露的地方
Options
    • ?
    ./build.gradle
5:37 下午

zc.li

增加c3p0日志输出到log4j文件 启动时需配置jvm参数 -Dcom.mchange.v2.log.MLog=com.mchange.v2.log.log4j.Log4jMLog；增加获取连接池信息接口 ；修复一些连接可能泄露的地方
Options
    • ?
    ./forgon-core/src/main/java/com/forgon/oa/initdata/service/InitDataBaseManagerImpl.java
    • ?
    ./ssts-datasync-settlement-gyey-impl/src/main/java/com/forgon/disinfectsystem/settlement/service/SettlementWriteBackManagerImplForGYEY.java
    • ?
    ./forgon-tools/src/main/java/com/forgon/tools/db/DatabaseUtil.java
    • ?
    ./ssts-web/src/main/resources/log4j.properties
    • ?
    ./ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHua_ChangLongDataImpl.java
3:00 下午

jason

解决jira问题：DGSDBZXYY-251【加急告警】enableTousseVoluntarilyUrgent配置项新增加急提醒详细模式
Options
    • ?
    ./ssts-web/src/main/java/com/forgon/disinfectsystem/urgentgoodswarning/service/UrgentGoodsWarningManagerImpl.java
Wednesday 12 Mar
4:55 下午

linnansheng

自动获取当前SVN版本号。
Options
    • ?
    ./build.gradle
3:47 下午

jason

解决jira问题：ZSWY-252 各环节加急物品的数量汇总视图改进
Options
    • ?
    ./ssts-web/src/main/webapp/dataUpdater/sqls/5.0.36_5.0.37.sql
    • ?
    ./forgon-tools/src/main/java/com/forgon/Constants.java
    • ?
    ./ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
    • ?
    ./ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
    • ?
    ./ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
10:11 上午

zc.li

异常代码删除
Options
    • ?
    ./forgon-core/src/main/java/com/forgon/util/ExtGridUtils.java
Tuesday 11 Mar
4:34 下午

jason

解决jira问题：ZSWY-253 器械包定义推送接口的IP地址变更；

ZSWY-254【物品签收】向智慧手术系统推送签收的手术器械包的器械包信息接口的IP地址变更

Options
    • ?
    ./ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/zdwy/DatasyncConstant.java
4:18 下午

zc.li

解决 FSSDERMYY-36 【外部代理灭菌】新增待发货的外部代理灭菌单可追加物品
Options
    • ?
    ./ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
3:18 下午

zc.li

提交小程序后台基础代码 QHRSGZZYY-2 【小程序】新增小程序平台以及外来申请单厂商下单功能
Options
    • ?
    ./ssts-web/src/main/java/com/forgon/wechat/service/WeChatManagerImpl.java
3:13 下午

frank.qiu

解决了 SZSSKRMYY-69 - 聚合包退货后，退货的科室明细核算月报中依然有该聚合包相关费用。
Options
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.js
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
2:38 下午

zc.li

SZSSKRMYY-69 聚合包退货后，退货的科室明细核算月报中依然有该聚合包相关费用。
Options
    • ?
    ./ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • ?
    ./ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
2:28 下午

zc.li

提交小程序后台基础代码 QHRSGZZYY-2 【小程序】新增小程序平台以及外来申请单厂商下单功能
Options
    • ?
    ./ssts-web/src/main/java/com/forgon/wechat/service/WeChatManagerImpl.java
2:01 下午

zc.li

提交小程序后台基础代码 QHRSGZZYY-2 【小程序】新增小程序平台以及外来申请单厂商下单功能
Options
    • ?
    ./ssts-web/src/main/java/com/forgon/wechat/service/UserInfoManagerImpl.java
1:52 下午

zc.li

提交小程序后台基础代码 QHRSGZZYY-2 【小程序】新增小程序平台以及外来申请单厂商下单功能
Options
    • ?
    ./ssts-web/src/main/java/com/forgon/wechat/service/WeChatManager.java
    • ?
    ./ssts-web/src/main/java/com/forgon/wechat/service/WeChatManagerImpl.java
11:46 上午

frank.qiu

解决了 GYSDERMYY-32 - 【科室申领】新增批量打印申请单功能
Options
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/config/gysdermyy/config.js
Monday 10 Mar
6:05 下午

zc.li

提交小程序后台基础代码 QHRSGZZYY-2 【小程序】新增小程序平台以及外来申请单厂商下单功能
Options
    • ?
    ./ssts-web/src/main/java/com/forgon/wechat/service/UserInfoManagerImpl.java
    • ?
    ./ssts-web/src/main/java/com/forgon/wechat/service/WeChatManagerImpl.java
5:27 下午

zc.li

解决 SSTS-737 不需要回收且需要审核的的消毒物品，在装配，审核后，包实例所属仓库字段为空，导致不能正常发货
Options
    • ?
    ./ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java