Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailChildEntity.java

@@ -20,7 +20,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java

@@ -18,10 +18,12 @@ package com.logpm.warehouse.vo;
 
 import com.logpm.warehouse.entity.QuestDetailChildEntity;
 import com.logpm.warehouse.entity.QuestDetailEntity;
-import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import java.util.List;
 
 /**
@@ -41,4 +43,8 @@ public class QuestDetailVO extends QuestDetailEntity {
 
 
 
+	/**
+	 * 盘点明细子表List
+	 */
+	List<QuestDetailChildEntity> list = new ArrayList<>();
 }

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskQuestVO.java

@@ -16,10 +16,8 @@
  */
 package com.logpm.warehouse.vo;
 
-import com.logpm.warehouse.entity.TaskQuestChildEntity;
 import com.logpm.warehouse.entity.TaskQuestEntity;
 import io.swagger.annotations.ApiModelProperty;
-import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -58,4 +56,10 @@ public class TaskQuestVO extends TaskQuestEntity {
 	 */
 	@ApiModelProperty(value = "子表（商场）")
 	List<TaskQuestChildVO> list = new ArrayList<>();
+
+	/**
+	 * 子表（盘点详情）
+	 */
+	@ApiModelProperty(value = "子表（盘点详情）")
+	List<QuestDetailVO> questDetailVOList = new ArrayList<>();
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java

@@ -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){

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java

@@ -17,6 +17,7 @@
 package com.logpm.warehouse.controller;
 
 import com.logpm.warehouse.dto.TaskQuestDTO;
+import com.logpm.warehouse.vo.QuestDetailVO;
 import com.logpm.warehouse.wrapper.TaskQuestVOWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -72,6 +73,41 @@ public class TaskQuestController extends BladeController {
 		return R.data(TaskQuestWrapper.build().entityVO(detail));
 	}
 
+
+
+	/**
+	 * 盘点任务 任务下的包条
+	 */
+	@GetMapping("/SelectStrip")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入taskQuest")
+	public R<IPage<QuestDetailVO>> SelectStrip(Long id, Query query) {
+		IPage<QuestDetailVO> list = taskQuestService.SelectStrip(Condition.getPage(query),id);
+		return R.data(list);
+	}
+
+	/**
+	 * 盘点任务 任务下的库存品
+	 */
+	@GetMapping("/SelectInventory")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入id")
+	public R<IPage<QuestDetailVO>> SelectInventory(Long id,Query query) {
+		IPage<QuestDetailVO> list = taskQuestService.SelectInventory(Condition.getPage(query),id);
+		return R.data(list);
+	}
+
+	/**
+	 * 盘点任务 任务下的零担
+	 */
+	@GetMapping("/SelectZreo")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入id")
+	public R<IPage<QuestDetailVO>> SelectZero(Long id,Query query) {
+		IPage<QuestDetailVO> list = taskQuestService.SelectZero(Condition.getPage(query),id);
+		return R.data(list);
+	}
+
 	/**
 	 * 盘点任务 分页
 	 */

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java

@@ -76,4 +76,10 @@ public interface TaskQuestMapper extends BaseMapper<TaskQuestEntity> {
 	 * @return
 	 */
 	List<WarehouseTrayEntity> selectZeroOrderTratInfo(@Param("stockArticleId") Long id,@Param("warehouseId") Long warehouseId);
+
+	IPage<QuestDetailVO> selectStripListByQuestId(IPage<TaskQuestVO> page,@Param("questId") Long id);
+
+	IPage<QuestDetailVO> selectInventoryListByQuestId(IPage<TaskQuestVO> page,@Param("questId") Long id);
+
+	IPage<QuestDetailVO> selectZeroListByQuestId(IPage<TaskQuestVO> page,@Param("questId") Long id);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml

@@ -139,6 +139,43 @@
     <select id="selectZeroOrderTratInfo" resultType="com.logpm.warehouse.entity.WarehouseTrayEntity">
         select id,tray_code AS palletCode From logpm_warehouse_tray_goods WHERE association_type = '1' AND association_id = #{stockArticleId} and warehouse_id =#{warehouseId}
     </select>
+    <select id="selectStripListByQuestId" resultType="com.logpm.warehouse.vo.QuestDetailVO">
+        SELECT
+            lqd.*,
+               (select lqdc.id id from logpm_quest_detail_child lqdc where lqd.id = lqdc.quest_detail_id and lqdc.is_deleted =0) list
+        FROM
+            logpm_quest_detail lqd
+                JOIN logpm_distribution_parcel_list ldpl ON lqd.order_package_id = ldpl.id
+                AND lqd.quest_target =1
+        <where>
+            lqd.is_deleted =0 and lqd.quest_id = #{questId}
+        </where>
+    </select>
+    <select id="selectInventoryListByQuestId" resultType="com.logpm.warehouse.vo.QuestDetailVO">
+        SELECT
+            lqd.*,
+        (select lqdc.id id from logpm_quest_detail_child lqdc where lqd.id = lqdc.quest_detail_id and lqdc.is_deleted =0) list
+        FROM
+            logpm_quest_detail lqd
+                JOIN logpm_distribution_stock_list ldsl ON lqd.stock_id = ldsl.id
+                AND lqd.incoming_batch = ldsl.incoming_batch
+                AND lqd.quest_target =3
+        <where>
+            lqd.is_deleted =0 and lqd.quest_id = #{questId}
+        </where>
+    </select>
+    <select id="selectZeroListByQuestId" resultType="com.logpm.warehouse.vo.QuestDetailVO">
+        SELECT
+            lqd.*,
+        (select lqdc.id id from logpm_quest_detail_child lqdc where lqd.id = lqdc.quest_detail_id and lqdc.is_deleted =0) list
+        FROM
+            logpm_quest_detail lqd
+                JOIN logpm_distribution_stock_article ldsa ON lqd.order_id = ldsa.id
+                AND lqd.quest_target =2
+        <where>
+            lqd.is_deleted =0 and lqd.quest_id = #{questId}
+        </where>
+    </select>
 
 
 </mapper>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java

@@ -103,4 +103,10 @@ public interface ITaskQuestService extends BaseService<TaskQuestEntity> {
 	 */
 	R trayListInfo(IPage<Object> page, TaskSearchDTO taskSearchDTO);
 	void saveNewQuestDetail(TaskSearchDTO taskSearchDTO);
+
+	IPage <QuestDetailVO> SelectStrip(IPage<TaskQuestVO> page,Long id);
+
+	IPage <QuestDetailVO> SelectInventory(IPage<TaskQuestVO> page,Long id);
+
+	IPage <QuestDetailVO> SelectZero(IPage<TaskQuestVO> page,Long id);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

@@ -1027,6 +1027,24 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		questDetailService.save(questDetailEntity);
 	}
 
+	@Override
+	public IPage<QuestDetailVO> SelectStrip(IPage<TaskQuestVO> page,Long id) {
+		IPage<QuestDetailVO> questDetailVOList = baseMapper.selectStripListByQuestId(page,id);
+		return questDetailVOList;
+	}
+
+	@Override
+	public IPage<QuestDetailVO> SelectInventory(IPage<TaskQuestVO> page,Long id) {
+		IPage<QuestDetailVO> questDetailVOList = baseMapper.selectInventoryListByQuestId(page,id);
+		return questDetailVOList;
+	}
+
+	@Override
+	public IPage<QuestDetailVO> SelectZero(IPage<TaskQuestVO> page,Long id) {
+		IPage<QuestDetailVO> questDetailVOList = baseMapper.selectZeroListByQuestId(page,id);
+		return questDetailVOList;
+	}
+
 
 	private QuestDetailChildEntity addQuestDetailChild(Integer num,String cargoName,Long questDetaiId,Long warehouseId){
 		QuestDetailChildEntity questDetailChildEntity = new QuestDetailChildEntity();