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

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

@@ -1359,7 +1359,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 									contractVO.setZktotal(questDetailEntity.getStockNum());
 									contractVO.setOrderId(questDetailEntity.getOrderId());
 									contractVO.setOrderCode(questDetailEntity.getOrderCode());
-									contractVO.setIsZero(0);
+									contractVO.setIsZero(1);
 									contractVO.setIsInventory(0);
 									contractVO.setUnTotal(0);
 									if (questDetailEntity.getQuestTarget().equals(2)){
@@ -1391,7 +1391,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 								questDetailEntity.setWaybillNumber(stockArticleInfo.getWaybillNumber());
 								questDetailEntity.setWarehouseId(stockArticleInfo.getWarehouseId());
 								questDetailEntity.setQuestStatus(0);
-								questDetailEntity.setQuestTarget(1);
+								questDetailEntity.setQuestTarget(2);
 								questDetailEntity.setStockNum(stockArticleInfo.getHandQuantity());
 								questDetailEntity.setQuestType(3);
 								questDetailService.save(questDetailEntity);
@@ -1405,8 +1405,6 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 				//查询任务表  是否需要进行盘点任务数据的插入
 				List<QuestDetailEntity> inventoryQuestDetailEntityList = questDetailService.list(Wrappers.<QuestDetailEntity>query().lambda()
 					.eq(QuestDetailEntity::getQuestId, taskQuestId)
-					.like(QuestDetailEntity::getOrderCode, incomingBatch)
-					.or()
 					.eq(QuestDetailEntity::getIncomingBatch,incomingBatch)
 					.eq(QuestDetailEntity::getQuestType, 3)
 					.eq(QuestDetailEntity::getQuestTarget, 3)