From 0d2a03ec404b9c047d5d5cd4654a48882135be5f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 六月 2025 16:53:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java | 3 +++
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
index 1907ebc..a1f3048 100644
--- a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
@@ -34,7 +34,7 @@
LEFT JOIN `company` sd ON sd.ID = usr.COMPANY_ID AND sd.ISDELETED = 0
LEFT JOIN `member` m ON usr.MEMBER_ID = m.id
<if test="dto.roleId != null">
- RIGHT JOIN system_user_role sur on sur.USER_ID = usr.ID and sur.ROLE_ID = #{dto.roleId}
+ RIGHT JOIN system_user_role sur on sur.USER_ID = usr.ID and sur.DELETED = 0 and sur.ROLE_ID = #{dto.roleId}
</if>
<where>
usr.DELETED = 0
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
index 235c6e6..8cca9b5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
@@ -315,6 +315,9 @@
if(Objects.isNull(platformReason)|| !Constants.equalsInteger(platformReason.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍏ュ洯鍘熷洜淇℃伅寮傚父,璇峰埛鏂伴噸璇�");
}
+ if(platformBooksApplyDTO.getTotalNum().compareTo(platformReason.getLimitNum())>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浠诲姟閲忚秴鍑哄崟鏃ュ彲浣滀笟閲忥紝璇蜂慨鏀瑰悗閲嶆柊杈撳叆!");
+ }
PlatformGroup platformGroup= platformGroupMapper.selectById(platformReason.getGroupId());
if(Objects.isNull(platformGroup)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌缁戝畾鏈堝彴缁勬暟鎹�");
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
index 9ede393..dc508bd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
@@ -555,7 +555,7 @@
entity.setJobId(job.getJobId());
entity.setWmsJobId(job.getId());
entity.setContractNum(param.getContractNum());
- entity.setRepertotyAddress(job.getRepertotyAddress());
+ entity.setRepertotyAddress(param.getRepertotyAddress());
entity.setWmsJobId(job.getId());
entity.setStatus(Constants.ZERO);
entity.setIoQty(Constants.formatBigdecimal(d.getIoQty()).multiply(Constants.formatBigdecimal( d.getRate())));
--
Gitblit v1.9.3