From f79a481bc7b8095cf1ffd0a62bb00cf70ee8629e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 12 八月 2024 09:00:21 +0800
Subject: [PATCH] 1、大理片 fixbug:出片破损任务异常
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
index 56a0fdd..2307334 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
@@ -4,8 +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;
@@ -69,7 +71,7 @@
@Override
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)
@@ -86,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<>();
@@ -141,7 +148,7 @@
@Override
- public int updateFlowCardIdAndCount(String flowCardId, int workstationId, int 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);
@@ -154,8 +161,9 @@
.set("layer", layer)
.set("other_number", otherNumber)
.eq("workstation_id", workstationId);
+
this.update(updateWrapper);
- return 1;
+
}
@Override
@@ -190,4 +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";
+ }
+
+
}
--
Gitblit v1.8.0