HangZhouMes.git

			@@ -5,7 +5,6 @@
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.github.yulichang.query.MPJQueryWrapper;
			import com.mes.common.S7object;
			import com.mes.common.utils.RedisUtil;
			import com.mes.damage.entity.Damage;
			import com.mes.damage.service.DamageService;
			import com.mes.device.PlcParameterObject;
			@@ -19,6 +18,7 @@
			import com.mes.downworkstation.service.DownWorkstationService;
			import com.mes.downworkstation.service.DownWorkstationTaskService;
			import com.mes.glassinfo.service.GlassInfoService;
			import com.mes.utils.RedisUtil;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			@@ -86,7 +86,7 @@
			item.put("width", downWorkstionAndDownGlassinfo.getTotalwidth());
			item.put("fillColor", "yellow");
			item.put("content", downWorkstionAndDownGlassinfo.getFlowCardId());
			if (downWorkstionAndDownGlassinfo.getFlowCardId() != "" && downWorkstionAndDownGlassinfo.getFlowCardId() != null && downWorkstionAndDownGlassinfo.getTotalQuantity() == downWorkstionAndDownGlassinfo.getRacksNumber() + downWorkstionAndDownGlassinfo.getRacksNumber()) {
			if (downWorkstionAndDownGlassinfo.getFlowCardId() != "" && downWorkstionAndDownGlassinfo.getFlowCardId() != null && downWorkstionAndDownGlassinfo.getTotalQuantity() == downWorkstionAndDownGlassinfo.getRacksNumber() + downWorkstionAndDownGlassinfo.getOtherNumber()) {
			item.put("fullCardColor", "red");
			} else {
			item.put("fullCardColor", "blue");