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
Monday 18 Apr 2016
8:38 下午

jeffli

解决bug：

明细核算月报输入物品名称查询会报错。

Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
8:22 下午

wangyi

物资收发明细报表优化
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
6:28 下午

adairkang

发货单打印，名称居中
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js
6:16 下午

wangyi

no_comment
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/WEB-INF/dwr.xml
6:16 下午

adairkang

南院供应室看从北院供应室出库的调拨单时，出库仓库显示id的问题
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js
6:14 下午

jeffli

解决bug：

包定义里面的一次性物品材料关联了物品库存对象，应该关联物品定义

Options
    • -2
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialinstance/service/MaterialInstanceManagerImpl.java
    • -5
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
6:03 下午

jeffli

优化功能：

正在保存包定义时，禁用保存按钮。

Options
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
6:02 下午

wangyi

盘点结算bug修复
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/stocktakereport.jasper
    • -3
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js
    • -17
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/jasperRtp/stocktakereport.jrxml
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:47 下午

adairkang

添加发货计划后界面没刷新的问题
Options
    • -2
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.js
5:37 下午

shuyongfu

删除成功后增加提示消息
Options
    • -0
    • +1
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/MaterialInvoiceAction.java
5:28 下午

jeffli

解决bug：

核算月报和明细核算月报选择一次性物品类别后，导致材料价格对不上。

Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:22 下午

adairkang

材料发货单打印表格调整
Options
    • -7
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js
5:12 下午

adairkang

材料发货单的打印
Options
    • -0
    • +28
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js
    • -0
    • +115
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/MaterialInvoiceManagerImpl.java
    • -0
    • +13
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/MaterialInvoiceManager.java
    • -2
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js
    • -1
    • +37
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -0
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.jsp
    • -1
    • +39
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js
5:02 下午

wangyi

盘点结算功能合并
Options
    • -0
    • +44
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/dwr/table/MaterialCheckTableManager.java
    • -0
    • +67
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryrecordView.jsp
    • -6
    • +0
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialCheckManageImpl.java
  4. /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service
    • -0
    • +22
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialCheckManager.java
    • -0
    • +464
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
    • -0
    • +26
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManager.java
    • -15
    • +0
    /ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/dwr/table/StockTakeRecordTableManager.java
    • -0
    • +35
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/stocktakeView.jsp
    • -63
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakemanager/StockTakeItem.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.jsp
  12. /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/dwr
    • -10
    • +20
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/StockTakeRecord.java
    • -3
    • +4
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • -0
    • +399
    /ssts-web/src/main/webapp/jasperRtp/stocktakereport.jrxml
  16. … 46 more files in changeset.
5:00 下午

shuyongfu

供应室领用功能调整
Options
    • -3
    • +5
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/MaterialInvoiceManagerImpl.java
    • -19
    • +10
    /ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/service/ReceiveRecordManagerImpl.java
    • -1
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
5:00 下午

jeffli

优化功能：

调拨和盘点，调用独立的入库方法，避免修改其他属性

Options
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakemanager/service/StockTakeInfoManagerImpl.java
    • -0
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java
4:54 下午

jeffli

优化功能：

修改核算月报和明细核算月报上限制一次性物品类别下拉框的文字提示，由类别改为一次性物品类别。

Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js
4:12 下午

jeffli

解决bug：

明细核算月报，材料发货和退货没有做仓库限制。

Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:55 下午

shuyongfu

材料入库、出库及供应室领用页面暂时禁掉修改功能
Options
    • -10
    • +78
    /ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialOutView.js
    • -3
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.js
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js
3:40 下午

jeffli

优化功能：

包定义的每次扫描数量设置为0，添加灭菌记录界面扫描固定条码时不做数量限制，返回所有当天待灭菌的包。

Options
    • -2
    • +6
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
3:26 下午

shuyongfu

解决供应室领用保存后在IE8下卡住不动的问题
Options
    • -9
    • +1
    /ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/action/ReceiveRecordAction.java
3:02 下午

shuyongfu

入库单管理-南/北院供应室数据区分
Options
    • -0
    • +13
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/dwr/table/MaterialEntryTableManager.java
2:50 下午

shuyongfu

材料发货页面在数量后增加回车事件
Options
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js
2:27 下午

shuyongfu

材料发货及入库功能完善
Options
    • -2
    • +7
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/MaterialInvoiceManagerImpl.java
1:25 下午

shuyongfu

供应室领用、材料发货及扣减库存调整,材料定义界面可看到材料库存
Options
    • -1
    • +6
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
    • -2
    • +2
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/MaterialInvoiceAction.java
    • -0
    • +31
    /ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
    • -2
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js
    • -5
    • +5
    /ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/action/ReceiveRecordAction.java
12:37 下午

shuyongfu

供应室领用及扣减库存调整
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
    • -1
    • +1
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/MaterialInvoiceManagerImpl.java
    • -4
    • +0
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/MaterialInvoiceManager.java
12:36 下午

jeffli

改进功能：

自定义装配时，后台增加限制，不允许装配消毒物品。

Options
    • -143
    • +148
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
12:18 下午

jeffli

解决bug：

核算明细月报后台报错。

Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
12:14 下午

adairkang

退货统计报表时间选择，加上当前的时间
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:49 上午

jeffli

入库单po增加辅助方法
Options
    • -0
    • +49
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java