user30

mhd_bms/src/main/java/com/mhd/bms/application/server/businessDocument/BusinessDocumentApplicationService.java

@@ -618,7 +618,7 @@ public class BusinessDocumentApplicationService {
         if(businessDocumentDO.getBelongModuleCode().equals(BelongModuleCode.WMS.getCode())){
             contractType = 1;
         }
-        AjaxResult ajaxResult = systemServiceFeign.getInfoByCustomerAndSecondSubjectCode(businessDocumentDO.getSettlementCustomersCode(),contractType,businessDocumentDO.getFirstSubjectCode(),businessDocumentDO.getTopOrganizationId(),businessDocumentDO.getOrganizationId());
+        AjaxResult ajaxResult = systemServiceFeign.getInfoByCustomerAndSecondSubjectCode(businessDocumentDO.getSettlementCustomersCode(),contractType,businessDocumentDO.getFirstSubjectCode() != null ?businessDocumentDO.getFirstSubjectCode():businessDocumentDO.getSecondSubjectCode(),businessDocumentDO.getTopOrganizationId(),businessDocumentDO.getOrganizationId());
         if(!"200".equals(String.valueOf(ajaxResult.get("code")))) {
             throw new ServiceException("合同信息未找到");
         }
@@ -626,6 +626,10 @@ public class BusinessDocumentApplicationService {
         if (null == contractPO) {
             throw new ServiceException("合同信息未找到");
         }
+        String isMany = contractPO.getIsMany();
+        if ("1".equals(isMany)) {
+            throw new ServiceException("存在多条相同费用科目的合同，请检查");
+        }
         businessDocumentDO.setContractName(contractPO.getContractName());
         businessDocumentDO.setContractNumber(contractPO.getContractNumber());
     }

mhd_bms/src/main/java/com/mhd/bms/infrastructure/feign/vo/ContractManagePO.java

@@ -169,4 +169,6 @@ public class ContractManagePO extends BaseVOEntity{
     @ApiModelProperty(name = "主体类型(1-货主，2-客户，3-承运商)")
     private Integer principalType;
 
+    private String isMany;
+
 }