YiWuProject.git

			@@ -10,7 +10,6 @@
			import com.mes.downglassinfo.mapper.DownGlassInfoMapper;
			import com.mes.downglassinfo.service.DownGlassInfoService;
			import com.mes.downglassinfo.service.DownGlassTaskService;
			import com.mes.downstorage.entity.DownStorageCage;
			import com.mes.downworkstation.entity.DownWorkstation;
			import com.mes.downworkstation.entity.DownWorkstationTask;
			import com.mes.downworkstation.entity.DownWorkstionAndDownGlassinfo;
			@@ -35,7 +34,7 @@

			@Autowired
			private DownWorkstationMapper downWorkstationMapper;
			@Autowired(required=false)
			@Autowired(required = false)
			private DownWorkstationTaskMapper downWorkstationTaskMapper;
			@Autowired
			private DownGlassInfoService downGlassInfoService;
			@@ -68,7 +67,7 @@

			//工位显示
			@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")
			.leftJoin("down_glass_info b on t.flow_card_id = b.flow_card_id")
			@@ -77,8 +76,8 @@

			;

			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<>();
			@@ -95,7 +94,7 @@
			List<DownGlassInfo> downGlassInfoList = downGlassInfoMapper.selectList(glassInfoQueryWrapper);


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

			item.put("downGlassInfoList", downGlassInfoList);

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

			@@ -142,13 +141,13 @@


			@Override
			public void updateFlowCardIdAndCount(String flowCardId, int workstationId,int layer) {
			int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId,layer);
			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);
			int otherNumber = damageservice.count(queryWrapper);
			UpdateWrapper<DownWorkstation> updateWrapper = new UpdateWrapper<>();
			updateWrapper.set("total_quantity", glassInfoCount)
			.set("flow_card_id", flowCardId)
			@@ -170,9 +169,6 @@

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





			@Override
			@@ -197,10 +193,21 @@

			@Override
			public boolean updateDownWorkstationstate(DownWorkstation downWorkstation) {

			DownWorkstation downWork = baseMapper.selectById(downWorkstation.getId());
			downWork.setEnableState(downWorkstation.getEnableState());
			baseMapper.updateById(downWork);
			return true;

			if (downWork != null) {

			downWork.setEnableState(downWorkstation.getEnableState());

			baseMapper.updateById(downWork);

			return true;
			} else {

			return false;
			}
			}


			}