From cbec6e3f120344f6f2d69808aaabb447bb52a693 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 22 八月 2024 09:45:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 76d1dc5..6b8f507 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
@@ -5,13 +5,12 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.common.S7object;
+import com.mes.common.utils.RedisUtil;
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;
-import com.mes.downglassinfo.service.DownGlassTaskService;
import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.entity.DownWorkstationTask;
import com.mes.downworkstation.entity.DownWorkstionAndDownGlassinfo;
@@ -25,6 +24,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -39,11 +39,7 @@
@Autowired(required = false)
private DownWorkstationTaskMapper downWorkstationTaskMapper;
@Autowired
- private DownGlassInfoService downGlassInfoService;
- @Autowired
private DownGlassInfoMapper downGlassInfoMapper;
- @Autowired
- private DownGlassTaskService downGlassTaskService;
@Autowired
private GlassInfoService glassInfoService;
@Autowired
@@ -51,6 +47,8 @@
@Autowired
private DownWorkstationTaskService downWorkstationTaskService;
+ @Resource
+ private RedisUtil redisUtil;
// @Override
// public List<DownWorkstation> gettwoDownWorkstations() {
@@ -88,9 +86,9 @@
item.put("width", downWorkstionAndDownGlassinfo.getTotalwidth());
item.put("fillColor", "yellow");
item.put("content", downWorkstionAndDownGlassinfo.getFlowCardId());
- if(downWorkstionAndDownGlassinfo.getTotalQuantity()==downWorkstionAndDownGlassinfo.getRacksNumber()+downWorkstionAndDownGlassinfo.getRacksNumber()){
+ if (downWorkstionAndDownGlassinfo.getFlowCardId() != "" && downWorkstionAndDownGlassinfo.getFlowCardId() != null && downWorkstionAndDownGlassinfo.getTotalQuantity() == downWorkstionAndDownGlassinfo.getRacksNumber() + downWorkstionAndDownGlassinfo.getRacksNumber()) {
item.put("fullCardColor", "red");
- }else{
+ } else {
item.put("fullCardColor", "blue");
}
@@ -172,6 +170,8 @@
updateWrapper.set("flow_card_id", null)
.set("total_quantity", 0)
.set("racks_number", 0)
+ .set("other_number", 0)
+ .set("layer", null)
.eq("workstation_id", workstationId);
baseMapper.update(new DownWorkstation(), updateWrapper);
@@ -223,5 +223,9 @@
return "success";
}
+ @Override
+ public void autoPrint(Boolean flag) {
+ redisUtil.setCacheObject("autoPrint", flag);
+ }
}
--
Gitblit v1.8.0