Activity forgon-ssts-v4.1/SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods

6:29 下午

yanweining

More
25105
changed 12 files
V4.1.0

广州中医药大学第一附属医院:GZZYYFY-15

1.一次性物品定义：添加字段：

1)是否使用固定条码（默认为否）

2)固定条码（保存时生成）

2.一次性物品固定条码打印功能

3.BarcodeManager:新增方法：

1）生成前缀条码

2）根据前缀条码获得对应的po对象

./src/main/java/com/forgon/disinfectsystem/diposablegoods/controller
- History
- Source
./src/main/java/.../diposablegoods/controller
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsAction.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/controller/DisposableGoodsController.java
- History
- Source
./src/main/.../DisposableGoodsController.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsManagerImpl.java
… 8 more files in changeset.

5:23 下午

jeffli

More
25091
changed 14 files
V4.1.0

优化一次性物品库存修改

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/IdentificationOfDiposableGoodsManager.java
- History
- Source
- Diff
./src/.../IdentificationOfDiposableGoodsManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/IdentificationOfDiposableGoodsManagerImpl.java
- History
- Source
- Diff
./src/.../IdentificationOfDiposableGoodsManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
- History
- Source
- Diff
./src/main/.../GodownEntryManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsManager.java
… 9 more files in changeset.

1:49 下午

yanweining

More
25072
changed 6 files
V4.1.0

GDSRMYY-457：一次性入库单管理核对人填写显示优化

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
- History
- Source
- Diff
./src/main/.../GodownEntryManagerImpl.java
… 5 more files in changeset.

10:48 上午

shuyongfu

More
24484
changed 12 files
V4.1.0

解决jira问题:GGSRMYY-59 一次性物品停用功能

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsTableManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsAction.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsManagerImpl.java
… 8 more files in changeset.

10:49 上午

yanweining

More
24207
changed 19 files
V4.1.0

复大肿瘤：

合同管理：

1、其他合同录入时，物品类型可以手动填

2、增加字段：单位

3、合同编号自由填

4、导出合同excel按钮

供应商：

1、导出供应商excel按钮

2、供应商授权支持多级授权

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/ContractManager.java
- History
- Source
- Diff
./src/main/.../service/ContractManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsTableManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/action/ContractAction.java
- History
- Source
- Diff
./src/main/java/.../action/ContractAction.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/ContractManagerImpl.java
- History
- Source
- Diff
./src/main/.../ContractManagerImpl.java
… 15 more files in changeset.

2:46 下午

jeffli

More
23833
changed 9 files
V4.1.0

objectDao改造，同时支持悲观锁和乐观锁

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsManagerImpl.java
… 8 more files in changeset.

7:25 下午

yanweining

More
23831
changed 1 file
V4.1.0

复大肿瘤：合同页面修改

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/ContractManagerImpl.java
- History
- Source
- Diff
./src/main/.../ContractManagerImpl.java

2:23 下午

jeffli

More
23824
changed 16 files
V4.1.0

sql工具类优化，in集合条件换成大集合的方法

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
- History
- Source
- Diff
./src/main/.../GodownEntryManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsTableManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManagerImpl.java
- History
- Source
- Diff
./src/.../DiposableGoodBatchStockManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsAction.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManagerImpl.java
- History
- Source
- Diff
./src/.../GoodPurchasePlanManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
- History
- Source
- Diff
./src/main/.../GodownEntryTableManager.java
… 9 more files in changeset.

10:18 上午

yanweining

More
23818
changed 6 files
V4.1.0

KPSZXYY-30:开平中心医院一次性物品退库问题

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsAction.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsManager.java
… 3 more files in changeset.

7:00 下午

yanweining

More
23809
changed 3 files
V4.1.0

复大肿瘤：单一证件不能上传

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/ContractManagerImpl.java
- History
- Source
- Diff
./src/main/.../ContractManagerImpl.java
… 2 more files in changeset.

8:06 下午

niutou_ren

More
23696
changed 18 files
V4.1.0

复大肿瘤2期现场演示后问题修复与改进：

1、3个问题的修复（供应商添加注册证时，一次性物品没有显示规格；供应商手工添加的需要授权的一次性物品的注册证在保存时没有删除掉；有授权记录的一次性物品的注册证不允许删除）；

2、证件的图片，增加了查看原图的功能；

3、添加了权限--供应商证件告警权限

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsTableManager.java
… 17 more files in changeset.

2:40 下午

yanweining

More
23681
changed 5 files
V4.1.0

复大肿瘤:采购计划联动修改

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManagerImpl.java
- History
- Source
- Diff
./src/.../GoodPurchasePlanManagerImpl.java
… 4 more files in changeset.

11:17 上午

yanweining

More
23679
changed 19 files
V4.1.0

复大肿瘤:合同管理

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/ContractManagerImpl.java
- History
- Source
- Diff
./src/main/.../ContractManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/ContractTableManager.java
- History
- Source
- Diff
./src/main/.../table/ContractTableManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/ContractManager.java
- History
- Source
- Diff
./src/main/.../service/ContractManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/action/ContractAction.java
- History
- Source
- Diff
./src/main/java/.../action/ContractAction.java
… 15 more files in changeset.

11:59 上午

adairkang

More
23648
changed 17 files
V4.1.0

DGZYY-135 DGZYY-129 外来器械回收篮筐的使用及算来器械二次回收

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
- History
- Source
- Diff
./src/main/.../GodownEntryManagerImpl.java
… 16 more files in changeset.

9:21 上午

jeffli

More
23646
changed 3 files
V4.1.0

优化发货速度，改为不刷新的锁定

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsManagerImpl.java
… 2 more files in changeset.

4:25 下午

yanweining

More
23639
changed 6 files
V4.1.0

GDSRMYY-442:一次性入库单返签

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
- History
- Source
- Diff
./src/main/.../GodownEntryManagerImpl.java
… 5 more files in changeset.

4:39 下午

yanweining

More
23608
changed 22 files
V4.1.0

新增合同管理,新增设备参数

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/ContractManager.java
- History
- Source
./src/main/java/.../service/ContractManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/ContractTableManager.java
- History
- Source
./src/main/java/.../table/ContractTableManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/ContractManagerImpl.java
- History
- Source
./src/main/.../service/ContractManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/action/ContractAction.java
- History
- Source
./src/main/java/.../action/ContractAction.java
… 18 more files in changeset.

3:55 下午

shuyongfu

More
23606
changed 12 files
V4.1.0

1.中山眼科中心hrp接口

2.GDSRMYY-439 库存对比改进

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsTableManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DisposableGoodsStockAction.java
- History
- Source
- Diff
./src/main/.../DisposableGoodsStockAction.java
… 10 more files in changeset.

2:53 下午

shuyongfu

More
23604
changed 1 file
V4.1.0

查询一次性物品库存按仓库进行查询

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
- History
- Source
- Diff
./src/main/.../GodownEntryManagerImpl.java

2:51 下午

shuyongfu

More
23603
changed 1 file
V4.1.0

解决一次性物品数量较多(超过1000)时,oracle报错的问题

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java
- History
- Source
- Diff
./src/.../DisposableGoodsStockManagerImpl.java

2:32 下午

yanweining

More
23512
changed 11 files
V4.1.0

广州复大肿瘤:一次性物品入库,采购计划添加一次性物品时:校验物品的供应商，生产厂家的相关证件是否有效

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManagerImpl.java
- History
- Source
- Diff
./src/.../GoodPurchasePlanManagerImpl.java
… 10 more files in changeset.

8:51 下午

yanweining

More
23500
changed 2 files
V4.1.0

SSTS-127：一次性物品批次号更改问题

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
- History
- Source
- Diff
./src/main/.../action/GodownEntryAction.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
- History
- Source
- Diff
./src/main/.../GodownEntryManagerImpl.java

10:02 下午

niutou_ren

More
23486
changed 38 files
V4.1.0

供应商证件的管理(复大肿瘤二期)

1、供应商页面，增加对证件的管理；

2、增加供应商与证件的导入，以及证件图片的导入（基础数据导入导出）

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsTableManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsAction.java
… 36 more files in changeset.

2:19 下午

jeffli

More
23218
changed 4 files
V4.1.0

二级供应室一次性物申请单发货改进

广东省人民医院GDSRMYY-434

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsManagerImpl.java
… 2 more files in changeset.

5:03 下午

yanweining

More
23147
changed 5 files
V4.1.0

GZFDZL-123:一次性物品入库单的入库明细增加标签合格和验收合格选择

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
- History
- Source
- Diff
./src/main/.../GodownEntryItemManagerImpl.java
… 4 more files in changeset.

9:59 上午

yanweining

More
23133
changed 8 files
V4.1.0

广州复大肿瘤：一次性物品采购计划单联动一次性物品入库单变色

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManagerImpl.java
- History
- Source
- Diff
./src/.../GoodPurchasePlanManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
- History
- Source
- Diff
./src/main/.../GodownEntryManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GoodPurchaseTableManager.java
- History
- Source
- Diff
./src/main/.../GoodPurchaseTableManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GoodPurchaseAction.java
- History
- Source
- Diff
./src/main/.../action/GoodPurchaseAction.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManager.java
- History
- Source
- Diff
./src/main/.../GoodPurchasePlanManager.java
… 3 more files in changeset.

9:57 上午

yanweining

More
23132
changed 5 files
V4.1.0

一次性物品入库:新增供应商id和生产厂家id

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsTableManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
- History
- Source
- Diff
./src/main/.../GodownEntryTableManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
- History
- Source
- Diff
./src/main/.../GodownEntryItemManagerImpl.java
… 2 more files in changeset.

2:34 下午

shuyongfu

More
23021
changed 1 file
V4.1.0

解决Jira问题:GZS12RMYY-9 一次性预减功能改进

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsManagerImpl.java

1:07 下午

shuyongfu

More
23019
changed 1 file
V4.1.0

解决Jira问题:GZS12RMYY-9 一次性预减功能改进

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsManagerImpl.java

1:04 下午

shuyongfu

More
23018
changed 1 file
V4.1.0

解决Jira问题:GZS12RMYY-9 一次性预减功能改进

- ?
./src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./src/main/.../DiposableGoodsManagerImpl.java

ssts-diposablegoods

Line History

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

yanweining

jeffli

yanweining

shuyongfu

yanweining

jeffli

yanweining

jeffli

yanweining

yanweining

niutou_ren

yanweining

yanweining

adairkang

jeffli

yanweining

yanweining

shuyongfu

shuyongfu

shuyongfu

yanweining

yanweining

niutou_ren

jeffli

yanweining

yanweining

yanweining

shuyongfu

shuyongfu

shuyongfu