Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r23328 -r23330 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 23328) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 23330) @@ -3534,8 +3534,19 @@ if(StringUtils.isBlank(tousseInstance.getStatus2())){ // 第一次流转 // tousseOperation.setSrcStatus(tousseInstance.getStatus2()); - tousseOperation.setSrcDepart(tousseInstance.getDepart()); - tousseOperation.setSrcDepartCoding(tousseInstance.getDepartCoding()); + { + if(StringUtils.isBlank(tousseInstance.getLocationForDisplay()) || StringUtils.isBlank(tousseInstance.getLocation())){ + throw new RuntimeException("当前科室为空,无法发货!"); + } + if(StringUtils.isBlank(tousseInstance.getWareHouseName())){ + throw new RuntimeException("当前科室为空,无法发货!"); + } + if(!DatabaseUtil.isPoIdValid(tousseInstance.getWareHouseId())){ + throw new RuntimeException("当前科室为空,无法发货!"); + } + } + tousseOperation.setSrcDepart(tousseInstance.getLocationForDisplay()); + tousseOperation.setSrcDepartCoding(tousseInstance.getLocation()); tousseOperation.setSrcLocation(tousseInstance.getWareHouseName()); tousseOperation.setSrcLocationType(TousseOperation.DESTTYPE_WAREHOUSE); tousseOperation.setSrcWareHouseId(tousseInstance.getWareHouseId());