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 16 Mar 2016
12:29 上午

terrykwan

提交core模块从4.0同步的代码
Options
    • -23
    • +16
    /forgon-core/src/main/java/com/forgon/log/service/LogManagerImpl.java
    • -0
    • +2
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • -1
    • +5
    /forgon-core/src/main/java/com/forgon/dataupdater/service/UpdateDataBetween2VersionByExecSqls.java
    • -0
    • +7
    /forgon-core/src/main/java/com/forgon/log/model/Log.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -2
    • +10
    /forgon-core/src/main/java/com/forgon/directory/acegi/tools/AcegiHelper.java
    • -86
    • +0
    /forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java
    • -0
    • +3
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -4
    • +4
    /forgon-core/src/main/java/com/forgon/log/service/LogManager.java
    • -0
    • +12
    /forgon-core/src/main/java/com/forgon/directory/vo/LoginUserData.java
Tuesday 15 Mar 2016
8:52 下午

terrykwan

修改为通过jsonlib的api进行JSON转换，解决某些情况下转换的json字符串的兼容性问题
Options
    • -4
    • +14
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
8:50 下午

terrykwan

重命名变量
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
8:50 下午

terrykwan

删除去下划线的代码
Options
    • -8
    • +0
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
8:49 下午

terrykwan

修改为Hibernate4的方式
Options
    • -16
    • +29
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
Monday 14 Mar 2016
11:51 上午

shuyongfu

4.0合并至4.1
Options
    • -0
    • +5
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.0.44_4.0.45_oracle.sql
11:00 上午

adairkang

wince自动升级获取客户端程序版本的内容跟android使用同样的处理

同步采购计划的代码

Options
    • -0
    • +553
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GoodPurchaseAction.java
    • -11
    • +48
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
    • -0
    • +182
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GoodPurchaseItem.java
    • -0
    • +357
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManagerImpl.java
    • -0
    • +19
    /forgon-tools/src/main/java/com/forgon/tools/Path.java
    • -0
    • +122
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GoodPurchasePlan.java
    • -0
    • +75
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GoodPurchaseTableManager.java
    • -0
    • +4
    /ssts-web/src/main/webapp/WEB-INF/dwr.xml
    • -0
    • +1258
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.js
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -2
    • +4
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
    • -1
    • +2
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +21
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -0
    • +33
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManager.java
    • -0
    • +1
    /forgon-core/src/main/java/com/forgon/serialnumber/model/SerialNum.java
    • -0
    • +90
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.jsp
10:35 上午

adairkang

同步装配界面的优化
Options
    • -1
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
    • -335
    • +311
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
10:07 上午

adairkang

同步历史回收记录添加过滤的功能
Options
    • -1
    • +9
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -0
    • +23
    /forgon-tools/src/main/java/com/forgon/tools/util/SqlUtils.java
    • -1
    • +4
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • -0
    • +147
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
    • -0
    • +7
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDao.java
    • -1
    • +35
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1024/images/style.css
    • -1
    • +19
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/UserTableManager.java
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1024/images/pic_bg_03.png
    • -0
    • +135
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectUser.jsp
    • -0
    • +60
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectStatus.jsp
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1024/images/tit_bg_0202.jpg
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/styleForWaitList.css
    • -8
    • +136
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/pic_bg_03.png
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/tit_bg_0202.jpg
  16. … 11 more files in changeset.
Sunday 13 Mar 2016
11:21 下午

shuyongfu

4.0合并至4.1
Options
    • -0
    • +33
    /ssts-web/src/main/resources/spring/projects/zsykzx/HERP.xml
    • -2
    • +6
    /ssts-web/src/main/resources/config/zsykzx/mybatis/syncToHERP_Mapper.xml
    • -0
    • +29
    /ssts-web/src/main/resources/config/zsykzx/mybatis/queryProject_Mapper.xml
    • -6
    • +11
    /ssts-web/src/main/resources/config/zsykzx/mybatis/syncFromHERP_Mapper.xml
    • -2
    • +16
    /ssts-web/src/main/resources/spring/projects/sznsfy/HIS.xml
11:14 下午

shuyongfu

4.0合并至4.1
Options
    • -1
    • +6
    /ssts-cszxyy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/cszxyy/dao/SyncOrgUnitAndUserDao.java
    • -0
    • +206
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/project/service/ProjectManagerImpl.java
    • -2
    • +4
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -3
    • +14
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -0
    • +32
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/project/model/ProjectDict.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  7. /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/project
    • -0
    • +8
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/StorageEntry.java
    • -1
    • +3
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
  10. /ssts-datasync/src/main/java/com/forgon/disinfectsystem/project
    • -0
    • +16
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -9
    • +28
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -0
    • +65
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/project/model/ProjectBalance.java
  15. /ssts-datasync/src/main/java/com/forgon/disinfectsystem/project/service
  16. … 22 more files in changeset.
Wednesday 09 Mar 2016
5:34 下午

jeffli

同步4.0稳定版的修改
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • -0
    • +43
    /ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
    • -0
    • +17
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.0.5_4.0.6.sql
  4. /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print
    • -3
    • +22
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java
    • -11
    • +128
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
    • -7
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/importSingleStorage.jsp
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/img/logo.jpg
    • -6
    • +6
    /ssts-web/src/test/java/test/forgon/prepare/testForInvoicePlanStatus.json
  11. /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/img
    • -3
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAORInvoiceManagerTests.java
    • -6
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/config/zsly/print/printConfig.js
    • -0
    • +1
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManager.java
  15. /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl
  16. … 26 more files in changeset.
5:33 下午

jeffli

同步4.0稳定版的修改
Options
    • -0
    • +20
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
    • -1
    • +9
    /forgon-core/src/main/java/com/forgon/dataupdater/service/UpdateDataBetween2VersionByExecSqls.java
    • -1
    • +2
    /ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/action/SatisfactionSurveyTemplateAction.java
    • -0
    • +7
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -1
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyDisinfection.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -0
    • +266
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/GodownEntryItemPrintVO.java
    • -0
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -0
    • +17
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
    • -3
    • +101
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -0
    • +3
    /forgon-core/src/main/java/com/forgon/excel/service/ExcelUtils.java
    • -0
    • +251
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/PrintApplicationItemVO.java
    • -2
    • +6
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/action/ImportSingleStorageController.java
  16. … 26 more files in changeset.
Monday 07 Mar 2016
11:49 下午

terrykwan

代码同步
Options
    • -5
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • -5
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
11:47 下午

terrykwan

解决装配页面不是当前页面时，自动刷新导致页面变空白的问题
Options
    • -6
    • +8
    /ssts-web/src/main/webapp/homepage/portalPage.js
    • -5
    • +24
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -1
    • +4
    /ssts-web/src/main/webapp/homepage/portalPage.jsp
11:45 下午

terrykwan

打印申请单的名字统一
Options
    • -2
    • +4
    /ssts-web/src/main/resources/systemset/operationDefine.xml
11:42 下午

terrykwan

有效期的map的key改为packageType
Options
    • -1
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
11:42 下午

terrykwan

去掉ajc编译的代码
Options
    • -10
    • +2
    /ssts-web/build.gradle
11:39 下午

terrykwan

解决XP IE8下自定义装配页面显示报错的问题
Options
    • -4
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.jsp
11:28 下午

terrykwan

有效期的map的key改为packageType
Options
    • -2
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • -3
    • +6
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
11:27 下午

terrykwan

提交同步修改的代码
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -2
    • +0
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
11:26 下午

terrykwan

去掉不需要的常量定义
Options
    • -16
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
11:26 下午

terrykwan

默认禁用标识牌
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
Monday 29 Feb 2016
11:57 上午

adairkang

同步4.0的外部代理灭菌单的签收功能
Options
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
Wednesday 24 Feb 2016
6:29 下午

jeffli

同步4.0稳定版的修改
Options
    • -0
    • +3
    /ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/webservice/manager/ZdwyWebServiceManagerImpl.java
6:29 下午

jeffli

同步4.0稳定版的修改
Options
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zsly/config.js
    • -0
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -0
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/UpdateReviewBasketReviewRecordManyToMany.java
    • -0
    • +13
    /ssts-web/src/main/java/com/forgon/disinfectsystem/web/service/HomePageModelManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/stockTakeInfoView.js
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/disposableGoodInfoView.js
6:28 下午

jeffli

同步4.0稳定版的修改
Options
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • -12
    • +3
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • -1
    • +7
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialCheckManageImpl.java
    • -9
    • +12
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -0
    • +4
    /ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
    • -0
    • +2
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -0
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
    • -10
    • +3
    /ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
    • -0
    • +3
    /forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +7
    /ssts-datasync-settlement-gyey-impl/src/main/java/com/forgon/disinfectsystem/settlement/service/SettlementWriteBackManagerImplForGYEY.java
    • -0
    • +5
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingdamagerecord/service/RecyclingDamageRecordManagerImpl.java
    • -0
    • +5
    /ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/service/IDCardInstanceManagerImpl.java
    • -0
    • +2
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -0
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/service/BarcodeManagerImpl.java
  16. … 33 more files in changeset.
Friday 19 Feb 2016
5:04 下午

jeffli

解决bug：

清洗不合格报表，不能同时支持sql server和oracle

Options
    • -0
    • +62
    /forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
4:49 下午

jeffli

解决bug：

申请单列表界面，鼠标移到某一条记录上查看物品申请列表，消毒物品名称带下划线

Options
    • -0
    • +8
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
Monday 15 Feb 2016
4:40 下午

terrykwan

解决jar通配符路径不正确的问题
Options
    • -1
    • +1
    /ssts-web/src/main/resources/struts.xml