YiWuProject.git

			@@ -25,6 +25,7 @@
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;

			@Slf4j
			@Service
			public class DownWorkstationServiceImpl extends ServiceImpl<DownWorkstationMapper, DownWorkstation> implements DownWorkstationService {
			@@ -44,7 +45,7 @@
			@Autowired
			private DownWorkstationTaskService downWorkstationTaskService;

			// @Override
			// @Override
			// public List<DownWorkstation> gettwoDownWorkstations() {
			// return downWorkstationMapper.getDownWorkstationsInRange(6,10);
			// }
			@@ -58,7 +59,8 @@
			DownWorkstation result = baseMapper.selectOne(queryWrapper);
			return result != null ? result.getTotalquantity() : 0;
			}
			//工位显示

			//工位显示
			@Override
			public List<Map<String, Object>> getTotalGlassDimensionsByWorkstation() {
			MPJQueryWrapper<DownWorkstation> queryWrapper = new MPJQueryWrapper<>();
			@@ -66,16 +68,16 @@
			.leftJoin("down_glass_info b on t.flow_card_id = b.flow_card_id")
			.groupBy("t.workstation_id", "t.flow_card_id");

			List<DownWorkstionAndDownGlassinfo> workstationList = downWorkstationMapper.selectJoinList(DownWorkstionAndDownGlassinfo.class, queryWrapper);

			// 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<>();

			// 创建子项（item）对象
			Map<String, Object> item = new HashMap<>();
			item.put("height", downWorkstionAndDownGlassinfo.getTotalheight()); // 设置子项高度，根据实际情况设置
			item.put("width", downWorkstionAndDownGlassinfo.getTotalwidth()); // 设置子项宽度，根据实际情况设置
			item.put("height", downWorkstionAndDownGlassinfo.getTotalheight()); // 设置子项高度，根据实际情况设置
			item.put("width", downWorkstionAndDownGlassinfo.getTotalwidth()); // 设置子项宽度，根据实际情况设置
			item.put("fillColor", "yellow"); // 设置子项颜色
			item.put("content", downWorkstionAndDownGlassinfo.getFlowCardId()); // 使用流程卡号作为子项内容

			@@ -89,18 +91,6 @@
			}



			// @Override
			// public int getTotalQuantity(int workstationId) {
			// Integer totalQuantity = downWorkstationMapper.getTotalQuantity(workstationId);
			// return totalQuantity != null ? totalQuantity : 0;
			// }

			// @Override
			// public int getRacksNumber(int workstationId) {
			// Integer racksNumber = downWorkstationMapper.getRacksNumber(workstationId);
			// return racksNumber != null ? racksNumber : 0;
			// }
			//根据条件获取落架数量
			@Override
			public int getRacksNumber(int workstationId) {
			@@ -111,7 +101,8 @@
			DownWorkstation result = baseMapper.selectOne(queryWrapper);
			return result != null ? result.getRacksnumber() : 0;
			}
			//根据条件获取工位玻璃信息

			//根据条件获取工位玻璃信息
			@Override
			public List<DownWorkstation> getoneDownWorkstations(int startId, int endId) {
			QueryWrapper<DownWorkstation> queryWrapper = new QueryWrapper<>();
			@@ -127,10 +118,9 @@
			@Override
			public void updateracksnumber(String flowCardId, int racksNumber) {
			UpdateWrapper<DownWorkstation> updateWrapper = new UpdateWrapper<>();
			updateWrapper.set("racks_number",racksNumber).eq("flow_card_id", flowCardId);
			baseMapper.update(null, updateWrapper);
			updateWrapper.set("racks_number", racksNumber).eq("flow_card_id", flowCardId);
			baseMapper.update(new DownWorkstation(), updateWrapper);
			}



			@Override
			@@ -140,7 +130,7 @@
			.set("flow_card_id", flowCardId)
			.eq("workstation_id", workstationId);

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

			@Override
			@@ -151,8 +141,10 @@
			.set("racks_number", 0)
			.eq("workstation_id", workstationId);

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





			@@ -162,12 +154,6 @@

			return baseMapper.selectOne(queryWrapper);
			}








			@Transactional
			@@ -181,13 +167,8 @@
			}






			@Override
			public void insertdownglassinfo() {



			List<DownGlassTask> taskdownGlassInf = downGlassTaskService.getUnloadingTaskState();
			@@ -231,8 +212,6 @@
			}




			try {
			//查询下片工位表中架子是否绑定了流程卡号工位表和任务表中状态为1的流程卡号和已落架数量
			List<DownWorkstationTask> taskdownWorkstation = downWorkstationTaskService.getTaskState();
			@@ -241,7 +220,7 @@
			for (DownWorkstationTask downWorkstation : taskdownWorkstation) {
			//更新下片工位表中已落架数量
			DownWorkstation downWorkstation1 = selectByFlowCardId(downWorkstation.getFlowCardId());
			updateracksnumber(downWorkstation.getFlowCardId(),downWorkstation1.getRacksnumber() + 1);
			updateracksnumber(downWorkstation.getFlowCardId(), downWorkstation1.getRacksnumber() + 1);
			//更新机械任务表中状态为0
			downWorkstationTaskService.updateTaskStateToZero(downWorkstation.getId());
			//删除机械任务表
			@@ -256,11 +235,6 @@
			// 或者可以进行其他异常处理，比如记录日志或者返回特定的错误信息
			}
			}







			}