~zhoushihao/YiWuProject.git

			@@ -11,9 +11,12 @@
			import com.mes.common.config.Const;
			import com.mes.hollow.entity.HollowBigStorageCageDetails;
			import com.mes.hollow.entity.HollowGlassOutRelationInfo;
			import com.mes.hollow.entity.dto.FlowCardGlassInfoDTO;
			import com.mes.hollow.entity.vo.HollowBigStorageDetailsQueryVO;
			import com.mes.hollow.service.HollowBigStorageCageDetailsService;
			import com.mes.hollow.service.HollowBigStorageCageService;
			import com.mes.hollow.service.HollowGlassOutRelationInfoService;
			import com.mes.hollow.service.HollowGlassRelationInfoService;
			import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
			import com.mes.hollowqueue.service.HollowGlassQueueInfoService;
			import com.mes.tools.WebSocketServer;
			@@ -48,6 +51,8 @@
			HollowBigStorageCageDetailsService hollowBigStorageCageDetailsService;
			@Resource
			BigStorageCageTaskService bigStorageCageTaskService;
			@Resource
			HollowGlassRelationInfoService hollowGlassRelationInfoService;

			@Autowired(required = false)
			MiloService miloService;
			@@ -139,7 +144,7 @@
			task.setGlassId(requestWord.getValue() + "");
			int isExistCount = hollowBigStorageCageDetailsService.count(new LambdaQueryWrapper<HollowBigStorageCageDetails>().in(HollowBigStorageCageDetails::getGlassId, task.getGlassId())
			.in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO));
			if (isExistCount > 0) {
			if (isExistCount > 0 && "0".equals(targetSlotWord.getValue() + "")) {
			task.setIsSame(1);
			} else {
			task.setIsSame(0);
			@@ -197,6 +202,11 @@
			//理片笼使用情况
			List<Map<String, Object>> bigStorageCageUsage = hollowBigStorageCageService.selectBigStorageCageUsage();
			jsonObject.append("bigStorageCageUsage", bigStorageCageUsage);

			//理片笼使用情况汇总
			HollowBigStorageDetailsQueryVO hollowBigStorageDetailsQueryVO=new HollowBigStorageDetailsQueryVO();
			Map<String, FlowCardGlassInfoDTO> bigStorageCageUsageSummary= hollowGlassRelationInfoService.queryHollowAllFlowCardSummary(hollowBigStorageDetailsQueryVO);
			jsonObject.append("bigStorageCageUsageSummary", bigStorageCageUsageSummary);
			}

			}