YiWuProject.git

			@@ -3,23 +3,29 @@
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			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.downglassinfo.entity.DownGlassInfo;
			import com.mes.downglassinfo.entity.DownGlassTask;
			import com.mes.downglassinfo.mapper.DownGlassInfoMapper;
			import com.mes.downglassinfo.service.DownGlassInfoService;
			import com.mes.downglassinfo.service.DownGlassTaskService;
			import com.mes.downworkstation.entity.DownWorkstation;
			import com.mes.downworkstation.entity.DownWorkstationTask;
			import com.mes.downworkstation.entity.DownWorkstionAndDownGlassinfo;
			import com.mes.downworkstation.mapper.DownWorkstationMapper;
			import com.mes.downworkstation.mapper.DownWorkstationTaskMapper;
			import com.mes.downworkstation.service.DownWorkstationService;
			import com.mes.downworkstation.service.DownWorkstationTaskService;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;

			import java.util.ArrayList;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;

			@Slf4j
			@Service
			public class DownWorkstationServiceImpl extends ServiceImpl<DownWorkstationMapper, DownWorkstation> implements DownWorkstationService {

			@@ -30,10 +36,11 @@
			@Autowired
			private DownGlassInfoService downGlassInfoService;
			@Autowired
			private DownGlassInfoMapper downGlassInfoMapper;
			@Autowired
			private DownGlassTaskService downGlassTaskService;

			@Autowired
			private DownWorkstationService downWorkstationService;

			@Autowired
			private DownWorkstationTaskService downWorkstationTaskService;

			@@ -51,6 +58,37 @@
			DownWorkstation result = baseMapper.selectOne(queryWrapper);
			return result != null ? result.getTotalquantity() : 0;
			}
			//工位显示
			@Override
			public List<Map<String, Object>> getTotalGlassDimensionsByWorkstation() {
			MPJQueryWrapper<DownWorkstionAndDownGlassinfo> 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")
			.groupBy("t.workstation_id", "t.flow_card_id");

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

			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("fillColor", "yellow"); // 设置子项颜色
			item.put("content", downWorkstionAndDownGlassinfo.getFlowCardId()); // 使用流程卡号作为子项内容

			rack.put("item", item); // 将子项对象放入货架对象中

			result.add(rack); // 将货架对象添加到结果列表中
			//log.info("货架对象: {}", rack);
			}

			return result; // 返回最终结果
			}



			// @Override
			// public int getTotalQuantity(int workstationId) {
			@@ -118,6 +156,14 @@



			public DownWorkstation selectByFlowCardId(String flowcardid) {
			QueryWrapper<DownWorkstation> queryWrapper = new QueryWrapper<>();
			queryWrapper.eq("flow_card_id", flowcardid);

			return baseMapper.selectOne(queryWrapper);
			}





			@@ -160,7 +206,7 @@
			Integer maxSequence = downGlassInfoService.getMaxSequenceByFlowCardId(downGlassInfo.getFlowCardId());
			// 初始化顺序字段值
			int sequence = maxSequence != null ? maxSequence + 1 : 1;

			// newdownGlassInfo.setId(downGlassInfo.getId());
			newdownGlassInfo.setWidth(downGlassInfo.getWidth());
			newdownGlassInfo.setHeight(downGlassInfo.getHeight());
			newdownGlassInfo.setThickness(downGlassInfo.getThickness());
			@@ -175,6 +221,8 @@
			downWorkstationTaskService.insertdownWorkstationtask(newdownGlassInfo);
			//更新下片任务表状态为0
			downGlassTaskService.updateTaskStateToZero(downGlassInfo.getId());
			//删除下片任务表中的记录
			downGlassTaskService.deleteTask(downGlassInfo.getFlowCardId());

			sequence++; // 递增顺序字段值

			@@ -187,17 +235,18 @@

			try {
			//查询下片工位表中架子是否绑定了流程卡号工位表和任务表中状态为1的流程卡号和已落架数量
			List<DownWorkstation> taskdownWorkstation = downWorkstationMapper.selectdownWorkstationstate();
			List<DownWorkstationTask> taskdownWorkstation = downWorkstationTaskService.getTaskState();
			if (taskdownWorkstation != null && !taskdownWorkstation.isEmpty()) {
			//，如果已经绑定则更新已落架数量,并且删除下片任务表中的记录
			for (DownWorkstation downWorkstation : taskdownWorkstation) {
			for (DownWorkstationTask downWorkstation : taskdownWorkstation) {
			//更新下片工位表中已落架数量
			downWorkstationService.updateracksnumber(downWorkstation.getFlowCardId(), downWorkstation.getRacksnumber() + 1);
			DownWorkstation downWorkstation1 = selectByFlowCardId(downWorkstation.getFlowCardId());
			updateracksnumber(downWorkstation.getFlowCardId(),downWorkstation1.getRacksnumber() + 1);
			//更新机械任务表中状态为0
			downWorkstationTaskService.updateTaskStateToZero(downWorkstation.getId());
			//删除机械任务表
			downWorkstationTaskService.removeById(downWorkstation.getId());

			//删除下片任务表中的记录
			downGlassTaskService.deleteTask(downWorkstation.getId());

			}
			}