修改盘点添加，查询字段

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockListVO.java

@@ -117,6 +117,11 @@ public class DistributionStockListVO extends DistributionStockListEntity {
 	 */
 	@ApiModelProperty(value = "货位信息")
 	private String positionCode;
+	/**
+	 * 品牌名称
+	 */
+	@ApiModelProperty(value = "品牌名称")
+	private String brandName;
 	/**
 	 * 类型
 	 */

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

@@ -24,6 +24,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -115,6 +116,18 @@ public class QuestDetailEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "品类名称;对应零担")
 	private String categoryName;
+
+	/**
+	 * 发站仓名称
+	 */
+	@ApiModelProperty(value = "发站仓名称")
+	private String sendWarehouseName;
+
+	/**
+	 * 品牌名称
+	 */
+	@ApiModelProperty(value = "品牌名称")
+	private String brandName;
 	/**
 	 * 库存品ID;对应库存品
 	 */
@@ -172,8 +185,7 @@ public class QuestDetailEntity extends TenantEntity {
 	/**
 	 * 托盘名称
 	 */
-	@ApiModelProperty(value = "托盘码")
+	@ApiModelProperty(value = "托盘名称")
-	@TableField(exist = false)
 	private String trayName;
 
 	/**
@@ -227,6 +239,23 @@ public class QuestDetailEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "批次号")
 	private String incomingBatch;
+	/**
+	 * 盘点人
+	 */
+	@ApiModelProperty(value = "盘点人")
+	private Long inventoryUser;
+
+	/**
+	 * 盘点时间
+	 */
+	@ApiModelProperty(value = "盘点时间")
+	private Date inventoryTime;
+	@ApiModelProperty(value = "盘点开始时间")
+	@TableField(exist = false)
+	private String  startTime;// 开始时间
+	@ApiModelProperty(value = "盘点结束时间")
+	@TableField(exist = false)
+	private  String endTime;// 结束时间
 
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml

@@ -36,7 +36,7 @@
 
     <select id="getParcelListInfo" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
         select ldsa.mall_name mallName,ldpl.order_code orderCode,ldpl.id,ldpl.conditions,ldpl.order_package_code orderPackageCode,ldsa.id stockArticleId,
-        ldsa.mall_id mallId,ldsa.genre ,ldsa.is_zero isZero,
+        ldsa.mall_id mallId,ldsa.genre ,ldsa.is_zero isZero,ldpl.send_warehouse_name sendWarehouseName,ldpl.second,ldpl.third_product thirdProduct,
         ldpl.waybill_number waybillNumber,ldpl.firsts,ldpl.quantity,ldpl.warehouse_id warehouseId,ldpl.material_name materialName,ldpl.material_code materialCode,
             CASE   WHEN ldpl.conditions = 1 THEN
             (select GROUP_CONCAT(tray_id)
@@ -94,7 +94,7 @@
         (select GROUP_CONCAT(DISTINCT id)
         from logpm_distribution_stock_list
         where material_id = ldpl.material_id and incoming_batch = ldpl.order_code and market_id = ldsa.mall_id)
-        END  stockId
+        END  stockId ,ldsa.brand brandName
 
         from logpm_distribution_stock_article ldsa
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml

@@ -96,7 +96,7 @@
     <select id="getStockListInfo" resultType="com.logpm.distribution.vo.DistributionStockListVO">
         select ldsl.market_name marketName,ldsl.incoming_batch incomingBatch,ldsl.quantity_stock quantityStock,ldsl.warehouse_id warehouseId,
         ldsl.description_goods descriptionGoods,ldsl.cargo_number cargoNumber,ldsl.market_id marketId,ldsl.material_id materialId,
-        ldsl.id id
+        ldsl.id id,ldsl.brand_name brandName
         from logpm_distribution_stock_list ldsl
         <where>
             ldsl.warehouse_id = #{par.warehouseId} and ldsl.quantity_stock > 0 and ldsl.source_type = 2

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

@@ -136,7 +136,7 @@ public class TaskQuestController extends BladeController {
 
 
 	/**
-	 * 查询盘点明细数据
+	 * 盘点任务 查询盘点明细数据
  	 * @return
 	 */
 	@GetMapping("/getDetailInfo")
@@ -148,7 +148,7 @@ public class TaskQuestController extends BladeController {
 	}
 
 	/**
-	 * 查询盘点对比数据
+	 *盘点任务 查询盘点对比数据
  	 * @return
 	 */
 	@GetMapping("/getContrastInfo")
@@ -161,7 +161,7 @@ public class TaskQuestController extends BladeController {
 
 
 	/**
-	 * 查询盘点对比数据
+	 * 导出数据 查询盘点对比数据
  	 * @return
 	 */
 	@GetMapping("/export-getContrastInfo")

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/QuestDetailDTO.java

@@ -49,6 +49,11 @@ public class QuestDetailDTO extends QuestDetailEntity {
 
 	private String cargoName;//盘点的包件状态名称
 
+	private String  startTime;// 开始时间
+
+	private  String endTime;// 结束时间
+
+
 
 
 }

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

@@ -118,6 +118,11 @@
         `incoming_batch` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '批次号（库存品）',
         `material_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物料名称(库存品)',
         `waybill_number` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '运单号',
+        `send_warehouse_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发站仓名称',
+        `tray_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '托盘名称',
+        `brand_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '品牌名称',
+        `inventory_time` datetime(0) NULL DEFAULT NULL COMMENT '盘点时间',
+        `inventory_user`  bigint(20) NULL DEFAULT NULL COMMENT '盘点人',
         PRIMARY KEY (`id`) USING BTREE,
         INDEX `quest_id_index`(`quest_id`,`tenant_id`) USING BTREE COMMENT '任务id',
         INDEX `order_id_index`(`order_id`) USING BTREE COMMENT '订单id',
@@ -133,14 +138,14 @@
         `is_deleted`, `status`, `reserve1`, `reserve2`, `reserve3`, `reserve4`, `reserve5`, `order_code`, `quest_id`, `order_id`, `quest_type`, `quest_target`,
         `order_package_code`, `order_package_id`, `category_name`, `stock_id`, `quest_status`, `stock_num`, `warehouse_id`, `position_code`, `tray_code`, `tray_id`,
         `allocation_id`, `grounding_allocation_id`, `is_new`, `grounding_position_code`, `material_code`, `market_name`, `firsts`, `second`,
-        `third_product`, `incoming_batch`, `material_name`, `waybill_number`)  VALUES
+        `third_product`, `incoming_batch`, `material_name`, `waybill_number`,`send_warehouse_name`,`tray_name`,`brand_name`)  VALUES
         <foreach collection="list"  item="item"  separator=",">
             (#{item.id}, #{item.tenantId}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime}, #{item.createDept}, #{item.isDeleted}
             , #{item.status}, #{item.reserve1}, #{item.reserve2}, #{item.reserve3}, #{item.reserve4}, #{item.reserve5}, #{item.orderCode}, #{item.questId}, #{item.orderId}
             , #{item.questType}, #{item.questTarget}, #{item.orderPackageCode}, #{item.orderPackageId}, #{item.categoryName}, #{item.stockId}, #{item.questStatus},
             #{item.stockNum}, #{item.warehouseId}  , #{item.positionCode}, #{item.trayCode}, #{item.trayId}, #{item.allocationId},  #{item.groundingAllocationId},
             #{item.isNew}, #{item.groundingPositionCode}, #{item.materialCode}, #{item.marketName} , #{item.firsts} , #{item.second} ,
-            #{item.thirdProduct} , #{item.incomingBatch},  #{item.materialName}, #{item.waybillNumber}
+            #{item.thirdProduct} , #{item.incomingBatch},  #{item.materialName}, #{item.waybillNumber}, #{item.sendWarehouseName},#{item.trayName},#{item.brandName}
             )
         </foreach>
 
@@ -235,11 +240,17 @@
             <if test="param.allocationId  != null and param.allocationId != ''">and allocation_id =#{param.allocationId } </if>
             <if test="param.trayId  != null and param.trayId != ''">and tray_id =#{param.trayId } </if>
             <if test="param.orderCode  != null and param.orderCode != ''">and order_code like concat('%',#{param.orderCode },'%') </if>
-            <if test="param.categoryName  != null and param.categoryName != ''">and category_name like concat('%'#{param.categoryName },'%') </if>
+            <if test="param.categoryName  != null and param.categoryName != ''">and category_name like concat('%',#{param.categoryName },'%') </if>
             <if test="param.materialCode  != null and param.materialCode != ''">and material_code like concat('%',#{param.materialCode },'%') </if>
             <if test="param.trayCode  != null and param.trayCode != ''">and tray_code like concat('%',#{param.trayCode },'%') </if>
+            <if test="param.trayName  != null and param.trayName != ''">and tray_name like concat('%',#{param.trayName },'%') </if>
+            <if test="param.brandName  != null and param.brandName != ''">and brand_name like concat('%',#{param.brandName },'%') </if>
             <if test="param.marketName  != null and param.marketName != ''">and market_name  like concat('%',#{param.marketName},'%') </if>
+            <if test="param.materialName  != null and param.materialName != ''">and material_name  like concat('%',#{param.materialName},'%') </if>
+            <if test="param.positionCode  != null and param.positionCode != ''">and position_code  like concat('%',#{param.positionCode},'%') </if>
             <if test="param.orderPackageCode  != null and param.orderPackageCode != ''">and order_package_code =#{param.orderPackageCode } </if>
+            <if test="param.inventoryUser  != null and param.inventoryUser != ''">and inventory_user like concat('%',#{param.inventoryUser },'%') </if>
+            <if test="param.startTime  != null and param.startTime != ''">  and inventory_time  BETWEEN  #{param.startTime } and #{param.endTime}</if>
             <if test="param.marketNames != null">
                 and material_name in
                 <foreach collection="param.marketNames" item="a" open="(" close=")" separator=",">
@@ -304,6 +315,8 @@
                   <if test="item.allocationId != null and item.allocationId != null">allocation_id = #{item.allocationId },</if>
                   <if test="item.updateUser != null and item.updateUser != null">update_user = #{item.updateUser },</if>
                   <if test="item.updateTime != null and item.updateTime != null">update_time = #{item.updateTime },</if>
+                  <if test="item.inventoryUser != null and item.inventoryUser != null">inventory_user = #{item.inventoryUser },</if>
+                  <if test="item.inventoryTime != null ">inventory_time = #{item.inventoryTime }, </if>
                 <!--  <if test="item. != null and item. != null"> = #{item. }</if>
                   <if test="item. != null and item. != null"> = #{item. }</if>
                   <if test="item. != null and item. != null"> = #{item. }</if>

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

@@ -177,6 +177,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	BladeUser user = AuthUtil.getUser();
 	if(!parcelListInfo.isEmpty()){
 		List<QuestDetailEntity> detailEntityList = new ArrayList<>();
+		//查询查询托盘名称
+		List<BasicdataTrayEntity> trayEntityList = basicdataTrayClient.getTrayEntityList();
 		parcelListInfo.forEach( i ->{
 
 			QuestDetailEntity detailEntity = new QuestDetailEntity();
@@ -190,8 +192,20 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			detailEntity.setQuestId(taskQuest);
 			detailEntity.setOrderCode(i.getOrderCode());
 			detailEntity.setOrderId(i.getStockArticleId());
+			detailEntity.setSendWarehouseName(i.getSendWarehouseName());
+			detailEntity.setBrandName(i.getBrandName());
 //					detailEntity.setQuestType();
 			//盘点对象;1.定制品 2零担 3 库存品
+			//查询托盘名称
+			if(ObjectUtils.isNotNull(i.getTrayId())){
+//				boolean b = trayEntityList.stream().anyMatch(a -> i.getTrayId().equals(String.valueOf(a.getId()) ));
+//				log.info("托盘是否有值>>>>>>>>>>{}",b);
+				Optional<BasicdataTrayEntity> first = trayEntityList.stream().filter(t -> i.getTrayId().equals(String.valueOf(t.getId()))).findFirst();
+				if(first.isPresent()){
+					BasicdataTrayEntity basicdataTrayEntity = first.get();
+					detailEntity.setTrayName(basicdataTrayEntity.getPalletName());
+				}
+			}
 			if(ObjectUtils.isNotNull(i.getConditions()) && i.getConditions().equals(1) ){
 				detailEntity.setQuestTarget(i.getConditions());
 			}else if(ObjectUtils.isNotNull(i.getConditions()) && i.getConditions().equals(2)){
@@ -356,6 +370,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			detailEntity.setIncomingBatch(i.getOrderCode());
 			detailEntity.setWarehouseId(i.getWarehouseId());
 			detailEntity.setIsNew(0);
+			detailEntity.setBrandName(i.getBrand());
 			//查询货位
 			QueryWrapper<WarehouseUpdownGoodsEntity> qw = new QueryWrapper<>();
 			qw.eq("warehouse_id",i.getWarehouseId());
@@ -436,6 +451,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			detailEntity.setIncomingBatch(i.getOrderCode());
 			detailEntity.setWarehouseId(i.getWarehouseId());
 			detailEntity.setIsNew(0);
+			detailEntity.setBrandName(i.getBrandName());
 			//查询货位
 			QueryWrapper<WarehouseUpdownGoodsEntity> qw = new QueryWrapper<>();
 			qw.eq("warehouse_id",i.getWarehouseId());
@@ -719,24 +735,26 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 				log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> tag {}",i);
 
 				//查询当前包件盘点状态
-				boolean b = questDetailList.stream().anyMatch(q -> q.getId().equals(i) && q.getQuestStatus().equals(1));
+//				boolean b = questDetailList.stream().anyMatch(q -> q.getId().equals(i) && q.getQuestStatus().equals(1));
-				if(b){
+//				if(b){
-					s.set(true);
+//					s.set(true);
-				}
+//				}
 				QuestDetailEntity questDetail = new QuestDetailEntity();
 				questDetail.setId(Long.valueOf(i));
 				questDetail.setQuestStatus(1);
 				questDetail.setUpdateUser(user.getUserId());
 				questDetail.setUpdateTime(new Date());
+				questDetail.setInventoryUser(user.getUserId());
+				questDetail.setInventoryTime(new Date());
 //				questDetail.setId(Long.valueOf(i));
 //				questDetail.setQuestStatus(1);
 				list.add(questDetail);
 			});
 			log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> tag {}",1);
 
-			if(s.get()){
+//			if(s.get()){
-				return Resp.scanFail("包含已盘点的数据！请勿重复提交！","包含已盘点的数据！请勿重复提交！");
+//				return Resp.scanFail("包含已盘点的数据！请勿重复提交！","包含已盘点的数据！请勿重复提交！");
-			}
+//			}
 			baseMapper.updatePositionCodeList(questNum,list);
 		}
 		//处理盘点的包件
@@ -867,7 +885,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			QuestDetailVO questDetailVO = new QuestDetailVO();
 			BeanUtil.copyProperties(i,questDetailVO);
 			//查询包件信息
-			if(ObjectUtils.isNotNull(i.getOrderPackageId()) ){
+			/*if(ObjectUtils.isNotNull(i.getOrderPackageId()) ){
 
 				DistributionParcelListEntity parcelListId = distributionParcelListClient.getParcelListId(String.valueOf(i.getOrderPackageId()));
 				if(ObjectUtils.isNotNull(parcelListId)){
@@ -878,7 +896,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 					questDetailVO.setMaterialCode(parcelListId.getMaterialCode());
 					questDetailVO.setBrandName(parcelListId.getBrandName());
 				}
-			}else if(i.getQuestTarget().equals(2)){
+			}else*/
+			/*	if(i.getQuestTarget().equals(2)){
 				//零担
 				DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
 				stockArticleEntity.setWarehouseId(i.getWarehouseId());
@@ -901,14 +920,14 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 					questDetailVO.setMaterialCode(stockListById.getCargoNumber () );
 					questDetailVO.setBrandName(stockListById.getBrandName());
 				}
-			}
+			}*/
-			if(ObjectUtils.isNotNull(i.getTrayId())){
+			/*if(ObjectUtils.isNotNull(i.getTrayId())){
 				//查询托盘名称
 				List<BasicdataTrayEntity> trayEntityList = basicdataTrayClient.getTrayEntityList(i.getTrayId());
 				if(ObjectUtils.isNotNull(trayEntityList)){
 				questDetailVO.setTrayName(trayEntityList.get(0).getPalletName());
 				}
-			}
+			}*/
 			if(!i.getQuestStatus().equals(0)){
 				R<List<User>> listR = userSearchClient.listByUser(String.valueOf(i.getUpdateUser()));
 				if(ObjectUtils.isNotNull(listR.getData())){