forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

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

Monday 20 Feb 2017
6:25 下午

jeffli

解决bug：

自定义发货，发货项的价格和折扣价为0

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
5:02 下午

wangyi

完成：DGZYY-82，东莞中医院定时清理2天前的未回收外来器械申请单
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/dgszyy/timer.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/RecyclingErrorAndDamageUtil.java
3:00 下午

zengjc

修复jira问题：DGZYY-72，器械包信息关联质量监测记录项为无，又扫了器械包条码，器械包信息显示不了的问题.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
12:49 下午

shuyongfu

DYSYY-6 供应室的基数包，不管回收来自哪个科室，都打印科室为供应室。

DYSYY-10 器械包定义增加【是否发货】字段

器械包定义调整:

1.打印科室来源默认值由"否"改为"无"

2.类型为消毒物品、外部代理灭菌的包修改时,是否发货属性禁用,默认值设为"是"

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
11:55 上午

shuyongfu

创建消毒物品包定义,增加对资产归属字段的赋值
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
11:31 上午

wangyi

修复外来器械拆包的时候JSON转换报死循环错误问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
11:27 上午

shuyongfu

删除重复的资源文件
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/prepare
1:04 上午

shuyongfu

修改科室申领及借物的测试用例运行不通过的json数据
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/prepare/testForInvoicePlanStatus.json
12:03 上午

shuyongfu

修改科室申领及借物的测试用例运行不通过的json数据
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/prepare/testForInvoicePlanStatus.json
Sunday 19 Feb 2017
8:53 下午

jeffli

调整申请单测试数据，解决发货状态无法通过
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/prepare/testForInvoicePlanStatus.json
Saturday 18 Feb 2017
10:38 下午

adairkang

加急数量判空
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
10:35 下午

jeffli

申请项加急数量默认值改为0
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
7:15 下午

terrykwan

增加jdbc.url的传入参数
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
6:30 下午

wangyi

解决：ZSSZYY-52，一次性物品、材料支持添加库存为0的物品做盘点
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialOutView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryrecordView.js
6:17 下午

adairkang

材料库库对同一个供应商不同价格的同一个物品，扣减库存的bug修复及测试用例
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/material/service/MaterialEntryManagerTests.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/material/model/GoodsStockInfo.java
5:07 下午

shuyongfu

使用记录测试用例的取config.js文件的applicationFormType配置项的方法调错,现改正
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java
5:02 下午

jeffli

解决 DYSYY-15

解决 DYSYY-10

解决 DYSYY-6

折扣价处理，装配打印科室，是否发货

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
3:46 下午

terrykwan

关闭hibernate的sql日志输出，增加gradle编译输出信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
2:56 下午

terrykwan

运行测试用例时，SQL Server数据库的名字为unittest前缀加上项目名字，避免多个不同项目的测试用例同时运行时数据干扰
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
2:16 下午

terrykwan

apache beanutils升级至1.9.3，解决编译时出现警告提示的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
12:13 下午

terrykwan

将jdbc.username也进行编码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
Friday 17 Feb 2017
11:47 下午

terrykwan

解决当class文件位于jar包，路径查找错误的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/util/PathUtils.java
9:08 下午

terrykwan

改进webapp root路径的获取方式，当取不到servlet容器时，改用相对文件位置的方式获取
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/util/PathUtils.java
9:07 下午

terrykwan

改进为gradle编译脚本读取命令行参数，根据参数值来决定发布包的项目名称和数据库连接
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
7:56 下午

terrykwan

去掉多余的代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/build.gradle
7:19 下午

jeffli

解决 DYSYY-15

解决 DYSYY-10

解决 DYSYY-6

折扣价处理，装配打印科室，是否发货

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
7:16 下午

jeffli

解决 DYSYY-15

解决 DYSYY-10

解决 DYSYY-6

折扣价处理，装配打印科室，是否发货

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.6.3_4.6.4.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
7:15 下午

jeffli

解决 DYSYY-15

解决 DYSYY-10

解决 DYSYY-6

折扣价处理，装配打印科室，是否发货

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManagerImpl.java
7:13 下午

jeffli

解决 DYSYY-15

解决 DYSYY-10

解决 DYSYY-6

折扣价处理，装配打印科室，是否发货

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
  4. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/tousseitem
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
  7. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/tousseitem/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
7:10 下午

jeffli

解决 DYSYY-15

解决 DYSYY-10

解决 DYSYY-6

折扣价处理，装配打印科室，是否发货

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java