From 5dee8e0784b69cb3e346a3f9acd549cc726c9e27 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 27 八月 2024 10:00:27 +0800
Subject: [PATCH] 代码恢复
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/request/DownGlassInfoRequest.java | 48 ++++++
/dev/null | 0
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/request/CacheWornRequest.java | 28 +++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/request/IdentWornRequest.java | 28 +++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 36 ++-
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 2
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java | 6
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java | 205 +++++++++++++++++++++++++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/request/EdgGlassInfoRequest.java | 40 +++++
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java | 22 ++
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 27 +++
11 files changed, 419 insertions(+), 23 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
index 47b4769..de75c86 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
@@ -30,7 +30,7 @@
* A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 閽㈠寲鍑虹墖 3001
* A10鍑虹墖鐩爣浣嶇疆 d05鍗ц浆绔� 浜哄伐鍑虹墖 3002
*/
- public static final Integer TEMPERING_OUT_TARGET_POSITION = 3001;
+ public static final Integer TEMPERING_OUT_TARGET_POSITION = 3002;
public static final Integer ARTIFICIAL_OUT_TARGET_POSITION = 3002;
/**
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
index 537dbdf..c400f4e 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
@@ -36,8 +36,7 @@
QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>();
glassinfo.eq("engineer_id", glass.getEngineerId())
.eq("tempering_layout_id", glass.getTemperingLayoutId());
- //return temperingMapper.selectList(glassinfo);
- return temperingMapper.selectByEngineerIdAndLayoutId(glass.getEngineerId(),glass.getTemperingLayoutId());
+ return temperingMapper.selectList(glassinfo);
}else {
return null;
}
@@ -46,13 +45,11 @@
@Override
public List<TemperingGlassInfo> selectIntoGlass(TemperingGlassInfo temperingGlassInfo) {
//鑾峰彇杩涚倝涓殑鐜荤拑淇℃伅
-// QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
-// wrapper.eq("tempering_layout_id", temperingGlassInfo.getTemperingLayoutId())
-// .eq("engineer_id", temperingGlassInfo.getEngineerId())
-// .orderByAsc("tempering_layout_id","tempering_feed_sequence");
-// return temperingMapper.selectList(wrapper);
- return temperingMapper.selectByEngineerIdAndLayoutId(temperingGlassInfo.getEngineerId(),temperingGlassInfo.getTemperingLayoutId());
-
+ QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
+ wrapper.eq("tempering_layout_id", temperingGlassInfo.getTemperingLayoutId())
+ .eq("engineer_id", temperingGlassInfo.getEngineerId())
+ .orderByAsc("tempering_layout_id","tempering_feed_sequence");
+ return temperingMapper.selectList(wrapper);
}
@Override
@@ -63,9 +60,13 @@
TemperingGlassInfo glass=temperingMapper.selectOne(wrap);
//鏍规嵁宸ョ▼鍙峰拰鐗堝浘鑾峰彇鏁版嵁
if(glass != null) {
- return temperingMapper.selectByEngineerIdAndLayoutId(glass.getEngineerId(),glass.getTemperingLayoutId());
+ QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>();
+ wapper.eq("engineer_id", glass.getEngineerId())
+ .eq("tempering_layout_id", glass.getTemperingLayoutId())
+ .orderByAsc("tempering_layout_id", "tempering_feed_sequence");
+ return temperingMapper.selectList(wapper);
}
- return null;
+ return null;
}
@Override
@@ -79,8 +80,11 @@
if (glassinfo == null) {
return null; // 鐩存帴杩斿洖null锛岃〃绀烘病鏈夋壘鍒扮鍚堟潯浠剁殑璁板綍
}
- return temperingMapper.selectByEngineerIdAndLayoutId(glassinfo.getEngineerId(),glassinfo.getTemperingLayoutId());
+ QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
+ wrapper.eq("tempering_layout_id",glassinfo.getTemperingLayoutId())
+ .eq("engineer_id",glassinfo.getEngineerId());
+ return temperingMapper.selectList(wrapper);
}
@Override
@@ -93,7 +97,7 @@
}
@Override
- public List<TemperingGlassInfo> selectTaskType() {
+ public List<TemperingGlassInfo> selectTaskType() {
QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
wrapper.select("state")
.groupBy("state");
@@ -102,7 +106,11 @@
@Override
public Integer updateTemperingState(TemperingGlassInfo temperingGlassInfo) {
- if (temperingMapper.updateTemperingGlassInfo(temperingGlassInfo) > 0) {
+ UpdateWrapper<TemperingGlassInfo> wrapper = new UpdateWrapper<>();
+ wrapper.eq("glass_id",temperingGlassInfo.getGlassId())
+ .lt("state",6)
+ .set("state", temperingGlassInfo.getState());;
+ if (temperingMapper.update(null,wrapper) > 0) {
return 200;
}else {
return 100;
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/request/EdgGlassInfoRequest.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/request/EdgGlassInfoRequest.java
new file mode 100644
index 0000000..973b4c2
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/request/EdgGlassInfoRequest.java
@@ -0,0 +1,40 @@
+package com.mes.edgglasstask.entity.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/8/7 16:16
+ * @Description:
+ */
+@Data
+public class EdgGlassInfoRequest {
+
+ /**
+ * 纾ㄨ竟绾� 2001 2002
+ */
+ private List<Integer> cellList;
+ /**
+ * 鐘舵�� 0 寰呭鐞� 1 澶勭悊涓� 2 澶勭悊瀹屾垚
+ */
+ private List<Integer> stateList;
+
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date beginDate;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date endDate;
+}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/request/IdentWornRequest.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/request/IdentWornRequest.java
new file mode 100644
index 0000000..a383b93
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/request/IdentWornRequest.java
@@ -0,0 +1,28 @@
+package com.mes.edgglasstask.entity.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/8/10 13:34
+ * @Description:
+ */
+@Data
+public class IdentWornRequest {
+
+ @NotBlank(message = "鐜荤拑ID涓嶈兘涓虹┖")
+ private String glassId;
+
+ @NotNull(message = "鐘舵�佷笉鑳戒负绌�")
+ private int state;
+
+ @NotNull(message = "绾胯矾涓嶈兘涓虹┖")
+ private int line;
+
+ @NotBlank(message = "宸ュ簭涓嶈兘涓虹┖")
+ private String workingProcedure;
+}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
index 1b5426b..acd2fcf 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
@@ -66,7 +66,27 @@
if (outGlass != null) {
jsonObject.append("overGlass", overGlass);
}
+ //褰撳墠閽㈠寲宸ョ▼鐨勬嬁璧版暟鎹�
+ LambdaQueryWrapper<TemperingGlassInfo> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.select(TemperingGlassInfo::getEngineerId)
+ .lt(TemperingGlassInfo::getState, Const.TEMPERING_END)
+ .groupBy(TemperingGlassInfo::getEngineerId);
+ List<String> engineerIds = temperingAgoService.list(queryWrapper)
+ .stream()
+ .map(TemperingGlassInfo::getEngineerId)
+ .distinct()
+ .collect(Collectors.toList());
+
+ List<Damage> temperingTakeGlassInfos = damageService.list(
+ new LambdaQueryWrapper<Damage>()
+ .in(Damage::getEngineerId, engineerIds)
+ .eq(Damage::getType, Const.GLASS_STATE_TAKE)
+ .orderByAsc(Damage::getId)
+ );
+
+
+ jsonObject.append("temperingTakeGlassInfos", temperingTakeGlassInfos);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("temperingGlass");
if (sendwServer != null) {
@@ -86,6 +106,8 @@
//姝ｅ湪杩涜鐨勪换鍔�
List<TemperingGlassInfo> temperingTaskType = temperingAgoService.selectTaskType();
jsonObject.append("temperingTaskType", temperingTaskType);
+
+
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("temperingIsRun");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
index 14559eb..4d0abc8 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -48,12 +48,10 @@
return Result.build(200, "", glass);
}
- @ApiOperation("//閽㈠寲鐮存崯鎷胯蛋鏀惧洖")
+ @ApiOperation("//閽㈠寲鐮存崯")
@PostMapping("/updateTemperingState") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
public Result <Integer> updateTemperingState(@RequestBody Damage damage) {
- if(damage.getStatus()>5) {
- damageService.insertDamage(damage);
- }
+ damageService.insertDamage(damage);
TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo();
temperingGlassInfo.setState(damage.getStatus());
temperingGlassInfo.setGlassId(damage.getGlassId());
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/request/DownGlassInfoRequest.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/request/DownGlassInfoRequest.java
new file mode 100644
index 0000000..9f342f0
--- /dev/null
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/request/DownGlassInfoRequest.java
@@ -0,0 +1,48 @@
+package com.mes.downglassinfo.entity.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-03-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DownGlassInfoRequest implements Serializable {
+
+ /**
+ * 宸ヤ綅id
+ */
+ private Integer workStationId;
+
+ /**
+ * 宸ョ▼id
+ */
+ private String engineerId;
+
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date beginDate;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date endDate;
+
+
+}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java
index b39daf2..f6b9c71 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java
@@ -1,24 +1,39 @@
package com.mes.downglassinfo.service.impl;
+import cn.smallbun.screw.core.util.CollectionUtils;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.common.config.Const;
+import com.mes.common.utils.RedisUtil;
import com.mes.downglassinfo.entity.DownGlassInfo;
+import com.mes.downglassinfo.entity.request.DownGlassInfoRequest;
import com.mes.downglassinfo.mapper.DownGlassInfoMapper;
import com.mes.downglassinfo.service.DownGlassInfoService;
import com.mes.downstorage.entity.DownStorageCageDetails;
import com.mes.downstorage.service.DownStorageCageDetailsService;
+import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.entity.dto.DownGlassInfoDTO;
+import com.mes.downworkstation.service.DownWorkstationService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.job.DownLoadCacheGlassTask;
+import com.mes.pp.service.FlowCardService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+@Slf4j
@Service
public class DownGlassInfoServiceImpl extends ServiceImpl<DownGlassInfoMapper, DownGlassInfo> implements DownGlassInfoService {
@@ -27,6 +42,16 @@
@Autowired
DownStorageCageDetailsService downStorageCageDetailsService;
+
+
+ @Autowired
+ DownWorkstationService downWorkstationService;
+
+ @Autowired
+ RedisUtil redisUtil;
+
+ @Autowired
+ FlowCardService flowCardService;
/**
* 鏍规嵁娴佺▼鍗″彿鏌ヨ鏈�澶у簭鍙�
@@ -60,8 +85,15 @@
}
@Override
- public List<DownGlassInfoDTO> queryWorkStationIsIn(Boolean isDownload) {
- return baseMapper.queryWorkStationIsIn(isDownload);
+ public List<DownGlassInfoDTO> queryWorkStationIsIn(List<Integer> workList, Boolean isDownload) {
+ //鎸夌収瑕佹眰鑾峰彇宸茶惤鏋�/鏈惤鏋剁殑鐜荤拑淇℃伅
+ return baseMapper.queryWorkStationIsIn(workList, isDownload);
+ }
+
+ @Override
+ public List<DownGlassInfoDTO> queryWorkStationFlowCard(List<Integer> workList) {
+ //鑾峰彇宸茬粦瀹氭祦绋嬪崱鐨勬灦瀛愭湭钀界幓鐠冪殑鏁版嵁淇℃伅
+ return baseMapper.queryWorkStationFlowCard(workList);
}
@Override
@@ -76,10 +108,179 @@
BeanUtils.copyProperties(details, downGlassInfo);
//鑾峰彇褰撳墠娴佺▼鍗℃渶澶х墖搴�
downGlassInfo.setSequence(this.getMaxSequenceByFlowCardId(details.getFlowCardId(), details.getLayer()) + 1);
+ downGlassInfo.setWorkStationId(Const.G13_WORK_STATION);
this.save(downGlassInfo);
//鐢熸垚浠诲姟淇℃伅 骞跺悜plc鍙戦�佸嚭鐗囦换鍔�
GlassInfo glassInfo = new GlassInfo();
BeanUtils.copyProperties(details, glassInfo);
return downLoadCacheGlassTask.initDownGlassTask(glassInfo, details.getSlot(), Const.G13_WORK_STATION, 2);
}
+
+ @Override
+ public String setDownGlassInfoRequest(DownGlassInfoRequest request) {
+ if (request == null) {
+ redisUtil.deleteObject("downGlassRequest");
+ } else {
+ redisUtil.setCacheObject("downGlassRequest", request);
+ }
+ return "success";
+ }
+
+ @Override
+ public List<DownWorkstation> queryWorkStationIsFull() {
+ //鏌ヨ鍙互钀芥灦鐨勭幓鐠冧俊鎭笖宸茬粦瀹氭祦绋嬪崱鐨勫伐浣嶄俊鎭�
+ List<DownWorkstation> list = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>().eq(DownWorkstation::getEnableState, Const.SLOT_ON)
+ .isNotNull(DownWorkstation::getFlowCardId).ne(DownWorkstation::getFlowCardId, ""));
+ List<DownWorkstation> workstationFull = new ArrayList<>();
+ if (CollectionUtils.isNotEmpty(list)) {
+ //閮芥湁鐜荤拑鐨勫伐浣嶄俊鎭紙鍖呮嫭缁戝畾娴佺▼鍗★級
+ List<Integer> workstationList = list.stream().map(DownWorkstation::getWorkstationId).collect(Collectors.toList());
+ //鎸夌収绗﹀悎鏉′欢鐨勫伐浣嶈幏鍙栨湭钀芥灦鐨勬祦绋嬪崱鐜荤拑锛屽鏋滆繑鍥炰负绌猴紝鍒欒〃鏄庢墍鏈夐兘宸茶惤鏋跺畬鎴�
+ List<DownGlassInfoDTO> downGlassInfoDTOList = queryWorkStationIsIn(workstationList, Boolean.FALSE);
+ //鑾峰彇宸ヤ綅涓婄殑鏈弧鐨勬祦绋嬪崱鍙婂眰鏁�
+ List<String> flowCardIdList = downGlassInfoDTOList.stream().map(item -> item.getFlowCardId() + ":" + item.getLayer()).collect(Collectors.toList());
+ //鍙互钀芥灦鐨勭幓鐠冧俊鎭笖宸茬粦瀹氭祦绋嬪崱鐨勬墍鏈夌殑宸ヤ綅 - 鐜荤拑鏈弧娴佺▼鍗″強灞傛暟鐨勫伐浣� = 宸叉弧宸ヤ綅
+ workstationFull = list.stream().filter(item -> !flowCardIdList.contains(item.getFlowCardId() + ":" + item.getLayer())).collect(Collectors.toList());
+ //鏄惁闇�瑕佸皢宸叉弧鐨勫伐浣嶇疆涓轰笉鍙惤鏋�
+ if (CollectionUtils.isNotEmpty(workstationFull)) {
+ List<Integer> workstationIds = workstationFull.stream().map(DownWorkstation::getWorkstationId).collect(Collectors.toList());
+ downWorkstationService.update(new LambdaUpdateWrapper<DownWorkstation>().set(DownWorkstation::getEnableState, Const.SLOT_OFF)
+ .in(DownWorkstation::getWorkstationId, workstationIds));
+ }
+ }
+ return workstationFull;
+ }
+
+ @Override
+ public List<Map<String, List<Map<String, Object>>>> downGlassPrint(DownGlassInfo downGlassInfo) {
+ log.info("鎵撳嵃鍙傛暟:{}", downGlassInfo);
+ QueryWrapper<DownGlassInfo> queryWrapper = Wrappers.query();
+ queryWrapper.eq("flow_card_id", downGlassInfo.getFlowCardId())
+ .eq("layer", downGlassInfo.getLayer())
+ .select("flow_card_id", "layer", "width", "height", "filmsid", "thickness", "glass_type", "COUNT(*) AS quantity")
+ .groupBy("flow_card_id", "layer", "width", "height", "filmsid", "thickness", "glass_type", "id")
+ .orderByAsc("id");
+ List<Map<String, Object>> resultList = baseMapper.selectMaps(queryWrapper);
+
+ log.info("MES钀芥灦鏁版嵁:{}", resultList);
+
+ List<Map<String, Object>> projectInfo = flowCardService.selectProject(downGlassInfo.getFlowCardId(), downGlassInfo.getLayer());
+ log.info("娴佺▼鍗″ご閮ㄦ暟鎹�:{}", projectInfo);
+ List<Map<String, Object>> flowCardInfo = flowCardService.selectFlowCard(downGlassInfo.getFlowCardId(), downGlassInfo.getLayer());
+ log.info("娴佺▼鍗＄幓鐠冩暟鎹�:{}", flowCardInfo);
+ for (Map<String, Object> row : flowCardInfo) {
+ int order_number = (int) row.get("order_number");
+ int technology_number = (int) row.get("technology_number");
+ int quantity1 = 0;
+ for (Map<String, Object> row1 : resultList) {
+ int glass_type = (int) row1.get("glass_type");
+ int layer = (int) row1.get("layer");
+// String child_width = (String) row1.get("child_width");
+// Long quantity = (Long) row1.get("quantity");
+// BigDecimal total_area = (BigDecimal) row1.get("total_area");
+// String separation = (String) row1.get("separation");
+// String perimeter = (String) row1.get("perimeter");
+// BigDecimal width = (BigDecimal) row1.get("width");
+// String other_columns = (String) row1.get("other_columns");
+// String remarks = (String) row1.get("remarks");
+// BigDecimal height = (BigDecimal) row1.get("height");
+ if (order_number == glass_type && technology_number == layer) {
+ quantity1+=1;
+// row.put("quantity", quantity);
+// row.put("order_number", order_number);
+// row.put("technology_number", technology_number);
+// row.put("child_width", child_width);
+// row.put("total_area", total_area);
+// row.put("separation", separation);
+// row.put("perimeter", perimeter);
+// row.put("width", width);
+// row.put("other_columns", other_columns);
+// row.put("remarks", remarks);
+// row.put("height", height);
+ }
+ }
+ row.put("quantity1", quantity1);
+ }
+ log.info("娴佺▼鍗＄幓鐠冩暟鎹�2:{}", flowCardInfo);
+ List<Map<String, List<Map<String, Object>>>> listMap = new ArrayList<>();
+ Map<String, List<Map<String, Object>>> result = new HashMap<>();
+ result.put("detail", projectInfo);
+ result.put("detailList", flowCardInfo);
+ for (Map<String, Object> row : projectInfo) {
+ String order_number = (String) row.get("process");
+ String[] processes = order_number.split("->");
+ List<Map<String, Object>> processList = new ArrayList<>();
+ for (int i = 0; i < processes.length; i++) {
+ Map<String, Object> processMap = new JSONObject();
+ processMap.put("process", processes[i]);
+ processMap.put("id", i);
+ processList.add(processMap);
+ }
+ result.put("processList", processList);
+ }
+ listMap.add(result);
+ return listMap;
+ }
+
+
+ @Override
+ public List<Map<String, Object>> downGlassLabelPrint(DownGlassInfo downGlassInfo) {
+ //鑾峰彇涓嬬墖鐜荤拑鐨勯『搴�
+// QueryWrapper<DownGlassInfo> queryWrapper = Wrappers.query();
+// queryWrapper
+// .eq("flow_card_id", downGlassInfo.getFlowCardId())
+// .eq("layer", downGlassInfo.getLayer())
+// .select("flow_card_id", "layer", "width", "height", "filmsid", "thickness", "glass_type", "COUNT(*) AS quantity")
+// .groupBy("flow_card_id", "layer", "width", "height", "filmsid", "thickness", "glass_type", "id")
+// .orderByAsc("id");
+// List<Map<String, Object>> resultList = baseMapper.selectMaps(queryWrapper);
+ List<Map<String, Object>> resultList = baseMapper.downGlassLabelPrint(downGlassInfo.getFlowCardId(), downGlassInfo.getLayer());
+ log.info("MES钀芥灦鏁版嵁:{}", resultList);
+ //鑾峰彇ERP鏍囩鎵�闇�鐨勪俊鎭�
+ List<Map<String, Object>> labelInfo = flowCardService.selectLabel(downGlassInfo.getFlowCardId(), downGlassInfo.getLayer());
+ log.info("鏍囩鏁版嵁:{}", labelInfo);
+
+ for (Map<String, Object> row : resultList) {
+ int glass_type = (int) row.get("glass_type");
+ int layer = (int) row.get("layer");
+ for (Map<String, Object> row1 : labelInfo) {
+ int orderNumber = (int) row1.get("orderNumber");
+ int technologyNumber = (int) row1.get("technologyNumber");
+ if (orderNumber == glass_type && technologyNumber == layer) {
+
+ String order_id = (String) row1.get("order_id");
+ String project = (String) row1.get("project");
+ Long customer_id = (Long) row1.get("customer_id");
+ BigDecimal width = (BigDecimal) row1.get("width");
+ BigDecimal height = (BigDecimal) row1.get("height");
+ Long quantity = (Long) row1.get("quantity");
+ String glass_child = (String) row1.get("glass_child");
+ String process = (String) row1.get("process");
+ String customer_name = (String) row1.get("customer_name");
+ String processing_note = (String) row1.get("processing_note");
+ String other_colunmns = (String) row1.get("other_colunmns");
+ String building_number = (String) row1.get("building_number");
+ String bend_radius = (String) row1.get("bend_radius");
+
+ row.put("orderNumber", orderNumber);
+ row.put("technology_number", technologyNumber);
+ row.put("order_id", order_id);
+ row.put("project", project);
+ row.put("customer_id", customer_id);
+ row.put("width", width);
+ row.put("height", height);
+ row.put("quantity", quantity);
+ row.put("glass_child", glass_child);
+ row.put("process", process);
+ row.put("customer_name", customer_name);
+ row.put("processing_note", processing_note);
+ row.put("other_colunmns", other_colunmns);
+ row.put("building_number", building_number);
+ row.put("bend_radius", bend_radius);
+ }
+ }
+ }
+ return resultList;
+ }
+
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/request/CacheWornRequest.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/request/CacheWornRequest.java
new file mode 100644
index 0000000..05a9aed
--- /dev/null
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/request/CacheWornRequest.java
@@ -0,0 +1,28 @@
+package com.mes.downstorage.entity.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/8/10 13:34
+ * @Description:
+ */
+@Data
+public class CacheWornRequest {
+
+ @NotBlank(message = "鐜荤拑ID涓嶈兘涓虹┖")
+ private String glassId;
+
+ @NotNull(message = "鐘舵�佷笉鑳戒负绌�")
+ private int state;
+
+ @NotNull(message = "绾胯矾涓嶈兘涓虹┖")
+ private int line;
+
+ @NotBlank(message = "宸ュ簭涓嶈兘涓虹┖")
+ private String workingProcedure;
+}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
index 18e1259..b204f0c 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
@@ -1,14 +1,18 @@
package com.mes.downstorage.service.impl;
import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.common.config.Const;
+import com.mes.damage.entity.Damage;
+import com.mes.damage.service.DamageService;
import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downglassinfo.service.DownGlassTaskService;
import com.mes.downstorage.entity.DownStorageCage;
import com.mes.downstorage.entity.DownStorageCageDetails;
+import com.mes.downstorage.entity.request.CacheWornRequest;
import com.mes.downstorage.mapper.DownStorageCageDetailsMapper;
import com.mes.downstorage.mapper.DownStorageCageMapper;
import com.mes.downstorage.service.DownStorageCageDetailsService;
@@ -46,6 +50,8 @@
private DownStorageCageDetailsService downStorageCageDetailsService;
@Autowired
private DownStorageCageDetailsMapper downStorageCageDetailsMapper;
+ @Autowired
+ DamageService damageService;
@Override
public DownGlassTask createDownGlassTask(GlassInfo glassInfo, Integer startCell, Integer endCell, Integer taskType) {
@@ -128,7 +134,6 @@
}
-
@Override
public List<Map<String, Object>> selectDownStorageCages() {
return baseMapper.selectJoinMaps(JoinWrappers.lambda(DownStorageCage.class)
@@ -190,7 +195,10 @@
if (downItem != null) {
//绉婚櫎
- DownStorageCageDetails result = downStorageCageDetailsMapper.selectOne(new MPJLambdaWrapper<DownStorageCageDetails>().eq(DownStorageCageDetails::getSlot, downStorageCageId));
+ DownStorageCageDetails result = downStorageCageDetailsMapper
+ .selectOne(new MPJLambdaWrapper<DownStorageCageDetails>()
+ .eq(DownStorageCageDetails::getSlot, downStorageCageId)
+ );
if (result != null) {
result.setSlot(0);
downStorageCageDetailsMapper.updateById(result);
@@ -200,4 +208,19 @@
return true;
}
+ @Override
+ public void deleteDownStorageCage(CacheWornRequest cacheWornRequest) {
+ Damage damage = new Damage();
+ BeanUtils.copyProperties(cacheWornRequest, damage);
+ damage.setType(cacheWornRequest.getState());
+ damage.setRemark("");
+ damage.setStatus(0);
+ damageService.insertDamage(damage);
+ downStorageCageDetailsService.update(new LambdaUpdateWrapper<DownStorageCageDetails>()
+ .set(DownStorageCageDetails::getState, Const.GLASS_STATE_OUT)
+ .eq(DownStorageCageDetails::getGlassId, cacheWornRequest.getGlassId())
+ .eq(DownStorageCageDetails::getState,Const.GLASS_STATE_IN));
+
+ }
+
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json
deleted file mode 100644
index e69de29..0000000
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json
+++ /dev/null
--
Gitblit v1.8.0