From 89ce695b70b17d6dee479c2ba4dc292ff44e6c9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 2 Jun 2021 00:28:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=9A=84=E8=B4=A6=E6=88=B7?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/depotHead/DepotHeadService.java   | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

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("\"", ""));