From f005d48f931e648b6f19c2d25da9df2acd698091 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, 18 May 2022 22:52:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=AF=B9=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E7=8A=B6=E6=80=81=E8=BF=9B=E8=A1=8C=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/service/accountHead/AccountHeadService.java   | 4 +++-
 .../java/com/jsh/erp/service/depotHead/DepotHeadService.java  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
index 90ade067..680832ce 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
@@ -266,7 +266,9 @@ public class AccountHeadService {
         AccountHead accountHead = JSONObject.parseObject(beanJson, AccountHead.class);
         User userInfo=userService.getCurrentUser();
         accountHead.setCreator(userInfo==null?null:userInfo.getId());
-        accountHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT);
+        if(StringUtil.isEmpty(accountHead.getStatus())) {
+            accountHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT);
+        }
         accountHeadMapper.insertSelective(accountHead);
         //根据单据编号查询单据id
         AccountHeadExample dhExample = new AccountHeadExample();
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 b6a80810..23d66e23 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
@@ -729,7 +729,9 @@ public class DepotHeadService {
         User userInfo=userService.getCurrentUser();
         depotHead.setCreator(userInfo==null?null:userInfo.getId());
         depotHead.setCreateTime(new Timestamp(System.currentTimeMillis()));
-        depotHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT);
+        if(StringUtil.isEmpty(depotHead.getStatus())) {
+            depotHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT);
+        }
         depotHead.setPurchaseStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT);
         depotHead.setPayType(depotHead.getPayType()==null?"现付":depotHead.getPayType());
         if(StringUtil.isNotEmpty(depotHead.getAccountIdList())){