Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r40488 -r40550 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 40488) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 40550) @@ -8997,6 +8997,8 @@ String returnType = params.optString("returnType", ""); //接收人(外来器械供应商联系人) String returneeOfSupplier = params.optString("returneeOfSupplier1", ""); + //供应商联系人联系电话 + String returneeOfSupplierPhoneNumber = params.optString("returneeOfSupplierPhoneNumber", ""); //供应室归还人 String returnMan = params.optString("returnMan1", ""); //通常只会有一个外来器械申请项 @@ -9006,7 +9008,7 @@ tousseItemIdList = Arrays.asList(tousseItemIds.split(";")); } JSONObject result = JSONUtil.buildJsonObject(true, String.format("%s成功！", returnType)); - foreignTousseApplicationManager.confirmReturnOrEarlyReturnPartOfTousseItem(id, tousseItemIdList, null, returnType, returneeOfSupplier, returnMan, null, Constants.STR_YES); + foreignTousseApplicationManager.confirmReturnOrEarlyReturnPartOfTousseItem(id, tousseItemIdList, null, returnType, returneeOfSupplier, returneeOfSupplierPhoneNumber, returnMan, null, Constants.STR_YES); JSONObject data = new JSONObject(); data.put("id", Long.parseLong(tousseItemIdList.get(0))); JSONUtil.addDataProperty(result, data); Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java =================================================================== diff -u -r40422 -r40550 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java (.../ForeignTousseApplicationManager.java) (revision 40422) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java (.../ForeignTousseApplicationManager.java) (revision 40550) @@ -100,11 +100,12 @@ * @param ids 需要归还的外来申请单id的集合 * @param returnType 归还的类型（值有两种情况：“确认归还”、“提前归还”） * @param returneeOfSupplier 外来器械供应商联系人(开启enableReturneeOfForeignTousseSupplier配置项时需要传) + * @param returneeOfSupplierPhoneNumber 外来器械供应商联系人的联系电话（syncReturnRecipientInfo=启用时，会修改供应商联系人电话） * @param returnMan 供应室归还人(开启enableReturneeOfForeignTousseSupplier配置项时需要传) * @param completeness "本次归还的物品,包内材料是否齐全" DGSDBZXYY-239 * @param cleanQualified “清洗合格”，用于设置本次归还的外来器械包是否已经清洗合格；QHRSGZZYY-13 */ - public void confirmReturnOrEarlyReturn(List ids, String returnType, String returneeOfSupplier, String returnMan, String completeness, String cleanQualified); + public void confirmReturnOrEarlyReturn(List ids, String returnType, String returneeOfSupplier, String returneeOfSupplierPhoneNumber, String returnMan, String completeness, String cleanQualified); /** * 批量确认归还或者提前归还，支持部分物品归还 @@ -113,12 +114,13 @@ * @param returnTousseDefinitionIdList 部分归还的外来器械拆分小包包定义id * @param returnType 归还的类型（值有两种情况：“确认归还”、“提前归还”） * @param returneeOfSupplier 外来器械供应商联系人(开启enableReturneeOfForeignTousseSupplier配置项时需要传) + * @param returneeOfSupplierPhoneNumber 外来器械供应商联系人的联系电话（syncReturnRecipientInfo=启用时，会修改供应商联系人电话） * @param returnMan 供应室归还人(开启enableReturneeOfForeignTousseSupplier配置项时需要传) * @param completeness "本次归还的物品,包内材料是否齐全" DGSDBZXYY-239 * @param cleanQualified 清洗合格QHRSGZZYY-13 */ public void confirmReturnOrEarlyReturnPartOfTousseItem(Long id, - List tousseItemIds, List returnTousseDefinitionIdList, String returnType, String returneeOfSupplier, + List tousseItemIds, List returnTousseDefinitionIdList, String returnType, String returneeOfSupplier, String returneeOfSupplierPhoneNumber, String returnMan, String completeness, String cleanQualified); /** @@ -260,12 +262,13 @@ * @param id 外来器械包申请单id * @param returnTousseDefinitionIdList 归还外来器械包或者拆分小包包定义id * @param returnType 归还类型 - * @param returneeOfSupplier 归还供应商 + * @param returneeOfSupplier 归还供应商联系人 + * @param returneeOfSupplierPhoneNumber 归还供应商联系人联系电话 * @param returnMan 归还人 * @param completeness 归还功能中新增字段“是否齐全”DGSDBZXYY-239 * @param cleanQualified 清洗合格字段QHRSGZZYY-13 */ public void confirmReturnOrEarlyReturnPartOfForeignTousse(Long id, List returnTousseDefinitionIdList, String returnType, - String returneeOfSupplier, String returnMan, String completeness, String cleanQualified); + String returneeOfSupplier, String returneeOfSupplierPhoneNumber, String returnMan, String completeness, String cleanQualified); } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java =================================================================== diff -u -r40411 -r40550 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 40411) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 40550) @@ -1323,6 +1323,12 @@ } } + //【科室供应室设置】“外来器械参数设置”新增字段“显示归还接收人联系电话”、“归还时同步归还接收人信息”ZSYY-429 + if(enableReturneeOfForeignTousseSupplier){ + supplyRoomConfig.setDisplayRecipientPhoneNumber(rq.getParameter("displayRecipientPhoneNumber")); + supplyRoomConfig.setSyncReturnRecipientInfo(rq.getParameter("syncReturnRecipientInfo")); + } + //“系统参数设置”中，新增字段“使用记录结算科室取值范围”SZSDSRMYY-130 boolean enableTheSettlementDepartmentIsDepartOfPatientFunction = ConfigUtils.getSystemSetConfigByNameBool("enableTheSettlementDepartmentIsDepartOfPatientFunction"); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManager.java =================================================================== diff -u -r30436 -r40550 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManager.java (.../SupplierManager.java) (revision 30436) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManager.java (.../SupplierManager.java) (revision 40550) @@ -213,8 +213,9 @@ /** * 根据名称获取供应商联系人 - * @param spell 供应商名称 + * @param supplierName 供应商名称 + * @param spell 供应商联系人搜索关键字 * @return */ - public List getSupplierContactListByName(String spell); + public List getSupplierContactListByName(String supplierName, String spell); } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java =================================================================== diff -u -r40423 -r40550 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 40423) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 40550) @@ -220,6 +220,24 @@ private Double ftMaxWeight; /** + * 显示归还接收人联系电话 + * 默认值为“否”。 + * 选择为“是”时，可触发在外来器械单中归还时显示归还接收人联系电话的字段。 + * ZSYY-429 + */ + private String displayRecipientPhoneNumber = Constants.STR_NO; + + public static final String SYNC_RETURN_RECIPIENT_INFO_YES = "启用"; + public static final String SYNC_RETURN_RECIPIENT_INFO_NO = "不启用"; + /** + * 归还时同步归还接收人信息 + * 默认值为“不启用”。 + * 选择为“启用”时，则触发在外来器械单中归还时，可以添加或修改归还接收人的信息并同步到【供应商管理】中。 + * ZSYY-429 + */ + private String syncReturnRecipientInfo = SYNC_RETURN_RECIPIENT_INFO_NO; + + /** * 自定义器械包是否整包清洗 */ private String isCustomTousseCleanEntirely = STR_YES; @@ -1849,4 +1867,22 @@ public void setDeviceMaintenanceUpdateMode(String deviceMaintenanceUpdateMode) { this.deviceMaintenanceUpdateMode = deviceMaintenanceUpdateMode; } + + @Column(columnDefinition=" varchar(20) default '" + Constants.STR_NO + "' not null ") + public String getDisplayRecipientPhoneNumber() { + return displayRecipientPhoneNumber; + } + + public void setDisplayRecipientPhoneNumber(String displayRecipientPhoneNumber) { + this.displayRecipientPhoneNumber = displayRecipientPhoneNumber; + } + + @Column(columnDefinition=" varchar(20) default '" + SYNC_RETURN_RECIPIENT_INFO_NO + "' not null ") + public String getSyncReturnRecipientInfo() { + return syncReturnRecipientInfo; + } + + public void setSyncReturnRecipientInfo(String syncReturnRecipientInfo) { + this.syncReturnRecipientInfo = syncReturnRecipientInfo; + } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java =================================================================== diff -u -r38746 -r40550 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java (.../SupplierManagerImpl.java) (revision 38746) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java (.../SupplierManagerImpl.java) (revision 40550) @@ -1736,7 +1736,7 @@ } @Override - public List getSupplierContactListByName(String simpleSpell) { + public List getSupplierContactListByName(String supplierName, String simpleSpell) { simpleSpell = simpleSpell.toUpperCase(); String hql = "select po from SupplierContact po where 1=1 "; Pattern pat = Pattern.compile("[\\u4E00-\\u9FA5]+"); // 匹配中文字符的正则表达式 @@ -1745,6 +1745,9 @@ if (simpleSpell.trim().length() > 0) { hql += m.find() ? " and po.contactName like '%" + simpleSpell + "%'" : SqlUtils.getSearchSQL(searchMode, simpleSpell); } + if(StringUtils.isNotBlank(supplierName)){ + hql += " and po.supplier.companyName = '" + supplierName + "' "; + } hql += " order by po.contactName "; return objectDao.findByHql(hql,-1,-1); } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/SupplierAction.java =================================================================== diff -u -r36751 -r40550 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/SupplierAction.java (.../SupplierAction.java) (revision 36751) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/SupplierAction.java (.../SupplierAction.java) (revision 40550) @@ -25,19 +25,14 @@ import com.forgon.disinfectsystem.basedatamanager.certificate.service.CertificateManager; import com.forgon.disinfectsystem.basedatamanager.supplier.service.SupplierManager; -import com.forgon.disinfectsystem.basedatamanager.supplier.service.RegistrationCertificationManager; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; -import com.forgon.disinfectsystem.entity.basedatamanager.supplier.Certificate; import com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier; import com.forgon.disinfectsystem.entity.basedatamanager.supplier.SupplierContact; -import com.forgon.disinfectsystem.entity.expensivegoods.AuthorizationCertification; -import com.forgon.disinfectsystem.entity.expensivegoods.ExpensiveGoodsModel; import com.forgon.entity.PageEntity; import com.forgon.systemsetting.model.HttpOption; import com.forgon.systemsetting.service.HttpOptionManager; import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.StrutsResponseUtils; -import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.JSONUtil; import com.forgon.tools.json.JsonPropertyFilter; import com.forgon.tools.util.PageUtil; @@ -197,7 +192,6 @@ /** *添加修改 Supplier */ - @SuppressWarnings("unchecked") public void loadSupplier() { StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8"); JsonConfig config = new JsonConfig(); @@ -226,9 +220,10 @@ */ public void loadSupplierContactByName() { StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8"); + String supplierName = StrutsParamUtils.getPraramValue("supplierName", ""); String spell = StrutsParamUtils.getPraramValue("spell", ""); List supplierContactList = new ArrayList(); - List tempSupplierContactList = supplierManager.getSupplierContactListByName(spell); + List tempSupplierContactList = supplierManager.getSupplierContactListByName(supplierName, spell); if(CollectionUtils.isNotEmpty(tempSupplierContactList)){ Map nameToIdMap = new HashMap(); for (SupplierContact supplierContact : tempSupplierContactList) { Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r40422 -r40550 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 40422) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 40550) @@ -2120,7 +2120,7 @@ } @Override - public void confirmReturnOrEarlyReturn(List ids, String returnType, String returneeOfSupplier, String returnMan, String completeness, String cleanQualified) { + public void confirmReturnOrEarlyReturn(List ids, String returnType, String returneeOfSupplier, String returneeOfSupplierPhoneNumber, String returnMan, String completeness, String cleanQualified) { if (CollectionUtils.isNotEmpty(ids) && (ForeignTousseApplication.ACTION_TYPE_CONFIRM_RETURN.equals(returnType) || ForeignTousseApplication.ACTION_TYPE_EARLY_RETURN.equals(returnType))) { @@ -2158,6 +2158,13 @@ if(!checkIsSameSupplierContant(list)){ throw new RuntimeException("请选择同一供应商的外来器械进行归还"); } + //归还时同步归还接收人信息ZSYY-429 + String supplierName = list.get(0).getSupplierName(); + if(StringUtils.isBlank(supplierName)){ + throw new RuntimeException("请选择同一供应商的外来器械进行归还"); + } + supplierName = StringTools.split(supplierName, ";")[0]; + syncSupplierContact(supplierName, returneeOfSupplier, returneeOfSupplierPhoneNumber); for (ForeignTousseApplication foreignTousseApplication : list) { appendReturneeOfSupplier(foreignTousseApplication, returneeOfSupplier); appendReturnMan(foreignTousseApplication, returnMan); @@ -2201,6 +2208,47 @@ } /** + * 归还时同步归还接收人信息 + * @param supplierName 供应商 + * @param returneeOfSupplier 供应商联系人 + * @param returneeOfSupplierPhoneNumber 供应商联系人联系电话 + */ + private void syncSupplierContact(String supplierName, String returneeOfSupplier, String returneeOfSupplierPhoneNumber) { + SupplyRoomConfig systemParamsObj = supplyRoomConfigManager.getSystemParamsObj(); + if(!StringUtils.equals(systemParamsObj.getSyncReturnRecipientInfo(), SupplyRoomConfig.SYNC_RETURN_RECIPIENT_INFO_YES)){ + //字段“归还时同步归还接收人信息”被设置为“启用; + //归还时，若字段“归还接收人”中的值不存在于当前归还的供应商信息中，则提交保存时，同步在对应的供应商的“联系人列表”中自动添加一个该用户 + return; + } + Supplier supplier = supplierManager.getFirst(" companyName = '"+ supplierName +"' and rentTousse = '"+ Supplier.SUPPLIER_TYPE_RENTTOUSSE +"'"); + if(supplier == null){ + return; + } + SupplierContact supplierContact = null; + List supplierContactList = supplier.getSupplierContact(); + if(CollectionUtils.isNotEmpty(supplierContactList)){ + for (SupplierContact supplierContact2 : supplierContactList) { + if(StringUtils.equals(supplierContact2.getContactName(), returneeOfSupplier)){ + supplierContact = supplierContact2; + break; + } + } + } + if(supplierContact == null){ + supplierContact = new SupplierContact(); + supplierContact.setSupplier(supplier); + supplierContact.setContactName(returneeOfSupplier); + supplierContact.setWbCode(GB2WB.getWBCode(returneeOfSupplier)); + supplierContact.setSpelling(GB2Alpha.string2Alpha(returneeOfSupplier)); + } + if(StringUtils.equals(systemParamsObj.getDisplayRecipientPhoneNumber(), Constants.STR_YES)){ + //若字段“显示归还接收人联系电话”设置为“是”，则保存时将字段“联系电话”中的值保存为本次新增用户信息中的字段“电话”中； + supplierContact.setPhoneNumber(returneeOfSupplierPhoneNumber); + } + objectDao.saveOrUpdate(supplierContact); + } + + /** * 设置外来器械包内材料是否齐全DGSDBZXYY-239 * @param tousseItemList * @param completeness @@ -3449,7 +3497,7 @@ @Override public void confirmReturnOrEarlyReturnPartOfTousseItem(Long foreignTousseApplicationId, - List tousseItemIds, List returnTousseDefinitionIdList, String returnType, String returneeOfSupplier, + List tousseItemIds, List returnTousseDefinitionIdList, String returnType, String returneeOfSupplier, String returneeOfSupplierPhoneNumber, String returnMan, String completeness, String cleanQualified) { if(!DatabaseUtil.isPoIdValid(foreignTousseApplicationId)){ throw new SystemException("申请单ID无效！"); @@ -3496,6 +3544,9 @@ if(!checkTousseItemIsSameSupplierContant(tousseItemList)){ throw new RuntimeException("请选择同一供应商的外来器械进行归还"); } + //归还时同步归还接收人信息ZSYY-429 + String supplierName = tousseItemList.get(0).getSupplierName(); + syncSupplierContact(supplierName, returneeOfSupplier, returneeOfSupplierPhoneNumber); appendReturneeOfSupplier(foreignTousseApplication, returneeOfSupplier); appendReturnMan(foreignTousseApplication, returnMan); } @@ -5865,7 +5916,7 @@ @Override public void confirmReturnOrEarlyReturnPartOfForeignTousse(Long id, List returnTousseDefinitionIdList, String returnType, - String returneeOfSupplier, String returnMan, String completeness, String cleanQualified) { + String returneeOfSupplier, String returneeOfSupplierPhoneNumber, String returnMan, String completeness, String cleanQualified) { ForeignTousseApplication foreignTousseApplication = this.get(id); if(foreignTousseApplication == null){ throw new SystemException("无效的申请单id" + id); @@ -5901,7 +5952,7 @@ } List tousseItemIds = new ArrayList(tousseItemIdStrSet); - this.confirmReturnOrEarlyReturnPartOfTousseItem(id, tousseItemIds , returnSplitTousseDefinitionIdList, returnType, returneeOfSupplier, returnMan, completeness, cleanQualified); + this.confirmReturnOrEarlyReturnPartOfTousseItem(id, tousseItemIds , returnSplitTousseDefinitionIdList, returnType, returneeOfSupplier, returneeOfSupplierPhoneNumber, returnMan, completeness, cleanQualified); } } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java =================================================================== diff -u -r40422 -r40550 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 40422) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 40550) @@ -578,6 +578,8 @@ String ids = StrutsParamUtils.getPraramValue("ids", ""); String returnType = StrutsParamUtils.getPraramValue("returnType", ""); String returneeOfSupplier = StrutsParamUtils.getPraramValue("returneeOfSupplier1", ""); + //供应商联系人联系电话 + String returneeOfSupplierPhoneNumber = StrutsParamUtils.getPraramValue("returneeOfSupplierPhoneNumber", ""); String returnMan = StrutsParamUtils.getPraramValue("returnMan1", ""); //归还功能中新增字段“是否齐全”DGSDBZXYY-239 String completeness = StrutsParamUtils.getPraramValue("completeness", ""); @@ -586,7 +588,7 @@ if (StringTools.isNotBlank(ids)) { JSONObject result = JSONUtil.buildJsonObject(true, String.format("%s成功！", returnType)); try { - foreignTousseApplicationManager.confirmReturnOrEarlyReturn(Arrays.asList(ids.split(";")), returnType, returneeOfSupplier, returnMan, completeness, cleanQualified); + foreignTousseApplicationManager.confirmReturnOrEarlyReturn(Arrays.asList(ids.split(";")), returnType, returneeOfSupplier, returneeOfSupplierPhoneNumber, returnMan, completeness, cleanQualified); } catch (Exception e) { e.printStackTrace(); result = JSONUtil.buildJsonObject(false, e.getMessage()); @@ -602,6 +604,8 @@ Long id = StrutsParamUtils.getPraramLongValue("id", null); String returnType = StrutsParamUtils.getPraramValue("returnType", ""); String returneeOfSupplier = StrutsParamUtils.getPraramValue("returneeOfSupplier1", ""); + //供应商联系人联系电话 + String returneeOfSupplierPhoneNumber = StrutsParamUtils.getPraramValue("returneeOfSupplierPhoneNumber", ""); String returnMan = StrutsParamUtils.getPraramValue("returnMan1", ""); String tousseItemIds = StrutsParamUtils.getPraramValue("tousseItemIds", ""); //部分归还的外来器械拆分小包器械包定义id，例如：1;2;3 @@ -616,10 +620,10 @@ List returnTousseDefinitionIdList = (List) StringTools.parseToLongs(tousseDefinitionIds, ";"); if(CollectionUtils.isNotEmpty(returnTousseDefinitionIdList)){ //根据器械包定义id归还 - foreignTousseApplicationManager.confirmReturnOrEarlyReturnPartOfForeignTousse(id, returnTousseDefinitionIdList, returnType, returneeOfSupplier, returnMan, completeness, cleanQualified); + foreignTousseApplicationManager.confirmReturnOrEarlyReturnPartOfForeignTousse(id, returnTousseDefinitionIdList, returnType, returneeOfSupplier, returneeOfSupplierPhoneNumber, returnMan, completeness, cleanQualified); }else{ //根据申请项id归还 - foreignTousseApplicationManager.confirmReturnOrEarlyReturnPartOfTousseItem(id, Arrays.asList(tousseItemIds.split(";")), returnTousseDefinitionIdList, returnType, returneeOfSupplier, returnMan, completeness, cleanQualified); + foreignTousseApplicationManager.confirmReturnOrEarlyReturnPartOfTousseItem(id, Arrays.asList(tousseItemIds.split(";")), returnTousseDefinitionIdList, returnType, returneeOfSupplier, returneeOfSupplierPhoneNumber, returnMan, completeness, cleanQualified); } } catch (Exception e) { e.printStackTrace();