YiWuProject.git

			@@ -13,7 +13,6 @@
			import com.mes.bigstorage.service.BigStorageCageDetailsService;
			import com.mes.bigstorage.service.BigStorageCageService;
			import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
			import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
			import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper;
			import com.mes.bigstoragetask.mapper.BigStorageCageOutTaskMapper;
			import com.mes.common.config.Const;
			@@ -59,8 +58,8 @@
			@Value("${mes.slotWidth}")
			private Integer slotWidth;

			@Value("${mes.galssGap}")
			private Integer galssGap;
			@Value("${mes.glassGap}")
			private Integer glassGap;

			/**
			* 查询进/出片任务
			@@ -131,7 +130,7 @@
			for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
			) {
			if (bigStorageCageDetails.getBigStorageCageFeedTask().getTaskState() == 0) {
			carWidth = carWidth - bigStorageCageDetails.getWidth() - galssGap;
			carWidth = carWidth - bigStorageCageDetails.getWidth() - glassGap;
			}
			}
			return carWidth;
			@@ -187,7 +186,7 @@
			if (glassInfo != null) {
			BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
			bigStorageCageDetails.setState(1);
			bigStorageCageDetails.setGap(galssGap);
			bigStorageCageDetails.setGap(glassGap);
			}
			List<BigStorageCageDetails> bigStorageCageDetailsList = new ArrayList<>();
			bigStorageCageDetailsList.add(bigStorageCageDetails);