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

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

@@ -51,6 +51,7 @@ public class TaskContractVO {
 	@ApiModelProperty(value = "是否是库存品 0- 否  1-是")
 	private Integer isInventory;
 
+
 	/**
 	 * 包件列表
 	 */

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

@@ -42,12 +42,29 @@ public class TaskPackagelistVO {
 	@ApiModelProperty(value = "订单号")
 	private Long orderId;
 
+
+	@ApiModelProperty(value = "盘点详情ID")
+	private Long questDetailId;
+
 	/**
 	 * 数量
 	 */
 	@ApiModelProperty(value = "数量")
 	private Integer quantity;
 
+	/**
+	 * 盘点方式
+	 */
+	@ApiModelProperty(value = "数量")
+	private Integer questTarget;
+
+
+	/**
+	 * 盘点任务状态
+	 */
+	@ApiModelProperty(value = "数量")
+	private Integer questStatus;
+
 	/**
 	 * 数量
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java

@@ -175,7 +175,8 @@ public class DistributionStockupController extends BladeController {
 	public R<List<User>> listUser() {
 		//获取当前登录用户
 		BladeUser user = AuthUtil.getUser();
-		List<User> cc = distributionStockupService.getRoleList(user.getDeptId(), user.getTenantId(), "拣货员");
+//		List<User> cc = distributionStockupService.getRoleList(user.getDeptId(), user.getTenantId(), "拣货员");
+		List<User> cc = distributionStockupService.getRoleList(user.getDeptId(), user.getTenantId(), "叉车");
 		return R.data(cc);
 	}
 

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

@@ -51,6 +51,9 @@ public class TaskSearchDTO {
 	@ApiModelProperty(value = "托盘ID")
 	private Long trayId;
 
+
+
+
 	/**
 	 * type
 	 */

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

@@ -1057,8 +1057,6 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 				positionCode = goodsAreaEntity.getHeadline() + "-" + basicdataGoodsShelfEntity.getGoodsShelfName() + "-" + goodsAllocationEntity.getGoodsAllocationName();
 			}
 		}
-
-
 		QuestDetailDTO questDetail = taskSearchDTO.getQuestDetail();
 		QuestDetailEntity questDetailEntity = new QuestDetailEntity();
 		BeanUtil.copy(questDetail, questDetailEntity);
@@ -1146,6 +1144,9 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 				packagelistVO.setMaterialName(questDetailEntity.getMaterialName());
 			}
 			packagelistVO.setAllocation(questDetailEntity.getPositionCode());
+			packagelistVO.setQuestDetailId(questDetailEntity.getId());
+			packagelistVO.setQuestStatus(questDetailEntity.getQuestStatus());
+			packagelistVO.setQuestTarget(questDetailEntity.getQuestTarget());
 			packagelistVO.setOrderCode(orderCode.get(0));
 			packagelistVO.setCurrentStatus("1");  // 默认在库
 			taskPackagelistVOS.add(packagelistVO);
@@ -1287,7 +1288,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 					.eq(QuestDetailEntity::getQuestId, taskQuestId)
 					.like(QuestDetailEntity::getOrderCode, incomingBatch)
 					.eq(QuestDetailEntity::getQuestType, 3)
-					.eq(QuestDetailEntity::getQuestTarget, 1)
+					.in(QuestDetailEntity::getQuestTarget, 1,2)
 					.eq(QuestDetailEntity::getWarehouseId, taskSearchDTO.getWarehouseId()));
 				if (Func.isNotEmpty(questDetailEntityList) && questDetailEntityList.size()>0){
 					TaskContractVO taskContractVO = new TaskContractVO();
@@ -1358,6 +1359,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 								}
 							});
 							taskContractVO.setZktotal(libNum.get());
+							taskContractVO.setIsZero(0);
+							taskContractVO.setIsInventory(0);
 						} else {
 							//查询任务表  是否需要进行盘点任务数据的插入
 							List<QuestDetailEntity> zeroQuestDetailEntityList = questDetailService.list(Wrappers.<QuestDetailEntity>query().lambda()
@@ -1409,6 +1412,9 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 								questDetailEntity.setStockNum(stockArticleInfo.getHandQuantity());
 								questDetailEntity.setQuestType(3);
 								questDetailService.save(questDetailEntity);
+								taskContractVO.setIsZero(1);
+								taskContractVO.setIsInventory(0);
+								taskContractVOS.add(taskContractVO);
 							}
 						}
 					}