diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index 3221640b..95bcb049 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -531,9 +531,14 @@ public class DepotHeadService { HttpServletRequest request) throws Exception { /**处理单据主表数据*/ DepotHead depotHead = JSONObject.parseObject(beanJson, DepotHead.class); - if(StringUtil.isEmpty(depotHead.getAccountIdList()) && depotHead.getAccountId()==null) { - throw new BusinessRunTimeException(ExceptionConstants.DEPOT_HEAD_ACCOUNT_FAILED_CODE, - String.format(ExceptionConstants.DEPOT_HEAD_ACCOUNT_FAILED_MSG)); + String subType = depotHead.getSubType(); + if("零售".equals(subType) || "零售退货".equals(subType) + || "采购".equals(subType) || "采购退货".equals(subType) + || "销售".equals(subType) || "销售退货".equals(subType)) { + if (StringUtil.isEmpty(depotHead.getAccountIdList()) && depotHead.getAccountId() == null) { + throw new BusinessRunTimeException(ExceptionConstants.DEPOT_HEAD_ACCOUNT_FAILED_CODE, + String.format(ExceptionConstants.DEPOT_HEAD_ACCOUNT_FAILED_MSG)); + } } //判断用户是否已经登录过,登录过不再处理 User userInfo=userService.getCurrentUser(); @@ -598,9 +603,14 @@ public class DepotHeadService { BigDecimal preTotalPrice, Long tenantId,HttpServletRequest request)throws Exception { /**更新单据主表信息*/ DepotHead depotHead = JSONObject.parseObject(beanJson, DepotHead.class); - if(StringUtil.isEmpty(depotHead.getAccountIdList()) && depotHead.getAccountId()==null) { - throw new BusinessRunTimeException(ExceptionConstants.DEPOT_HEAD_ACCOUNT_FAILED_CODE, - String.format(ExceptionConstants.DEPOT_HEAD_ACCOUNT_FAILED_MSG)); + String subType = depotHead.getSubType(); + if("零售".equals(subType) || "零售退货".equals(subType) + || "采购".equals(subType) || "采购退货".equals(subType) + || "销售".equals(subType) || "销售退货".equals(subType)) { + if (StringUtil.isEmpty(depotHead.getAccountIdList()) && depotHead.getAccountId() == null) { + throw new BusinessRunTimeException(ExceptionConstants.DEPOT_HEAD_ACCOUNT_FAILED_CODE, + String.format(ExceptionConstants.DEPOT_HEAD_ACCOUNT_FAILED_MSG)); + } } if(StringUtil.isNotEmpty(depotHead.getAccountIdList())){ depotHead.setAccountIdList(depotHead.getAccountIdList().replace("[", "").replace("]", "").replaceAll("\"", ""));