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
Wednesday 30 Mar 2016
5:40 下午

wangyi

一次性物品检索根据所属仓库显示库存
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js
    • -25
    • +59
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -2
    • +15
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -4
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -2
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • -2
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -5
    • +5
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -28
    • +12
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
5:38 下午

jeffli

解决bug：

扫描一次性物品批次条码无法退货

Options
    • -2
    • +0
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
5:38 下午

shuyongfu

resultset结果集转list对象
Options
    • -0
    • +48
    /forgon-tools/src/main/java/com/forgon/tools/db/resultset/ResultSetUtil.java
  2. /forgon-tools/src/main/java/com/forgon/tools/db/resultset
5:28 下午

jeffli

退货代码调整
Options
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
5:26 下午

adairkang

发货单记录当前用户所在科室编码
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
5:03 下午

jeffli

优化：

调整退货界面的总金额宽度，和其他域对齐

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
4:17 下午

jeffli

调整发货仓库id参数的位置
Options
    • -1
    • +2
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -0
    • +7
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -0
    • +1
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
4:02 下午

shuyongfu

添加回收申请单,默认其处理科室为当前用户的当前科室,保存后可在历史回收单看得到
Options
    • -0
    • +6
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
3:45 下午

jeffli

解决bug：

二级供应室的用户无法选择其他科室

Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
3:33 下午

shuyongfu

借物单管理处理科室、供应室配置服务科室的下拉框可输入字符模糊查询
Options
    • -6
    • +59
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/stockTakeInfoView.js
    • -2
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsForm.js
    • -0
    • +31
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/action/CssdServiceDeptsAction.java
3:27 下午

jeffli

发货的仓库变量改名

解决bug：

退货界面无法选择其他供应室仓库

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
    • -1
    • +1
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • -9
    • +17
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/WareHouseAction.java
    • -6
    • +6
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -3
    • +3
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsRecord.java
2:20 下午

adairkang

修改调拨界面上移的问题
Options
    • -153
    • +153
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js
2:13 下午

terrykwan

解决在IE8下中文提示信息乱码的问题
Options
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/cssdhandletousses/action/CssdHandleToussesAction.java
    • -3
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/action/CssdServiceDeptsAction.java
1:44 下午

adairkang

发货单添加发货仓库信息，warehouseId和warehouseName为当前所属仓库信息
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -0
    • +24
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
11:56 上午

adairkang

器械包发货，设置仓库为结算科室的默认仓库
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
11:51 上午

jeffli

解决bug：

申请自定义器械包，选择1个已有的包，提交报错

Options
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
11:23 上午

terrykwan

解决windows8.1下扫描条码登陆需要扫描2次的问题
Options
    • -12
    • +24
    /ssts-web/src/main/webapp/logon.jsp
10:43 上午

jeffli

解决bug：

退货界面，已签收的器械包无法扫描

Options
    • -4
    • +2
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
10:35 上午

adairkang

发货单列表显示仓库属性

发货界面默认选中每一个仓库

Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • -8
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
10:06 上午

adairkang

调拨目标仓库可以选择多个供应室的

根据一次性物品定义的id获取批次属性

Options
    • -9
    • +59
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
    • -0
    • +26
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
    • -11
    • +44
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
    • -27
    • +15
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/WareHouseAction.java
    • -0
    • +8
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsBatchManager.java
    • -25
    • +87
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js
    • -0
    • +5
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -0
    • +17
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsBatchManagerImpl.java
    • -0
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
    • -0
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
10:02 上午

jeffli

代码重构
Options
    • -50
    • +125
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
Tuesday 29 Mar 2016
11:06 下午

shuyongfu

1.仓库删除增加校验,如果其它实体表有关联到该仓库的数据则禁止删除

2.科室申领的物品类型如果为整包申领,则需要显示处理材料及物品数量显示

3.回收列表按处理科室(当前登录用忘掉所在科室)进行过滤。

Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseView.js
    • -0
    • +7
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/WareHouseAction.java
    • -1
    • +4
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -3
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseForm.js
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehouse/WareHouse.java
    • -1
    • +120
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
    • -3
    • +3
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
10:01 下午

jeffli

解决bug：

退货记录打开时，仓库未显示

Options
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
9:25 下午

adairkang

入库时批次重复的问题
Options
    • -0
    • +15
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsBatchManager.java
    • -0
    • +17
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -0
    • +42
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -0
    • +33
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsBatchManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
9:08 下午

jeffli

代码重构
Options
    • -198
    • +144
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
8:32 下午

wangyi

修复多仓库下显示材料库存bug
Options
    • -8
    • +10
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
8:25 下午

wangyi

材料入库修改
Options
    • -11
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.js
    • -3
    • +12
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java
8:24 下午

shuyongfu

科室申领处理科室过滤物品js代码调整
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
8:21 下午

jeffli

解决bug：

一次性物品入库单点保存并打印报错

Options
    • -1
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
7:41 下午

wangyi

消毒物品入库
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -11
    • +10
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/UnPackingDisinfectGoodsInstanceTests.java
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js