From d035982917751f376da2c0d4b4104ed3d64f39dc Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 12 九月 2024 08:53:44 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java | 68 ++++++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/controller/RawGlassStorageStationController.java | 21 +
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java | 21 +
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageDetailsMapper.xml | 5
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/entity/RawGlassStorageStation.java | 52 ++++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageTaskMapper.xml | 5
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/RawGlassStorageStationMapper.java | 16 +
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/xml/RawGlassStorageStationMapper.xml | 5
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassStorageTaskServiceImpl.java | 47 ++++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java | 54 ++++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/RawGlassStorageStationService.java | 22 ++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/mapper/xml/RawGlassStorageTaskMapper.xml | 5
hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java | 14 +
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/RawGlassStorageDetailsMapper.java | 16 +
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageStationMapper.xml | 5
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application.yml | 2
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java | 43 +++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java | 30 ++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/RawGlassStorageTaskService.java | 22 ++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/mapper/RawGlassStorageTaskMapper.java | 16 +
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 77 ++++++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java | 21 +
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java | 46 ++++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java | 21 +
24 files changed, 620 insertions(+), 14 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index e141c86..818be6b 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -21,6 +21,8 @@
import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.engineering.entity.Engineering;
+import com.mes.engineering.mapper.EngineeringMapper;
+import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.pp.entity.OptimizeDetail;
import com.mes.pp.entity.OptimizeLayout;
@@ -54,6 +56,9 @@
@Autowired
UpPattenUsageMapper upPattenUsageMapper;
+
+ @Autowired
+ EngineeringMapper engineeringMapper;
@Autowired
OptimizeDetailMapper optimizeDetailMapper;
@@ -116,16 +121,66 @@
*/
@Override
public List<Map<String, Object>> selectCutTerritory() {
+ //鏌ヨEdgStorageCageDetails鏈�鍚庝竴寮犵幓鐠冩墍灞炵増鍥�
List<UpPattenUsage> upPattenUsage=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
.selectAll(UpPattenUsage.class)
+ .distinct()
.innerJoin(Engineering.class, on -> on
.eq(Engineering::getEngineerId, UpPattenUsage::getEngineeringId))
+ .innerJoin(GlassInfo.class, on -> on
+ .eq(GlassInfo::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(GlassInfo::getPatternSequence,UpPattenUsage::getLayoutSequence))
+ .leftJoin(EdgStorageCageDetails.class, on -> on
+ .eq(EdgStorageCageDetails::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(EdgStorageCageDetails::getGlassId,GlassInfo::getGlassId))
+ .leftJoin(Damage.class, on -> on
+ .eq(Damage::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(Damage::getGlassId,GlassInfo::getGlassId))
.eq(Engineering::getState,1)
- .orderByDesc(UpPattenUsage::getState)
- .orderByDesc(UpPattenUsage::getId)
+ .and(wrapper->wrapper.isNotNull(EdgStorageCageDetails::getId).or().isNotNull(Damage::getId))
+ .orderByDesc(UpPattenUsage::getLayoutSequence)
+ .orderByDesc(GlassInfo::getId)
);
if (!upPattenUsage.isEmpty()) {
+ //褰撳墠鐗�
UpPattenUsage upPattenUsage1 = upPattenUsage.get(0);
+ //鏌ョ湅褰撳墠鐗堟槸鍚﹀瓨鍦ㄦ湭杩涚瀛愭垨鐮存崯鐨勭幓鐠�
+ List<UpPattenUsage> upPattenUsage2=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
+ .selectAll(UpPattenUsage.class)
+ .distinct()
+ .innerJoin(GlassInfo.class, on -> on
+ .eq(GlassInfo::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(GlassInfo::getPatternSequence,UpPattenUsage::getLayoutSequence))
+ .leftJoin(EdgStorageCageDetails.class, on -> on
+ .eq(EdgStorageCageDetails::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(EdgStorageCageDetails::getGlassId,GlassInfo::getGlassId))
+ .leftJoin(Damage.class, on -> on
+ .eq(Damage::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(Damage::getGlassId,GlassInfo::getGlassId))
+ .eq(UpPattenUsage::getEngineeringId,upPattenUsage.get(0).getEngineeringId())
+ .eq(UpPattenUsage::getLayoutSequence,upPattenUsage.get(0).getLayoutSequence())
+ .and(wrapper->wrapper.isNull(EdgStorageCageDetails::getId).or().isNull(Damage::getId))
+ .orderByDesc(UpPattenUsage::getLayoutSequence)
+ .orderByDesc(GlassInfo::getId)
+ );
+ //鏄剧ず涓嬩竴鐗� 鍚﹀垯鏄剧ず褰撳墠鐗堝浘
+ if(upPattenUsage2.isEmpty()){
+ //鍓╀綑鐗堝浘
+ List<UpPattenUsage> upPattenUsage3=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
+ .selectAll(UpPattenUsage.class)
+ .distinct()
+ .innerJoin(Engineering.class, on -> on
+ .eq(Engineering::getEngineerId, UpPattenUsage::getEngineeringId))
+ .eq(Engineering::getState,1)
+ .gt(UpPattenUsage::getLayoutSequence,upPattenUsage1.getLayoutSequence())
+ .orderByAsc(UpPattenUsage::getLayoutSequence)
+ );
+ if(!upPattenUsage3.isEmpty()){
+ //鍒囨崲鎴愪笅涓�鐗堝浘
+ upPattenUsage1=upPattenUsage3.get(0);
+ }
+ }
+
List<Map<String, Object>> cutTerritorys=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
.selectAll(OptimizeDetail.class)
.selectAs(OptimizeLayout::getWidth, "olWidth")
@@ -139,7 +194,6 @@
Map<String, EdgStorageCageDetails> edgMaps=baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
.selectAll(EdgStorageCageDetails.class)
.eq(EdgStorageCageDetails::getEngineerId,upPattenUsage1.getEngineeringId())
- .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails->EdgStorageCageDetails));
Map<String, Damage> damageMaps=damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
@@ -153,11 +207,11 @@
if(cutTerritory.get("glass_id")==null||"".equals(cutTerritory.get("glass_id"))){
log.info("浼樺寲鏁版嵁涓璯lassId瀛樺湪绌哄��-----鍐呭锛歿}",cutTerritorys);
return new ArrayList<>();
- }else if(edgMaps.get(cutTerritory.get("glass_id"))!=null){
- cutTerritory.put("glass_state",edgMaps.get(cutTerritory.get("glass_id")).getState());
}else if(damageMaps.get(cutTerritory.get("glass_id"))!=null){
//log.info("鐜荤拑宸茬牬鎹�/鎷胯蛋-----鍐呭锛歿}",damageMaps.get(item.get("glass_id")));
- cutTerritory.put("glass_state",damageMaps.get(cutTerritory.get("glass_id")).getStatus());
+ cutTerritory.put("glass_state",damageMaps.get(cutTerritory.get("glass_id")).getType());
+ }else if(edgMaps.get(cutTerritory.get("glass_id"))!=null){
+ cutTerritory.put("glass_state",edgMaps.get(cutTerritory.get("glass_id")).getState());
}else{
cutTerritory.put("glass_state",0);
}
@@ -177,6 +231,15 @@
@Override
public List<List<Map<String, Object>>> selectCurrentCutTerritory(String current) {
+ List<Engineering> engineering=engineeringMapper.selectJoinList(Engineering.class, new MPJLambdaWrapper<Engineering>()
+ .selectAll(Engineering.class)
+ .eq(Engineering::getEngineerId,current)
+ .gt(Engineering::getState,0)
+ );
+ if(engineering.size()==0){
+ log.info("褰撳墠宸ョ▼鍙锋湭棰嗗彇杩�:{}",current);
+ return new ArrayList<>();
+ }
//缁撴灉
List<Map<String, Object>> resultCutTerritory=new ArrayList<>();
//姝ゅ伐绋嬬殑鎵�鏈変紭鍖栨暟鎹�
@@ -208,7 +271,7 @@
}
if(damageMaps.get(item.get("glass_id"))!=null){
//log.info("鐜荤拑宸茬牬鎹�/鎷胯蛋-----鍐呭锛歿}",damageMaps.get(item.get("glass_id")));
- item.put("glass_state",damageMaps.get(item.get("glass_id")).getStatus());
+ item.put("glass_state",damageMaps.get(item.get("glass_id")).getType());
}else if(edgMaps.get(item.get("glass_id"))!=null){
item.put("glass_state",edgMaps.get(item.get("glass_id")).getState());
}else{
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java
index 700a1c1..0096d59 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java
@@ -2,6 +2,12 @@
import cn.hutool.json.JSONObject;
+import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
+import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
+import com.mes.rawglassstation.entity.RawGlassStorageStation;
+import com.mes.rawglassstation.service.RawGlassStorageStationService;
+import com.mes.rawglasstask.entity.RawGlassStorageTask;
+import com.mes.rawglasstask.service.RawGlassStorageTaskService;
import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
import com.mes.shelfrack.service.ShelfRackService;
import com.mes.storagetask.entity.request.StorageTaskRequest;
@@ -26,20 +32,27 @@
private StorageTaskService storageTaskService;
@Autowired
private ShelfRackService shelfRackService;
+ @Autowired
+ private RawGlassStorageDetailsService rawGlassStorageDetailsService;
+ @Autowired
+ private RawGlassStorageStationService rawGlassStorageStationService;
+ @Autowired
+ private RawGlassStorageTaskService rawGlassStorageTaskService;
@Scheduled(fixedDelay = 2000)
public void sendDownWorkstations() {
log.info("鍙戦�佷换鍔′俊鎭拰鏋跺瓙淇℃伅");
JSONObject jsonObject = new JSONObject();
-
- List<RawUsageAndShelfRack> rack = shelfRackService.selectshelf_rack();
- List<StorageTaskRequest> tasks = storageTaskService.Tasks();
+ List<RawGlassStorageDetails> rack = rawGlassStorageDetailsService.list();
+ List<RawGlassStorageStation> state = rawGlassStorageStationService.list();
+ List<RawGlassStorageTask> tasks = rawGlassStorageTaskService.selectTasks();
jsonObject.append("rack",rack);
+ jsonObject.append("state",state);
jsonObject.append("tasks",tasks);
log.info(jsonObject.toString());
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("storageTask");
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("rawGlass");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
if (webserver != null&&webserver.session.isOpen()) {
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java
new file mode 100644
index 0000000..2904608
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java
@@ -0,0 +1,21 @@
+package com.mes.rawglassdetails.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author wf
+ * @since 2024-09-10
+ */
+@RestController
+@RequestMapping("/raw_glass_storage_details/raw-glass-storage-details")
+public class RawGlassStorageDetailsController {
+
+}
+
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java
new file mode 100644
index 0000000..888b6bb
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java
@@ -0,0 +1,68 @@
+package com.mes.rawglassdetails.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author wf
+ * @since 2024-09-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class RawGlassStorageDetails implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 璁惧id
+ */
+ private Integer deviceId;
+
+ /**
+ * 鏍煎瓙id
+ */
+ private String slotId;
+
+ /**
+ * 鍘熺墖瀹�
+ */
+ private Double patternWidth;
+
+ /**
+ * 鍘熺墖楂�
+ */
+ private Double patternHeight;
+
+ /**
+ * 鍘熺墖鍘氬害
+ */
+ private Double patternThickness;
+
+ /**
+ * 鑶滅郴
+ */
+ private String filmsId;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private LocalDateTime createTime;
+
+ /**
+ * 鍓╀綑鏁伴噺
+ */
+ private String remainQuantity;
+
+
+}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/RawGlassStorageDetailsMapper.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/RawGlassStorageDetailsMapper.java
new file mode 100644
index 0000000..868b2fd
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/RawGlassStorageDetailsMapper.java
@@ -0,0 +1,16 @@
+package com.mes.rawglassdetails.mapper;
+
+import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author wf
+ * @since 2024-09-10
+ */
+public interface RawGlassStorageDetailsMapper extends BaseMapper<RawGlassStorageDetails> {
+
+}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageDetailsMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageDetailsMapper.xml
new file mode 100644
index 0000000..454dde2
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageDetailsMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="glassdetails.mapper.RawGlassStorageDetailsMapper">
+
+</mapper>
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageStationMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageStationMapper.xml
new file mode 100644
index 0000000..ba48273
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageStationMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="glassdetails.mapper.RawGlassStorageStationMapper">
+
+</mapper>
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageTaskMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageTaskMapper.xml
new file mode 100644
index 0000000..e057e23
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageTaskMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="glassdetails.mapper.RawGlassStorageTaskMapper">
+
+</mapper>
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java
new file mode 100644
index 0000000..4e50b54
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java
@@ -0,0 +1,30 @@
+package com.mes.rawglassdetails.service;
+
+import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author wf
+ * @since 2024-09-10
+ */
+public interface RawGlassStorageDetailsService extends IService<RawGlassStorageDetails> {
+ List<RawGlassStorageDetails> selectDetails();
+
+ boolean updateRawGlassStorageDetails(String films_id);//瑕佸ぇ鍐欒繖涓�
+ /**
+ *鍒犻櫎琛�
+ * @return boolean
+ */
+ boolean deleteRawGlassStorageDetails(String device_id);//鍏堝湪杩欓噷鍒� 鐒跺悗鐐归偅涓浉鍏抽棶棰�
+ /**
+ *鏂板琛�
+ * @return boolean
+ */
+ boolean insertRawGlassStorageDetails(RawGlassStorageDetails rw);
+}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
new file mode 100644
index 0000000..031e115
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
@@ -0,0 +1,54 @@
+package com.mes.rawglassdetails.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
+import com.mes.rawglassdetails.mapper.RawGlassStorageDetailsMapper;
+import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author wf
+ * @since 2024-09-10
+ */
+@Service
+public abstract class RawGlassStorageDetailsServiceImpl extends ServiceImpl<RawGlassStorageDetailsMapper, RawGlassStorageDetails> implements RawGlassStorageDetailsService {
+
+ @Override
+ public boolean updateRawGlassStorageDetails(String films_id) {
+ UpdateWrapper<RawGlassStorageDetails> wrapper = new UpdateWrapper<>(); //杩欎釜绫诲瀷瀹氫箟閿欎簡锛屼笉搴旇鏄痶asking
+ wrapper.set("films_id","1005")
+ .eq( "films_id",films_id);
+
+ return update(wrapper);//杩欎釜鏂规硶榛樿杩斿洖鐨勫氨鏄痓ool绫诲瀷 鎵�鏈夊彲浠ョ洿鎺eturn杩欎釜鏂规硶锛宱k浜嗭紝浣犳甯稿垱寤烘柟娉曞幓涓婁竴灞傚垱
+ }
+
+ @Override
+ public boolean deleteRawGlassStorageDetails(String device_id) {
+ QueryWrapper<RawGlassStorageDetails> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("device_id", device_id);
+ return remove(queryWrapper);//remove鎵嶆槸鍒犻櫎锛宒elete寰楃敤鍙﹀鐨勪緷璧栵紝榛樿鏂规硶鏄痳emove杩斿洖bool
+
+ }
+
+ @Override
+ //杩斿洖绫诲瀷 鏂规硶鍚� 浼犺緭鍊�
+ public List<RawGlassStorageDetails> selectDetails() {
+// QueryWrapper<RawGlassStorageDetails>queryWrapper=new QueryWrapper<>();
+// queryWrapper.eq("id",rs.getId());
+// return list(queryWrapper);
+ return list();
+ }
+ @Override
+ public boolean insertRawGlassStorageDetails(RawGlassStorageDetails rw){
+ return this.save(rw);
+ }
+
+}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/controller/RawGlassStorageStationController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/controller/RawGlassStorageStationController.java
new file mode 100644
index 0000000..1b6dc42
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/controller/RawGlassStorageStationController.java
@@ -0,0 +1,21 @@
+package com.mes.rawglassstation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author wf
+ * @since 2024-09-10
+ */
+@RestController
+@RequestMapping("/raw-glass-storage-station")
+public class RawGlassStorageStationController {
+
+}
+
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/entity/RawGlassStorageStation.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/entity/RawGlassStorageStation.java
new file mode 100644
index 0000000..ba221fc
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/entity/RawGlassStorageStation.java
@@ -0,0 +1,52 @@
+package com.mes.rawglassstation.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author wf
+ * @since 2024-09-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class RawGlassStorageStation implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 璁惧id
+ */
+ private Integer deviceId;
+
+ /**
+ * 鏍呮牸鍙�
+ */
+ private Integer slot;
+
+ /**
+ * 鍚敤鏍囪
+ */
+ private String enableState;
+
+ /**
+ * 寮�濮嬪伐浣�
+ */
+ private Integer startSlot;
+
+ /**
+ * 鐩爣宸ヤ綅
+ */
+ private Integer endSlot;
+
+
+}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/RawGlassStorageStationMapper.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/RawGlassStorageStationMapper.java
new file mode 100644
index 0000000..2e3a28e
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/RawGlassStorageStationMapper.java
@@ -0,0 +1,16 @@
+package com.mes.rawglassstation.mapper;
+
+import com.mes.rawglassstation.entity.RawGlassStorageStation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author wf
+ * @since 2024-09-10
+ */
+public interface RawGlassStorageStationMapper extends BaseMapper<RawGlassStorageStation> {
+
+}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/xml/RawGlassStorageStationMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/xml/RawGlassStorageStationMapper.xml
new file mode 100644
index 0000000..2f85aa9
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/xml/RawGlassStorageStationMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mes.raw_glass_storage_station.mapper.RawGlassStorageStationMapper">
+
+</mapper>
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/RawGlassStorageStationService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/RawGlassStorageStationService.java
new file mode 100644
index 0000000..5d16c85
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/RawGlassStorageStationService.java
@@ -0,0 +1,22 @@
+package com.mes.rawglassstation.service;
+
+import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
+import com.mes.rawglassstation.entity.RawGlassStorageStation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author wf
+ * @since 2024-09-10
+ */
+public interface RawGlassStorageStationService extends IService<RawGlassStorageStation> {
+ List<RawGlassStorageStation> selectStations();
+ boolean updateRawGlassStorageStation(String slot);
+ boolean deleteRawGlassStorageStation(String device_id);
+ boolean insertRawGlassStorageStation(RawGlassStorageStation rw);
+}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java
new file mode 100644
index 0000000..457ef85
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java
@@ -0,0 +1,46 @@
+package com.mes.rawglassstation.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
+import com.mes.rawglassstation.entity.RawGlassStorageStation;
+import com.mes.rawglassstation.mapper.RawGlassStorageStationMapper;
+import com.mes.rawglassstation.service.RawGlassStorageStationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author wf
+ * @since 2024-09-10
+ */
+@Service
+public abstract class RawGlassStorageStationServiceImpl extends ServiceImpl<RawGlassStorageStationMapper, RawGlassStorageStation> implements RawGlassStorageStationService {
+ public List<RawGlassStorageStation> selectDetails() {
+ return list();
+ }
+ @Override
+ public boolean updateRawGlassStorageStation(String slot) {
+ UpdateWrapper<RawGlassStorageStation> wrapper = new UpdateWrapper<>(); //杩欎釜绫诲瀷瀹氫箟閿欎簡锛屼笉搴旇鏄痶asking
+ wrapper.set("slot","105")
+ .eq( "slot",slot);
+ return update(wrapper);
+ }
+
+ @Override
+ public boolean deleteRawGlassStorageStation(String device_id) {
+ QueryWrapper<RawGlassStorageStation> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("device_id", device_id);
+ return remove(queryWrapper);
+ }
+
+ @Override
+ public boolean insertRawGlassStorageStation(RawGlassStorageStation rw) {
+ return this.save(rw);
+ }
+}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java
new file mode 100644
index 0000000..0866915
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java
@@ -0,0 +1,21 @@
+package com.mes.rawglasstask.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author wf
+ * @since 2024-09-10
+ */
+@RestController
+@RequestMapping("/raw_glass_storage_task/raw-glass-storage-task")
+public class RawGlassStorageTaskController {
+
+}
+
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java
new file mode 100644
index 0000000..0249fa8
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java
@@ -0,0 +1,43 @@
+package com.mes.rawglasstask.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author wf
+ * @since 2024-09-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class RawGlassStorageTask implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 璧峰鏍煎瓙
+ */
+ private Integer originateSlot;
+
+ /**
+ * 浠诲姟鐘舵��
+ */
+ private Integer enableState;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private LocalDateTime createTime;
+
+
+}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/mapper/RawGlassStorageTaskMapper.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/mapper/RawGlassStorageTaskMapper.java
new file mode 100644
index 0000000..10ad9db
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/mapper/RawGlassStorageTaskMapper.java
@@ -0,0 +1,16 @@
+package com.mes.rawglasstask.mapper;
+
+import com.mes.rawglasstask.entity.RawGlassStorageTask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author wf
+ * @since 2024-09-10
+ */
+public interface RawGlassStorageTaskMapper extends BaseMapper<RawGlassStorageTask> {
+
+}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/mapper/xml/RawGlassStorageTaskMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/mapper/xml/RawGlassStorageTaskMapper.xml
new file mode 100644
index 0000000..db62395
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/mapper/xml/RawGlassStorageTaskMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mes.raw_glass_storage_task.mapper.RawGlassStorageTaskMapper">
+
+</mapper>
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/RawGlassStorageTaskService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/RawGlassStorageTaskService.java
new file mode 100644
index 0000000..58c1fbd
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/RawGlassStorageTaskService.java
@@ -0,0 +1,22 @@
+package com.mes.rawglasstask.service;
+
+import com.mes.rawglassstation.entity.RawGlassStorageStation;
+import com.mes.rawglasstask.entity.RawGlassStorageTask;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author wf
+ * @since 2024-09-10
+ */
+public interface RawGlassStorageTaskService extends IService<RawGlassStorageTask> {
+ List<RawGlassStorageTask> selectTasks();
+ boolean updateRawGlassStorageTask(String originate_slot);
+ boolean deleteRawGlassStorageTask(String id);
+ boolean insertRawGlassStorageTask(RawGlassStorageTask rw);
+}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassStorageTaskServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassStorageTaskServiceImpl.java
new file mode 100644
index 0000000..ec055f0
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassStorageTaskServiceImpl.java
@@ -0,0 +1,47 @@
+package com.mes.rawglasstask.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
+import com.mes.rawglassstation.entity.RawGlassStorageStation;
+import com.mes.rawglasstask.entity.RawGlassStorageTask;
+import com.mes.rawglasstask.mapper.RawGlassStorageTaskMapper;
+import com.mes.rawglasstask.service.RawGlassStorageTaskService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author wf
+ * @since 2024-09-10
+ */
+@Service
+public abstract class RawGlassStorageTaskServiceImpl extends ServiceImpl<RawGlassStorageTaskMapper, RawGlassStorageTask> implements RawGlassStorageTaskService {
+
+ public List<RawGlassStorageTask> selectDetails() {
+ return list();
+ }
+ @Override
+ public boolean insertRawGlassStorageTask(RawGlassStorageTask rw) {
+ return this.save(rw);
+ }
+ @Override
+ public boolean updateRawGlassStorageTask(String originate_slot) {
+ UpdateWrapper<RawGlassStorageTask> wrapper = new UpdateWrapper<>();
+ wrapper.set("originate_slot","1005")
+ .eq( "originate_slot",originate_slot);
+ return update(wrapper);
+ }
+
+ @Override
+ public boolean deleteRawGlassStorageTask(String id) {
+ QueryWrapper<RawGlassStorageTask> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("id", id);
+ return remove(queryWrapper);
+ }
+}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application.yml
index 3b841eb..d2bd76c 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@
spring:
profiles:
- active: dev
+ active: prod
application:
name: glassStorage
liquibase:
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
index 022d334..8d43e9b 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
@@ -1,11 +1,11 @@
package mes;
import com.mes.GlassStorageApplication;
+import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
+import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
import com.mes.rawusage.entity.RawUsage;
import com.mes.rawusage.service.RawUsageService;
-import com.mes.shelfrack.entity.ShelfRack;
import com.mes.shelfrack.service.ShelfRackService;
-import com.mes.storagetask.entity.StorageTask;
import com.mes.storagetask.service.StorageTaskService;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
@@ -15,6 +15,7 @@
import org.springframework.test.context.junit4.SpringRunner;
import java.util.Arrays;
+import java.util.List;
/**
* @Author : zhoush
@@ -35,6 +36,8 @@
private ShelfRackService shelfRackService;
@Autowired
private RawUsageService rawUsageService;
+ @Autowired
+ private RawGlassStorageDetailsService rawGlassStorageDetailsService;
@Test
@@ -69,6 +72,13 @@
raw.setId(null);
rawUsageService.updateRawPackageAndStorageRack(raw);
}
+ @Test
+ public void txt() {
+ RawGlassStorageDetails rs=new RawGlassStorageDetails();
+ rs.setId(105L);
+ List<RawGlassStorageDetails> aa=rawGlassStorageDetailsService.selectDetails();
+ log.info(String.valueOf(aa));
+ }
--
Gitblit v1.8.0