Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceImpl.java =================================================================== diff -u -r31284 -r31794 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceImpl.java (.../ForeignTousseWebServiceImpl.java) (revision 31284) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceImpl.java (.../ForeignTousseWebServiceImpl.java) (revision 31794) @@ -402,7 +402,7 @@ //设置外来器械申请单的供应商联系人与联系电话 foreignTousseApplication.setSupplierContactName(supplierContactUser); foreignTousseApplication.setSupplierPhoneNumber(supplierContactPhone); - foreignTousseApplicationManager.saveOrUpdate(foreignTousseApplication, foreignTousseInfo, ForeignTousseApplication.ACTION_TYPE_ADD); + foreignTousseApplicationManager.saveOrUpdate(null, foreignTousseApplication, foreignTousseInfo, ForeignTousseApplication.ACTION_TYPE_ADD); }else{ if(!StringUtils.equals(orginalForeignTousseApplication.getApplicant(), applicant)){ orginalForeignTousseApplication.setApplicant(applicant); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ClassifyBasketsRecyclingSequenceTests.java =================================================================== diff -u -r26085 -r31794 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ClassifyBasketsRecyclingSequenceTests.java (.../ClassifyBasketsRecyclingSequenceTests.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ClassifyBasketsRecyclingSequenceTests.java (.../ClassifyBasketsRecyclingSequenceTests.java) (revision 31794) @@ -226,7 +226,7 @@ TousseDefinition tousseDefinition_Test骨钩 = tousseDefinitionManager.getTousseDefinitionByName(Constants.TousseDefinitionName.Test骨钩); JSONArray foreignTousseTreeDatas = ForeignTousseAppDataProvider.createForeignTousseTreeDatas(ForeignTousseAppDataProvider.createForeignTousseItem(tousseDefinition_Test骨钩), materials); //创建一张外来器械申请单 - foreignTousseApplicationManager.saveOrUpdate(foreignTousseApplication, foreignTousseTreeDatas.toString(), ForeignTousseApplication.ACTION_TYPE_ADD); + foreignTousseApplicationManager.saveOrUpdate(null, foreignTousseApplication, foreignTousseTreeDatas.toString(), ForeignTousseApplication.ACTION_TYPE_ADD); td_Test骨钩 = tousseDefinitionManager.getForeignTousseDefinitionByNameAPPIDAndSupplierName(Constants.TousseDefinitionName.Test骨钩, appId + "", "工商银行"); } } Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/szsdsrmyy/ForeignTousseWebServiceImpl.java =================================================================== diff -u -r30655 -r31794 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/szsdsrmyy/ForeignTousseWebServiceImpl.java (.../ForeignTousseWebServiceImpl.java) (revision 30655) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/szsdsrmyy/ForeignTousseWebServiceImpl.java (.../ForeignTousseWebServiceImpl.java) (revision 31794) @@ -388,7 +388,7 @@ //设置外来器械申请单的供应商联系人与联系电话 foreignTousseApplication.setSupplierContactName(supplierContactUser); foreignTousseApplication.setSupplierPhoneNumber(supplierContactPhone); - foreignTousseApplicationManager.saveOrUpdate(foreignTousseApplication, foreignTousseInfo, ForeignTousseApplication.ACTION_TYPE_ADD); + foreignTousseApplicationManager.saveOrUpdate(null, foreignTousseApplication, foreignTousseInfo, ForeignTousseApplication.ACTION_TYPE_ADD); }else{ if(!StringUtils.equals(orginalForeignTousseApplication.getApplicant(), applicant)){ orginalForeignTousseApplication.setApplicant(applicant); Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceExImpl.java =================================================================== diff -u -r31284 -r31794 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceExImpl.java (.../ForeignTousseWebServiceExImpl.java) (revision 31284) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceExImpl.java (.../ForeignTousseWebServiceExImpl.java) (revision 31794) @@ -366,7 +366,7 @@ foreignTousseApplication.setSupplierPhoneNumber(supplierContactPhone); // 取 OES 的【备注】作为追溯系统的【备注】(GDSZYY-75) foreignTousseApplication.setRemark(remark); - foreignTousseApplicationManager.saveOrUpdate(foreignTousseApplication, foreignTousseInfo, ForeignTousseApplication.ACTION_TYPE_ADD); + foreignTousseApplicationManager.saveOrUpdate(null, foreignTousseApplication, foreignTousseInfo, ForeignTousseApplication.ACTION_TYPE_ADD); }else{ if(!StringUtils.equals(orginalForeignTousseApplication.getApplicant(), applicant)){ orginalForeignTousseApplication.setApplicant(applicant); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ForeignTousseRecyclingTests.java =================================================================== diff -u -r29763 -r31794 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ForeignTousseRecyclingTests.java (.../ForeignTousseRecyclingTests.java) (revision 29763) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ForeignTousseRecyclingTests.java (.../ForeignTousseRecyclingTests.java) (revision 31794) @@ -259,7 +259,7 @@ TousseDefinition tousseDefinition_Test骨钩 = tousseDefinitionManager.getTousseDefinitionByName(Constants.TousseDefinitionName.Test骨钩); JSONArray foreignTousseTreeDatas = ForeignTousseAppDataProvider.createForeignTousseTreeDatas(ForeignTousseAppDataProvider.createForeignTousseItem(tousseDefinition_Test骨钩), materials); //创建一张外来器械申请单 - foreignTousseApplicationManager.saveOrUpdate(foreignTousseApplication, foreignTousseTreeDatas.toString(), ForeignTousseApplication.ACTION_TYPE_ADD); + foreignTousseApplicationManager.saveOrUpdate(null, foreignTousseApplication, foreignTousseTreeDatas.toString(), ForeignTousseApplication.ACTION_TYPE_ADD); td_Test骨钩 = tousseDefinitionManager.getForeignTousseDefinitionByNameAPPIDAndSupplierName(Constants.TousseDefinitionName.Test骨钩, appId + "", "工商银行"); } }); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/recycle/TestForeignTousseApplicationRecycled.java =================================================================== diff -u -r27142 -r31794 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/recycle/TestForeignTousseApplicationRecycled.java (.../TestForeignTousseApplicationRecycled.java) (revision 27142) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/recycle/TestForeignTousseApplicationRecycled.java (.../TestForeignTousseApplicationRecycled.java) (revision 31794) @@ -78,7 +78,7 @@ prepareData(); ForeignTousseApplication foreignTousseApplication = ForeignTousseAppDataProvider.createForeignTousseApplication(); //创建一张外来器械申请单 - foreignTousseApplicationManager.saveOrUpdate(foreignTousseApplication, foreignTousseTreeDatas.toString(), ForeignTousseApplication.ACTION_TYPE_ADD); + foreignTousseApplicationManager.saveOrUpdate(null, foreignTousseApplication, foreignTousseTreeDatas.toString(), ForeignTousseApplication.ACTION_TYPE_ADD); } /**