From eb5c3201f68ed53c8a5b88cae0c2310c5a1b5cff Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Mon, 16 Oct 2023 11:55:35 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=BA=93=E4=BD=8D=E4=BF=AE=E6=94=B9=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BasicdataDriverArteryController.java  | 12 ++++++------
 .../service/impl/BasicdataCodeServiceImpl.java       |  1 +
 .../com/logpm/warehouse/mapper/TaskQuestMapper.xml   |  6 +++---
 .../warehouse/service/impl/TaskQuestServiceImpl.java |  3 ++-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java
index c77079d52..2352d532d 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java
@@ -44,7 +44,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.system.entity.User;
 import org.springblade.system.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.handler.UserRoleAuthorizationInterceptor;
+
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
@@ -130,11 +130,11 @@ public class BasicdataDriverArteryController extends BladeController {
 		}
 
 		String phone = basicdataDriverArtery.getPhone();
-		R<User> userR = userClient.userInfoByPhone(AuthUtil.getUser().getTenantId(), phone);
-		if (Func.isNotEmpty(userR.getData())){
-			User user = userR.getData();
-			basicdataDriverArtery.setUserId(user.getId());
-		}
+//		R<User> userR = userClient.userInfoByPhone(AuthUtil.getUser().getTenantId(), phone);
+//		if (Func.isNotEmpty(userR.getData())){
+//			User user = userR.getData();
+//			basicdataDriverArtery.setUserId(user.getId());
+//		}
 		boolean save = basicdataDriverArteryService.save(basicdataDriverArtery);
 		//加入关联表
 		if (null !=basicdataDriverArtery.getBindVehicles()&& save){
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java
index c961c2fde..1414f6784 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java
@@ -124,6 +124,7 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService {
 		Long incr = bladeRedis.incr(key);
 		//托盘码查重
 		BasicdataTrayEntity basicdataTrayEntity = basicdataTrayMapper.selectOne(new QueryWrapper<BasicdataTrayEntity>().lambda()
+				.eq(BasicdataTrayEntity::getIsDeleted,0)
 			.like(BasicdataTrayEntity::getPalletCode,HTCD)
 			.orderByDesc(BasicdataTrayEntity::getCreateTime)
 			.last("limit 1"));
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml
index 3fc6ca2c1..ca82dc181 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml
@@ -69,17 +69,17 @@
         FROM
             logpm_quest_detail lqd
         <where>
-             lqd.quest_type =2 and lqd.is_deleted =0 and (lqd.quest_status = 0 or lqd.quest_status = 1)
+             lqd.quest_type =2 and lqd.is_deleted =0 and (lqd.quest_status = 0 or lqd.quest_status = 1) and  lqd.quest_id = #{param.questId}
             <if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">
                 and lqd.warehouse_id in
                 <foreach collection="collect" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="param.code != null and param.code != '' and param.type =1 ">
+            <if test="param.code != null and param.code != '' and param.type ==1 ">
                 and lqd.position_code  like concat('%',#{param.code},'%')
             </if>
-            <if test="param.code != null and param.code != '' and  param.type =2 ">
+            <if test="param.code != null and param.code != '' and  param.type ==2 ">
                 and lqd.allocation_id   = #{param.code}
             </if>
         </where>
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java
index c81bf0153..69cbb1016 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java
@@ -191,7 +191,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 	@Override
 	public IPage<TaskQuestApiVO> selectTaskQuestApiPage(IPage<TaskQuestApiVO> page, TaskQuestApiVO taskQuest) {
-
+//		baseMapper.setSqlMode();
 		List<Long> collect = this.getmyWarehouseList();
 		List<TaskQuestApiVO> taskQuestVOS = baseMapper.selectTaskQuestApiPage(page, taskQuest, collect);
 		for (TaskQuestApiVO taskQuestVO : taskQuestVOS) {
@@ -213,6 +213,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	@Override
 	public IPage<TaskallocationVO> selectallocationList(IPage<TaskallocationVO> page, TaskSearchDTO taskSearchDTO) {
 		List<Long> collect = this.getmyWarehouseList();
+		baseMapper.setSqlMode();
 		List<TaskallocationVO> list = baseMapper.selectallocationList(page, taskSearchDTO, collect);
 		if (!list.isEmpty()) {
 			for (TaskallocationVO taskallocationVO : list) {