From b9cb19fab6379069e71d71aff06f2936b28859e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 14 Apr 2023 19:47:24 +0800
Subject: [PATCH] =?UTF-8?q?=20=E8=A7=A3=E5=86=B3=E7=9A=84=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E4=BF=9D=E5=AD=98=E7=9A=84bug=EF=BC=9A=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E5=AD=98=E5=9C=A8=E5=A4=9A=E8=B4=A6=E6=88=B7=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E9=9C=80=E8=A6=81=E5=B0=86=E5=8E=9F=E8=B4=A6=E6=88=B7?=
 =?UTF-8?q?=E7=9A=84id=E7=BD=AE=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java  | 3 +++
 .../com/jsh/erp/service/depotHead/DepotHeadService.java    | 4 ++++
 .../src/main/resources/mapper_xml/DepotHeadMapperEx.xml    | 7 +++++++
 3 files changed, 14 insertions(+)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
index 4a5c20b4..2d427dfd 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
@@ -235,4 +235,7 @@ public interface DepotHeadMapperEx {
     BigDecimal getFinishDepositByNumberExceptCurrent(
             @Param("linkNumber") String linkNumber,
             @Param("number") String number);
+
+    void setAccountIdToNull(
+            @Param("id") Long id);
 }
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 479961e2..91a0cbb0 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
@@ -987,6 +987,10 @@ public class DepotHeadService {
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
+        //如果存在多账户结算需要将原账户的id置空
+        if(StringUtil.isNotEmpty(depotHead.getAccountIdList())) {
+            depotHeadMapperEx.setAccountIdToNull(depotHead.getId());
+        }
         /**入库和出库处理预付款信息*/
         if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPayType())){
             if(depotHead.getOrganId()!=null){
diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
index ae06fceb..7d9da7ee 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
@@ -835,6 +835,7 @@
         </foreach>
         )
     </update>
+
     <select id="getDepotHeadListByAccountIds" resultMap="com.jsh.erp.datasource.mappers.DepotHeadMapper.BaseResultMap">
         select
         <include refid="com.jsh.erp.datasource.mappers.DepotHeadMapper.Base_Column_List" />
@@ -1070,4 +1071,10 @@
         and dh.number!=#{number}
         and ifnull(dh.delete_flag,'0') !='1'
     </select>
+
+    <update id="setAccountIdToNull">
+        update jsh_depot_head dh set dh.account_id = null
+        where dh.id=#{id}
+        and ifnull(dh.delete_flag,'0') !='1'
+    </update>
 </mapper>
\ No newline at end of file