forgon-ssts-v4.1.0 / ssts-diposablegoods / src

main

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 1
Total Committers: 14
Last Commit: 14 Feb 16
Commits this week: 1
Total Lines of Code (LoC): 101,293
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
Thursday 06 Dec 2018
6:29 下午

yanweining

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

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

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

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

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

3.BarcodeManager:新增方法：

1）生成前缀条码

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

Options
    • -0
    • +66
    ./java/com/forgon/disinfectsystem/diposablegoods/controller/DisposableGoodsController.java
  2. ./java/com/forgon/disinfectsystem/diposablegoods/controller
    • -13
    • +15
    ./java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • too large
    ./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
  5. … 7 more files in changeset.
Wednesday 05 Dec 2018
5:23 下午

jeffli

优化一次性物品库存修改
Options
    • too large
    ./java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • too large
    ./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -0
    • +2
    ./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • -1
    • +30
    ./java/com/forgon/disinfectsystem/diposablegoods/service/IdentificationOfDiposableGoodsManagerImpl.java
    • -0
    • +1
    ./java/com/forgon/disinfectsystem/diposablegoods/service/IdentificationOfDiposableGoodsManager.java
  6. … 9 more files in changeset.
Tuesday 04 Dec 2018
1:49 下午

yanweining

GDSRMYY-457：一次性入库单管理核对人填写显示优化
Options
    • too large
    ./java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
  2. … 5 more files in changeset.
Monday 08 Oct 2018
10:48 上午

shuyongfu

解决jira问题:GGSRMYY-59 一次性物品停用功能
Options
    • -0
    • +21
    ./java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -0
    • +7
    ./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • too large
    ./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -0
    • +7
    ./java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
  5. … 8 more files in changeset.
Wednesday 05 Sep 2018
10:49 上午

yanweining

复大肿瘤：

合同管理：

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

2、增加字段：单位

3、合同编号自由填

4、导出合同excel按钮

供应商：

1、导出供应商excel按钮

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

Options
    • -25
    • +2
    ./java/com/forgon/disinfectsystem/diposablegoods/action/ContractAction.java
    • -1
    • +1
    ./java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
    • -31
    • +148
    ./java/com/forgon/disinfectsystem/diposablegoods/service/ContractManagerImpl.java
    • -4
    • +6
    ./java/com/forgon/disinfectsystem/diposablegoods/service/ContractManager.java
  5. … 15 more files in changeset.
Thursday 26 Jul 2018
2:46 下午

jeffli

objectDao改造，同时支持悲观锁和乐观锁
Options
    • too large
    ./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
  2. … 8 more files in changeset.
Wednesday 25 Jul 2018
7:25 下午

yanweining

复大肿瘤：合同页面修改
Options
    • -1
    • +1
    ./java/com/forgon/disinfectsystem/diposablegoods/service/ContractManagerImpl.java
2:23 下午

jeffli

sql工具类优化，in集合条件换成大集合的方法
Options
    • -1
    • +1
    ./java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
    • -2
    • +2
    ./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManagerImpl.java
    • -1
    • +1
    ./java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManagerImpl.java
    • too large
    ./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • too large
    ./java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -1
    • +1
    ./java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -12
    • +12
    ./java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
  8. … 9 more files in changeset.
10:18 上午

yanweining

KPSZXYY-30:开平中心医院一次性物品退库问题
Options
    • -0
    • +24
    ./java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • too large
    ./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -0
    • +8
    ./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
  4. … 3 more files in changeset.
Tuesday 24 Jul 2018
7:00 下午

yanweining

复大肿瘤：单一证件不能上传
Options
    • -1
    • +5
    ./java/com/forgon/disinfectsystem/diposablegoods/service/ContractManagerImpl.java
  2. … 2 more files in changeset.
Thursday 05 Jul 2018
8:06 下午

niutou_ren

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

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

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

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

Options
    • -1
    • +1
    ./java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
  2. … 17 more files in changeset.
Tuesday 03 Jul 2018
2:40 下午

yanweining

复大肿瘤:采购计划联动修改
Options
    • -6
    • +6
    ./java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManagerImpl.java
  2. … 4 more files in changeset.
11:17 上午

yanweining

复大肿瘤:合同管理
Options
    • -7
    • +23
    ./java/com/forgon/disinfectsystem/diposablegoods/dwr/table/ContractTableManager.java
    • -14
    • +25
    ./java/com/forgon/disinfectsystem/diposablegoods/action/ContractAction.java
    • -193
    • +130
    ./java/com/forgon/disinfectsystem/diposablegoods/service/ContractManagerImpl.java
    • -11
    • +18
    ./java/com/forgon/disinfectsystem/diposablegoods/service/ContractManager.java
  5. … 15 more files in changeset.
Monday 25 Jun 2018
11:59 上午

adairkang

DGZYY-135 DGZYY-129 外来器械回收篮筐的使用及算来器械二次回收
Options
    • too large
    ./java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
  2. … 16 more files in changeset.
9:21 上午

jeffli

优化发货速度，改为不刷新的锁定
Options
    • too large
    ./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
  2. … 2 more files in changeset.
Friday 22 Jun 2018
4:25 下午

yanweining

GDSRMYY-442:一次性入库单返签
Options
    • too large
    ./java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
  2. … 5 more files in changeset.
Wednesday 20 Jun 2018
4:39 下午

yanweining

新增合同管理,新增设备参数
Options
    • -0
    • +254
    ./java/com/forgon/disinfectsystem/diposablegoods/action/ContractAction.java
    • -0
    • +698
    ./java/com/forgon/disinfectsystem/diposablegoods/service/ContractManagerImpl.java
    • -0
    • +64
    ./java/com/forgon/disinfectsystem/diposablegoods/service/ContractManager.java
    • -0
    • +94
    ./java/com/forgon/disinfectsystem/diposablegoods/dwr/table/ContractTableManager.java
  5. … 18 more files in changeset.
3:55 下午

shuyongfu

1.中山眼科中心hrp接口

2.GDSRMYY-439 库存对比改进

Options
    • -3
    • +7
    ./java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
    • -3
    • +6
    ./java/com/forgon/disinfectsystem/diposablegoods/action/DisposableGoodsStockAction.java
  3. … 10 more files in changeset.
2:53 下午

shuyongfu

查询一次性物品库存按仓库进行查询
Options
    • too large
    ./java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
2:51 下午

shuyongfu

解决一次性物品数量较多(超过1000)时,oracle报错的问题
Options
    • -1
    • +2
    ./java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java
Wednesday 06 Jun 2018
2:32 下午

yanweining

广州复大肿瘤:一次性物品入库,采购计划添加一次性物品时:校验物品的供应商，生产厂家的相关证件是否有效
Options
    • -3
    • +3
    ./java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManagerImpl.java
  2. … 10 more files in changeset.
Tuesday 05 Jun 2018
8:51 下午

yanweining

SSTS-127：一次性物品批次号更改问题
Options
    • -2
    • +7
    ./java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
    • too large
    ./java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
Monday 04 Jun 2018
10:02 下午

niutou_ren

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

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

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

Options
    • -1
    • +76
    ./java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
    • -1
    • +36
    ./java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
  3. … 36 more files in changeset.
Tuesday 08 May 2018
2:19 下午

jeffli

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

广东省人民医院GDSRMYY-434

Options
    • -0
    • +3
    ./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • too large
    ./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
  3. … 2 more files in changeset.
Thursday 03 May 2018
5:03 下午

yanweining

GZFDZL-123:一次性物品入库单的入库明细增加标签合格和验收合格选择
Options
    • -0
    • +4
    ./java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
  2. … 4 more files in changeset.
Wednesday 02 May 2018
9:59 上午

yanweining

广州复大肿瘤：一次性物品采购计划单联动一次性物品入库单变色
Options
    • -0
    • +21
    ./java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GoodPurchaseTableManager.java
    • -16
    • +219
    ./java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManagerImpl.java
    • -0
    • +7
    ./java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManager.java
    • too large
    ./java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -0
    • +11
    ./java/com/forgon/disinfectsystem/diposablegoods/action/GoodPurchaseAction.java
  6. … 3 more files in changeset.
9:57 上午

yanweining

一次性物品入库:新增供应商id和生产厂家id
Options
    • -0
    • +7
    ./java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
    • -1
    • +7
    ./java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
    • -0
    • +10
    ./java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
  4. … 2 more files in changeset.
Thursday 19 Apr 2018
2:34 下午

shuyongfu

解决Jira问题:GZS12RMYY-9 一次性预减功能改进
Options
    • too large
    ./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
1:07 下午

shuyongfu

解决Jira问题:GZS12RMYY-9 一次性预减功能改进
Options
    • too large
    ./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
1:04 下午

shuyongfu

解决Jira问题:GZS12RMYY-9 一次性预减功能改进
Options
    • too large
    ./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java