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 @@
)
+
+
+
+ update jsh_depot_head dh set dh.account_id = null
+ where dh.id=#{id}
+ and ifnull(dh.delete_flag,'0') !='1'
+
\ No newline at end of file