From 98255c411252fa465231a33a516bcab54119c97f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 15 四月 2024 10:55:48 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java | 10 +
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java | 15 ++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java | 3
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java | 25 +----
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java | 5 -
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageMapper.java | 13 --
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java | 127 ++++++++++++++++++------
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 22 ++++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java | 5
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java | 37 ++----
10 files changed, 156 insertions(+), 106 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
index 70c9624..a5a676d 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
@@ -1,14 +1,11 @@
package com.mes.bigstorage.controller;
-
import com.mes.bigstorage.entity.BigStorageCage;
-import com.mes.bigstorage.entity.BigStorageCageDetails;
-import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@@ -25,8 +22,8 @@
@RequestMapping("/bigStorageCage")
public class BigStorageCageController {
+ @Autowired
private BigStorageCageService bigStorageCageService;
- private BigStorageCageDetailsService bigStorageCageDetailsService;
//todo: 瀹炰緥浠ｇ爜 寰呭垹闄�
@ApiOperation("娴嬭瘯")
@@ -37,25 +34,13 @@
@ApiOperation("鐞嗙墖绗间俊鎭�")
@GetMapping("/bigStorageCage")
- public List<BigStorageCage> bigStorageCage() {
- return bigStorageCageService.list();
- }
-
- @ApiOperation("鐞嗙墖绗艰鎯�")
- @GetMapping("/bigStorageCageDetails")
- public List<BigStorageCageDetails> bigStorageCageDetails() {
- return bigStorageCageDetailsService.list();
- }
-
- @ApiOperation("灏忚溅瀹炴椂浣嶇疆")
- @GetMapping("/carPosition")
- public List<Integer> CarPosition() {
- return bigStorageCageDetailsService.getCarposition();
+ public List<BigStorageCage> querybigStorageCageDetail() {
+ return bigStorageCageService.querybigStorageCageDetail();
}
@ApiOperation("鎵嬪姩瀹屾垚浠诲姟")
@GetMapping("/finishTask")
- public void FinishTask(int type, int id) {
+ public void finishTask(int type, int id) {
// bigStorageCageDetailsService.FinishTask();
}
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
index 2dfc440..4ba8dde 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
@@ -1,21 +1,39 @@
package com.mes.bigstorage.controller;
+import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.bigstorage.service.BigStorageCageDetailsService;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author zhoush
* @since 2024-03-27
*/
+@ApiModel(description = "鐞嗙墖绗艰鎯�")
@RestController
@RequestMapping("/bigStorageCageDetails")
public class BigStorageCageDetailsController {
+ @Autowired
+ private BigStorageCageDetailsService bigStorageCageDetailsService;
+
+ @ApiOperation("鐞嗙墖绗艰鎯�")
+ @GetMapping("/bigStorageCageDetails")
+ public List<BigStorageCageDetails> bigStorageCageDetails() {
+ return bigStorageCageDetailsService.list();
+ }
+
+
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java
index 76fcb26..f145de5 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java
@@ -1,14 +1,17 @@
package com.mes.bigstorage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.List;
+
/**
* <p>
- *
+ *
* </p>
*
* @author zhoush
@@ -46,5 +49,8 @@
*/
private Integer remainWidth;
+ @TableField(exist = false)
+ private List<BigStorageCageDetails> bigStorageCageDetails;
+
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java
index f790115..d5e380f 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java
@@ -7,7 +7,7 @@
/**
* <p>
- * Mapper 鎺ュ彛
+ * Mapper 鎺ュ彛
* </p>
*
* @author zhoush
@@ -15,7 +15,4 @@
*/
public interface BigStorageCageDetailsMapper extends BaseMapper<BigStorageCageDetails> {
-// BigStorageCageDetails SelectTemperingFeedSlot(@Param("bigStorageCageDetails") BigStorageCageDetails bigStorageCageDetails);
-//
-// BigStorageCageDetails SelectEmptyFeedSlot();
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageMapper.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageMapper.java
index bd01771..67f4cad 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageMapper.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageMapper.java
@@ -10,7 +10,7 @@
/**
* <p>
- * Mapper 鎺ュ彛
+ * Mapper 鎺ュ彛
* </p>
*
* @author zhoush
@@ -18,15 +18,4 @@
*/
public interface BigStorageCageMapper extends BaseMapper<BigStorageCage> {
-
- BigStorageCageDetails SelectEmptyFeedSlot();
-
- @Update("update big_storage_cage set remain_width = #{width} where slot=#{slot}")
- public void UpdateRemainWidth(int slot,int width);
-
-
-
- BigStorageCageDetails SelectOtherFeedSlot();
-
- List<String> selectTemperingId();
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
index 42f9360..ef46c59 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
@@ -2,9 +2,6 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.bigstorage.entity.BigStorageCageDetails;
-import com.mes.bigstorage.mapper.BigStorageCageMapper;
-
-import java.util.List;
/**
* <p>
@@ -15,7 +12,5 @@
* @since 2024-03-27
*/
public interface BigStorageCageDetailsService extends IService<BigStorageCageDetails> {
-
- public boolean getTemperingGlass();
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java
index aea391d..d8bb16e 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java
@@ -4,10 +4,13 @@
import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.entity.GlassInfo;
+
+import java.util.List;
/**
* <p>
- * 鏈嶅姟绫�
+ * 鏈嶅姟绫�
* </p>
*
* @author zhoush
@@ -15,7 +18,13 @@
*/
public interface BigStorageCageService extends IService<BigStorageCage> {
- public void updateRemainWidth(int Slot);
+ void updateRemainWidth(int Slot);
- public BigStorageCageDetails FeedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails);
+ BigStorageCageDetails feedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails);
+
+ boolean outGlass();
+
+ List<BigStorageCage> querybigStorageCageDetail();
+
+
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
index 3f6a430..032b285 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
@@ -1,6 +1,7 @@
package com.mes.bigstorage.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.entity.BigStorageCageDetails;
@@ -8,11 +9,17 @@
import com.mes.bigstorage.mapper.BigStorageCageMapper;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.temperingglass.entity.TemperingGlassInfo;
+import lombok.extern.slf4j.Slf4j;
+import com.mes.glassinfo.entity.GlassInfo;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
@@ -24,70 +31,124 @@
* @since 2024-03-27
*/
@Service
+@Slf4j
public class BigStorageCageServiceImpl extends ServiceImpl<BigStorageCageMapper, BigStorageCage> implements BigStorageCageService {
@Resource
private BigStorageCageMapper bigStorageCageMapper;
+
@Resource
private BigStorageCageDetailsMapper bigStorageCageDetailsMapper;
@Override
- public BigStorageCageDetails FeedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails) {
-
+ public BigStorageCageDetails feedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails) {
//1銆佹煡璇㈢悊鐗囩鍐呯幓鐠冪墖搴忕瓑浜庡綋鍓嶇幓鐠冪墖搴�-1鐨勭幓鐠�
- LambdaQueryWrapper<BigStorageCageDetails> wapper = new LambdaQueryWrapper<>();
- wapper.eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
+ LambdaQueryWrapper<BigStorageCageDetails> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
.eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1);
- BigStorageCageDetails layoutSlotInfo = bigStorageCageDetailsMapper.selectOne(wapper);
- bigStorageCageDetails.setSlot(layoutSlotInfo.getSlot());
- bigStorageCageDetails.setGlassId(bigStorageCageDetails.getGlassId());
- bigStorageCageDetails.setFlowCardId(glassInfo.getFlowcardId());
- bigStorageCageDetails.setGlassType(glassInfo.getGlassType());
- bigStorageCageDetails.setWidth(glassInfo.getWidth());
- bigStorageCageDetails.setHeight(glassInfo.getHeight());
- bigStorageCageDetails.setThickness(glassInfo.getThickness());
- bigStorageCageDetails.setTemperingLayoutId(glassInfo.getTemperingLayoutId());
- bigStorageCageDetails.setTemperingFeedSequence(glassInfo.getTemperingFeedSequence());
+ BigStorageCageDetails layoutSlotInfo = bigStorageCageDetailsMapper.selectOne(wrapper);
+ BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
+ bigStorageCageDetails.setSlot(layoutSlotInfo.getSlot());
//2銆佹湁绗﹀悎鏉′欢鐨勬牸瀛愭椿鐗囧簭涓�1鏃�
- if (layoutSlotInfo.getSlot() != null ) {
- //灏嗙幓鐠冧俊鎭～鍏ョ悊鐗囩璇︽儏琛�
-
-
- bigStorageCageDetailsMapper.updateById(bigStorageCageDetails);
+ if (layoutSlotInfo.getSlot() != null) {
+ bigStorageCageDetails.setSlot(layoutSlotInfo.getSlot());
} else {
//鑾峰彇涓嶅埌鏃讹細
+// LambdaQueryWrapper<BigStorageCageDetails> BigStorageCageDetailslambdaQueryWrapper = new LambdaQueryWrapper<>();
+// BigStorageCageDetailslambdaQueryWrapper
+// .select(BigStorageCageDetails::getTemperingLayoutId)
+// .groupBy(BigStorageCageDetails::getTemperingLayoutId);
+// List<Map<String, Object>> temperingLayoutIdList= bigStorageCageDetailsMapper.selectMaps(BigStorageCageDetailslambdaQueryWrapper);
+// for (Map<String, Object> map : temperingLayoutIdList) {
+// for (Map.Entry<String, Object> entry : map.entrySet()) {
+// String prefix = entry.getKey().substring(0, entry.getKey().indexOf('-'));
+// String suffix = entry.getKey().substring(entry.getKey().indexOf('-') + 1);
+// if(suffix.equals(entry.getValue())){
+//
+// }
+// }
+// }
+
//鑾峰彇鍙繘鐗囨牸瀛愪俊鎭�
- BigStorageCageDetails EmptySlotInfo = bigStorageCageMapper.SelectEmptyFeedSlot();
- if (EmptySlotInfo != null) {
- bigStorageCageDetails.setSlot(EmptySlotInfo.getSlot());
- } else {
- //鑾峰彇鍏朵粬绗兼牸瀛�-
- BigStorageCageDetails OtherSlotInfo = bigStorageCageMapper.SelectOtherFeedSlot();
- bigStorageCageDetails.setSlot(OtherSlotInfo.getSlot());
- }
+// BigStorageCageDetails EmptySlotInfo = bigStorageCageMapper.selectEmptyFeedSlot();
+// if (EmptySlotInfo != null) {
+// bigStorageCageDetails.setSlot(EmptySlotInfo.getSlot());
+// } else {
+// //鑾峰彇鍏朵粬绗兼牸瀛�-
+// BigStorageCageDetails OtherSlotInfo = bigStorageCageMapper.selectOtherFeedSlot();
+// bigStorageCageDetails.setSlot(OtherSlotInfo.getSlot());
+// }
//灏嗙幓鐠冧俊鎭斁鍏ヨ鏍煎瓙
}
-
- updateRemainWidth(bigStorageCageDetails.getSlot());
+ if (bigStorageCageDetails.getSlot() != null) {
+ bigStorageCageDetailsMapper.insert(bigStorageCageDetails);
+ updateRemainWidth(bigStorageCageDetails.getSlot());
+ }
return bigStorageCageDetails;
+ }
+
+ @Override
+ public boolean outGlass() {
+// // 1銆佹煡璇㈤挗鍖栧皬鐗囦换鍔¤〃鏄惁鏈夊緟鍑虹幓鐠�
+// List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.SelectTemperingGlassInfo();
+// //娌℃湁鍙嚭鐨勭幓鐠冩椂
+// if (temperingGlassInfoList != null) {
+// //鏌ヨ鏄惁鏈夊皬鐗囧叏閮ㄥ埌榻愮殑閽㈠寲鐗堝浘
+// } else {
+// //缁х画褰撳墠閽㈠寲鐗堝浘鐨勪换鍔�
+// }
+ LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailslambdaQueryWrapper = new LambdaQueryWrapper<>();
+ bigStorageCageDetailslambdaQueryWrapper
+ .select(BigStorageCageDetails::getTemperingLayoutId)
+ .groupBy(BigStorageCageDetails::getTemperingLayoutId);
+ List<Map<String, Object>> temperingLayoutIdList = bigStorageCageDetailsMapper.selectMaps(bigStorageCageDetailslambdaQueryWrapper);
+ for (Map<String, Object> map : temperingLayoutIdList) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ String prefix = entry.getKey().substring(0, entry.getKey().indexOf('-'));
+ String suffix = entry.getKey().substring(entry.getKey().indexOf('-') + 1);
+ if (suffix.equals(entry.getValue())) {
+
+ }
+ }
+ }
+ return true;
}
//淇敼鏍煎瓙鍓╀綑瀹藉害
@Override
- public void updateRemainWidth(int Slot) {
+ public void updateRemainWidth(int slot) {
//鑾峰彇璇ユ牸瀛愬唴鐜荤拑淇℃伅
- int width = 5000;
- List<BigStorageCageDetails> bigStorageCageDetailsList = Collections.singletonList(bigStorageCageDetailsMapper.selectById(Slot));
+ Integer width = 5000;
+ List<BigStorageCageDetails> bigStorageCageDetailsList = Collections.singletonList(bigStorageCageDetailsMapper.selectById(slot));
for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
) {
width -= Integer.parseInt(bigStorageCageDetails.getWidth().toString()) + bigStorageCageDetails.getGap();
}
//淇敼鏍煎瓙鍓╀綑瀹藉害
- bigStorageCageMapper.UpdateRemainWidth(Slot, width);
+ BigStorageCage bigStorageCage = new BigStorageCage();
+ bigStorageCage.setRemainWidth(width);
+ UpdateWrapper<BigStorageCage> bigStorageCageWrapper = new UpdateWrapper<>();
+ bigStorageCageWrapper.eq("remain_width", width);
+ bigStorageCageMapper.update(bigStorageCage, bigStorageCageWrapper);
+ }
+
+ @Override
+ public List<BigStorageCage> querybigStorageCageDetail() {
+ //1銆佽幏鍙栧ぇ鐞嗙墖绗间俊鎭�
+ List<BigStorageCage> bigStorageCages = bigStorageCageMapper.selectList(null);
+ log.info("1銆佽幏鍙栧ぇ鐞嗙墖绗间俊鎭畬鎴愶紝鑾峰彇鍒扮殑鏁版嵁{}", bigStorageCages.size());
+ //2鑾峰彇鐞嗙墖绗兼墍鏈変俊鎭�
+ List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsMapper.selectList(null);
+ Map<Integer, List<BigStorageCageDetails>> listMap = bigStorageCageDetailsList.stream().collect(Collectors.groupingBy(BigStorageCageDetails::getSlot));
+ for (BigStorageCage bigStorageCage : bigStorageCages) {
+ List<BigStorageCageDetails> bigStorageCageDetails = listMap.get(bigStorageCage.getSlot());
+ bigStorageCage.setBigStorageCageDetails(bigStorageCageDetails);
+ }
+ return bigStorageCages;
}
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java
index 01629c3..113a8af 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java
@@ -21,48 +21,37 @@
private TemperingGlassInfoService temperingGlassInfoService;
@Autowired
private GlassInfoService glassInfoService;
+
@Override
public void run() {
while (this != null) {
try {
-
Thread.sleep(500);
- String plcFeedReq ="0";
- String plcFeedGlassid ="111";
+ String plcFeedReq = "0";
+ String plcFeedGlassid = "111";
//Plc杩涚墖璇锋眰鏃�
- if("1".equals(plcFeedReq)){
- BigStorageCageDetails bigStorageCageDetails=new BigStorageCageDetails();
+ if ("1".equals(plcFeedReq)) {
+ BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
//浼犲叆鐜荤拑id
- GlassInfo glassInfo=glassInfoService.getById(plcFeedGlassid);
+ GlassInfo glassInfo = glassInfoService.getById(plcFeedGlassid);
- BigStorageCageDetails SlotInfo=bigStorageCageService.FeedGlass(glassInfo,bigStorageCageDetails);
- if(SlotInfo!=null){
+ BigStorageCageDetails SlotInfo = bigStorageCageService.feedGlass(glassInfo, bigStorageCageDetails);
+ if (SlotInfo != null) {
//plc浠诲姟鍙戦�佸瓧
}
}
//鍑虹墖璇锋眰
- String plcOutReq ="0";
- boolean result=false;
- if("1".equals(plcOutReq)){
+ String plcOutReq = "0";
+ boolean result = false;
+ if ("1".equals(plcOutReq)) {
//鑾峰彇閽㈠寲灏忕墖琛ㄦ湭鍑虹淇℃伅
- List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.SelectTemperingGlassInfo();
- //娌℃湁鍙嚭鐨勭幓鐠冩椂
- if(temperingGlassInfoList!=null){
- //鏌ヨ鏄惁鏈夊皬鐗囧叏閮ㄥ埌榻愮殑閽㈠寲鐗堝浘
- result = bigStorageCageDetailsService.getTemperingGlass();
- }else{
- //缁х画褰撳墠閽㈠寲鐗堝浘鐨勪换鍔�
- temperingGlassInfoService.addOutTask(temperingGlassInfoList);
- result=true;
- }
- if(result==true){
+
+ if (result == true) {
//plc浠诲姟鍙戦�佸瓧
}
}
-
-
} catch (Exception e) {
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
index 1a737e4..709c05d 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
@@ -7,7 +7,7 @@
/**
* <p>
- * 鏈嶅姟绫�
+ * 鏈嶅姟绫�
* </p>
*
* @author zhoush
@@ -15,5 +15,6 @@
*/
public interface TemperingGlassInfoService extends IService<TemperingGlassInfo> {
public void addOutTask(List<TemperingGlassInfo> temperingGlassInfoList);
+
public List<TemperingGlassInfo> SelectTemperingGlassInfo();
}
--
Gitblit v1.8.0