YiWuProject.git

			@@ -4,6 +4,10 @@
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.github.yulichang.query.MPJQueryWrapper;
			import com.mes.common.S7object;
			import com.mes.damage.entity.Damage;
			import com.mes.damage.service.DamageService;
			import com.mes.device.PlcParameterObject;
			import com.mes.downglassinfo.entity.DownGlassInfo;
			import com.mes.downglassinfo.mapper.DownGlassInfoMapper;
			import com.mes.downglassinfo.service.DownGlassInfoService;
			@@ -15,6 +19,7 @@
			import com.mes.downworkstation.mapper.DownWorkstationTaskMapper;
			import com.mes.downworkstation.service.DownWorkstationService;
			import com.mes.downworkstation.service.DownWorkstationTaskService;
			import com.mes.glassinfo.service.GlassInfoService;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			@@ -31,7 +36,7 @@

			@Autowired
			private DownWorkstationMapper downWorkstationMapper;
			@Autowired(required=false)
			@Autowired(required = false)
			private DownWorkstationTaskMapper downWorkstationTaskMapper;
			@Autowired
			private DownGlassInfoService downGlassInfoService;
			@@ -39,7 +44,10 @@
			private DownGlassInfoMapper downGlassInfoMapper;
			@Autowired
			private DownGlassTaskService downGlassTaskService;

			@Autowired
			private GlassInfoService glassInfoService;
			@Autowired
			private DamageService damageservice;

			@Autowired
			private DownWorkstationTaskService downWorkstationTaskService;
			@@ -61,17 +69,17 @@

			//工位显示
			@Override
			public List<Map<String, Object>> getTotalGlassDimensionsByWorkstation(int start,int end) {
			public List<Map<String, Object>> getTotalGlassDimensionsByWorkstation(int start, int end) {
			MPJQueryWrapper<DownWorkstation> queryWrapper = new MPJQueryWrapper<>();
			queryWrapper.select("t.workstation_id", "t.flow_card_id", "COALESCE(SUM(b.width), 0) AS totalwidth", "COALESCE(SUM(b.height), 0) AS totalheight")
			queryWrapper.select("t.workstation_id", "t.flow_card_id", "COALESCE(SUM(b.width), 0) AS totalwidth", "COALESCE(SUM(b.height), 0) AS totalheight,total_quantity,racks_number,other_number")
			.leftJoin("down_glass_info b on t.flow_card_id = b.flow_card_id")
			.groupBy("t.workstation_id", "t.flow_card_id")
			.orderByAsc("t.workstation_id").between("t.workstation_id", start, end)

			;

			List<DownWorkstionAndDownGlassinfo> workstationList = downWorkstationMapper.selectJoinList(DownWorkstionAndDownGlassinfo.class, queryWrapper);
			// List<DownWorkstionAndDownGlassinfo> workstationList = null;
			List<DownWorkstionAndDownGlassinfo> workstationList = downWorkstationMapper.selectJoinList(DownWorkstionAndDownGlassinfo.class, queryWrapper);
			// List<DownWorkstionAndDownGlassinfo> workstationList = null;
			List<Map<String, Object>> result = new ArrayList<>();
			for (DownWorkstionAndDownGlassinfo downWorkstionAndDownGlassinfo : workstationList) {
			Map<String, Object> rack = new HashMap<>();
			@@ -80,6 +88,11 @@
			item.put("width", downWorkstionAndDownGlassinfo.getTotalwidth());
			item.put("fillColor", "yellow");
			item.put("content", downWorkstionAndDownGlassinfo.getFlowCardId());
			if (downWorkstionAndDownGlassinfo.getTotalQuantity() == downWorkstionAndDownGlassinfo.getRacksNumber() + downWorkstionAndDownGlassinfo.getRacksNumber()) {
			item.put("fullCardColor", "red");
			} else {
			item.put("fullCardColor", "blue");
			}

			// 查询 DownGlassInfo 并添加到 item 中
			MPJQueryWrapper<DownGlassInfo> glassInfoQueryWrapper = new MPJQueryWrapper<>();
			@@ -88,7 +101,7 @@
			List<DownGlassInfo> downGlassInfoList = downGlassInfoMapper.selectList(glassInfoQueryWrapper);


			if (!downGlassInfoList.isEmpty()) {
			if (!downGlassInfoList.isEmpty()) {

			item.put("downGlassInfoList", downGlassInfoList);

			@@ -97,7 +110,7 @@
			rack.put("item", item);
			result.add(rack);
			}
			log.info("result"+(result));
			log.info("result" + (result));
			return result; // 返回最终结果
			}

			@@ -135,13 +148,22 @@


			@Override
			public int updateFlowCardIdAndCount(String flowCardId, int glassInfoCount, int workstationId) {
			public void updateFlowCardIdAndCount(String flowCardId, int workstationId, int layer) {
			int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId, layer);
			QueryWrapper<Damage> queryWrapper = new QueryWrapper<>();
			queryWrapper.eq("process_id", flowCardId);
			queryWrapper.eq("technology_number", layer);

			int otherNumber = damageservice.count(queryWrapper);
			UpdateWrapper<DownWorkstation> updateWrapper = new UpdateWrapper<>();
			updateWrapper.set("total_quantity", glassInfoCount)
			.set("flow_card_id", flowCardId)
			.set("layer", layer)
			.set("other_number", otherNumber)
			.eq("workstation_id", workstationId);

			return baseMapper.update(new DownWorkstation(), updateWrapper);
			this.update(updateWrapper);

			}

			@Override
			@@ -154,9 +176,6 @@

			baseMapper.update(new DownWorkstation(), updateWrapper);
			}





			@Override
			@@ -179,6 +198,30 @@
			}


			@Override
			public boolean updateDownWorkstationstate(DownWorkstation downWorkstation) {

			DownWorkstation downWork = baseMapper.selectById(downWorkstation.getId());

			if (downWork != null) {

			downWork.setEnableState(downWorkstation.getEnableState());

			baseMapper.updateById(downWork);

			return true;
			} else {

			return false;
			}
			}

			@Override
			public String closeAlarmSignal() {
			PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
			S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("alarm_signal").getAddress(), 0);
			return "success";
			}


			}