From 3dc8dcf5854bb90b9d5fb07ab449053ed6a361ae Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 06 五月 2024 15:32:10 +0800
Subject: [PATCH] 更新逻辑
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java | 6 +
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationService.java | 17 +-
hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java | 16 +-
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 43 ++++--
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java | 37 +++---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 106 ++++++++--------
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java | 5
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java | 4
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java | 5
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java | 13 -
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassTaskService.java | 11 +
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java | 13 +-
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java | 4
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java | 6
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationTaskService.java | 9 -
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCageDetails.java | 2
19 files changed, 162 insertions(+), 141 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
index 6802de6..48e78f1 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
@@ -1,56 +1,56 @@
package com.mes.uppattenusage.controller;
-
-import com.mes.glassinfo.service.GlassInfoService;
-import com.mes.uppattenusage.entity.OptimizeUpPattenUsage;
-import com.mes.uppattenusage.entity.UpPattenUsage;
-import com.mes.glassinfo.entity.GlassInfo;
-import com.mes.uppattenusage.service.UpPattenUsageService;
-import com.mes.utils.Result;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-18
- */
-@RestController
-@RequestMapping("/up-patten-usage")
-@Slf4j
-public class UpPattenUsageController {
-
- @Autowired
- private UpPattenUsageService upPattenUsageService;
- @Autowired
- private GlassInfoService glassInfoService;
- @ApiOperation("鏄剧ず姝ｅ湪鍑虹墖鐨勫伐绋嬩俊鎭�")
- @GetMapping("/prioritylist") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
- public Result<List<UpPattenUsage>> prioritylist() {
- List<UpPattenUsage> glass = upPattenUsageService.prioritylist(1);
- log.info("鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅:{}", glass);
- return Result.build(200, "", glass);
- }
-
- @ApiOperation("鐐瑰嚮閫夋嫨宸ョ▼淇濆瓨鍚庤繘琛岃皟鐢�,浼犲叆宸ョ▼鍙�")
- @GetMapping("/saveUpPattenUsage") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
- public Result<Integer> saveUpPattenUsage(String engineeringId) {
- List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineeringId);
- log.info("灏嗘煡璇㈠嚭鐨刄pPattenUsage鏁版嵁淇濆瓨鍒版暟鎹簱琛ㄩ噷");
- upPattenUsageService.saveUpPattenUsage(upPattenUsages);
- log.info("浠嶱P琛ㄦ煡璇lassinfo鐨勬暟鎹苟淇濆瓨鍒拌〃閲�");
- List<GlassInfo> glassinfo=glassInfoService.selectGlassInfo(engineeringId);
- return Result.build(200, "", 200);
- }
-}
+//
+//import com.mes.uppattenusage.service.GlassInfoService;
+//import com.mes.uppattenusage.entity.OptimizeUpPattenUsage;
+//import com.mes.uppattenusage.entity.UpPattenUsage;
+//import com.mes.glassinfo.entity.GlassInfo;
+//import com.mes.uppattenusage.service.UpPattenUsageService;
+//import com.mes.utils.Result;
+//import io.swagger.annotations.ApiOperation;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RequestBody;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import java.util.List;
+//
+///**
+// * <p>
+// * 鍓嶇鎺у埗鍣�
+// * </p>
+// *
+// * @author zhoush
+// * @since 2024-04-18
+// */
+//@RestController
+//@RequestMapping("/up-patten-usage")
+//@Slf4j
+//public class UpPattenUsageController {
+//
+// @Autowired
+// private UpPattenUsageService upPattenUsageService;
+// @Autowired
+// private GlassInfoService glassInfoService;
+// @ApiOperation("鏄剧ず姝ｅ湪鍑虹墖鐨勫伐绋嬩俊鎭�")
+// @GetMapping("/prioritylist") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
+// public Result<List<UpPattenUsage>> prioritylist() {
+// List<UpPattenUsage> glass = upPattenUsageService.prioritylist(1);
+// log.info("鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅:{}", glass);
+// return Result.build(200, "", glass);
+// }
+//
+// @ApiOperation("鐐瑰嚮閫夋嫨宸ョ▼淇濆瓨鍚庤繘琛岃皟鐢�,浼犲叆宸ョ▼鍙�")
+// @GetMapping("/saveUpPattenUsage") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
+// public Result<Integer> saveUpPattenUsage(String engineeringId) {
+// List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineeringId);
+// log.info("灏嗘煡璇㈠嚭鐨刄pPattenUsage鏁版嵁淇濆瓨鍒版暟鎹簱琛ㄩ噷");
+// upPattenUsageService.saveUpPattenUsage(upPattenUsages);
+// log.info("浠嶱P琛ㄦ煡璇lassinfo鐨勬暟鎹苟淇濆瓨鍒拌〃閲�");
+// List<GlassInfo> glassinfo=glassInfoService.selectGlassInfo(engineeringId);
+// return Result.build(200, "", 200);
+// }
+//}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java
index c735f23..48861a2 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java
@@ -28,22 +28,17 @@
private DownWorkstationService downWorkstationService;
-
-
-
- // @Scheduled(fixedDelay = 300)
+ @Scheduled(fixedDelay = 300)
public void PlcdownglassTask() throws InterruptedException {
JSONObject jsonObject = new JSONObject();
try {
Thread.sleep(300);
-
-
// String result = S7control.getinstance().ReadWord("DB14.0", 1).get(0) + "";
// String number = S7control.getinstance().ReadWord("DB14.2", 1).get(0) + "";
- String result ="1";
- String number ="1";
+ String result = "2";
+ String number = "1";
// 杩涚墖璇锋眰
if (RESULT_IN.equals(result)) {
downStorageCageService.processInto(number);
@@ -60,7 +55,7 @@
}
}
- //涓嬬墖鏇存柊
+ //涓嬬墖鏇存柊
downWorkstationService.insertdownglassinfo();
} catch (Exception e) {
e.printStackTrace();
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java
index 232b7b7..5903d00 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java
@@ -71,5 +71,8 @@
*/
private Integer taskStauts;
-
+ /**
+ * 鐜荤拑id
+ */
+ private String glassId;
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java
index 25d4f0e..2feead5 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java
@@ -8,13 +8,12 @@
/**
* @param flowCardId
- * @return // 鏍规嵁娴佺▼鍗″彿鏌ヨ鏈�澶у簭鍙�
+ * @return // 鏍规嵁娴佺▼鍗″彿鏌ヨ鏈�澶у簭鍙�
*/
Integer getMaxSequenceByFlowCardId(String flowCardId);
/**
- * @param downGlassInfo
- * 鎻掑叆涓嬬墖淇℃伅
+ * @param downGlassInfo 鎻掑叆涓嬬墖淇℃伅
*/
void insertDownGlassInfo(DownGlassInfo downGlassInfo);
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassTaskService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassTaskService.java
index 2b4c483..4521c5a 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassTaskService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassTaskService.java
@@ -16,38 +16,49 @@
public interface DownGlassTaskService extends IService<DownGlassTask> {
/**
* 鏌ヨ浠诲姟鐘舵�佷负1鐨勪俊鎭�
+ *
* @return
*/
List<DownGlassTask> getUnloadingTaskState();
+
/**
* 鏇存柊浠诲姟鐘舵��
+ *
* @return
*/
void updateTaskStateToZero(long id);
+
/**
* 鍒犻櫎浠诲姟
+ *
* @return
*/
void deleteTask(String id);
+
/**
* 鏌ヨ鍑虹墖浠诲姟
+ *
* @return
*/
DownGlassTask selectLastOutCacheInfo(String endCell);
+
/**
* 鎻掑叆浠诲姟
+ *
* @return
*/
Integer insertCacheTask(DownGlassTask downGlassTask);
/**
* 鏌ヨ杩涚墖浠诲姟
+ *
* @return
*/
List<DownGlassTask> selectInputTaskCache();
/**
* 鏌ヨ鍑虹墖浠诲姟 澶囩敤
+ *
* @return
*/
List<DownGlassTask> selectOutTaskCache();
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 c09e221..66783be 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
@@ -41,8 +41,4 @@
}
-
-
-
-
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
index cb42e3f..8feea50 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
@@ -60,40 +60,39 @@
@Override
public Integer insertCacheTask(DownGlassTask downGlassTask) {
- DownGlassTask glassInfo = new DownGlassTask();
-// glassInfo.setId(downGlassTask.getId());
-// glassInfo.setStartCell(downGlassTask.getStartCell());
-// glassInfo.setEndCell(downGlassTask.getEndCell());
-// glassInfo.setTaskType(downGlassTask.getTaskType());
-// glassInfo.setWidth(downGlassTask.getWidth());
-// glassInfo.setHeight(downGlassTask.getHeight());
-// glassInfo.setFilmsid(downGlassTask.getFilmsid());
-// glassInfo.setThickness(downGlassTask.getThickness());
-// glassInfo.setFlowCardId(downGlassTask.getFlowCardId());
- BeanUtils.copyProperties(downGlassTask,glassInfo);
- glassInfo.setTaskStauts(0); // 榛樿浠诲姟鐘舵�佷负0
+ // 鏌ヨ鏁版嵁搴擄紝妫�鏌ヤ富閿�兼槸鍚﹀凡缁忓瓨鍦�
+ DownGlassTask existingTask = baseMapper.selectById(downGlassTask.getId());
+ if (existingTask != null) {
+ // 濡傛灉宸插瓨鍦ㄧ浉鍚屼富閿�肩殑浠诲姟锛屽垯涓嶈繘琛屾彃鍏ユ搷浣滐紝杩斿洖 null 鎴栬�呮姏鍑哄紓甯�
+ // 杩欓噷绠�鍗曡捣瑙侊紝鐩存帴杩斿洖 null
+ return null;
+ }
- int rows = baseMapper.insert(glassInfo);
+ // 濡傛灉涓婚敭鍊间笉瀛樺湪锛屽垯杩涜鎻掑叆鎿嶄綔
+ DownGlassTask newDownGlassTask = new DownGlassTask();
+ BeanUtils.copyProperties(downGlassTask, newDownGlassTask);
+ newDownGlassTask.setTaskStauts(0); // 榛樿浠诲姟鐘舵�佷负0
+
+ int rows = baseMapper.insert(newDownGlassTask);
return rows > 0 ? rows : null;
}
-
@Override
- public List<DownGlassTask> selectInputTaskCache(){
- return baseMapper.selectList(new QueryWrapper<DownGlassTask>().eq("task_status",0).eq("task_type",1));
+ public List<DownGlassTask> selectInputTaskCache() {
+ return baseMapper.selectList(new QueryWrapper<DownGlassTask>().eq("task_status", 0).eq("task_type", 1));
}
/**
* 鏌ヨ寰呭嚭鐗囦换鍔�
+ *
* @return
*/
@Override
- public List<DownGlassTask> selectOutTaskCache(){
- return baseMapper.selectList(new QueryWrapper<DownGlassTask>().eq("task_status",0).eq("task_type",2));
+ public List<DownGlassTask> selectOutTaskCache() {
+ return baseMapper.selectList(new QueryWrapper<DownGlassTask>().eq("task_status", 0).eq("task_type", 2));
}
-
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
index 17a62f7..31c1308 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
@@ -34,7 +34,7 @@
@GetMapping("/selectStorageCage")
@ResponseBody
public Result selectEdgStorageCage () {
- List<Map> list=downStorageCageService.getCacheInfo();
+ List<Map> list=downStorageCageDetailsService.getCacheInfo();
return Result.build(200,"鎴愬姛",list);
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java
index 1617790..c5cc426 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java
@@ -1,6 +1,7 @@
package com.mes.downstorage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -48,6 +49,7 @@
* 鍚敤鐘舵��
*/
@ApiModelProperty(value = "鍚敤鐘舵��", position = 5)
+ @TableField("enable_state")
private String enableState;
/**
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCageDetails.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCageDetails.java
index c5b11a4..9298084 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCageDetails.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCageDetails.java
@@ -86,7 +86,7 @@
/**
* 鑶滅郴id
*/
- private int filmsid;
+ private String filmsid;
/**
* 鐘舵��
*/
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
index 3764770..78b15e4 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
@@ -8,17 +8,16 @@
public interface DownStorageCageDetailsService {
/**
-
- * @return //娣诲姞鐞嗙墖绗煎唴淇℃伅
+ * @return //娣诲姞鐞嗙墖绗煎唴淇℃伅
*/
void addDownStorageCageDetails(DownStorageCageDetails details);
/**
-
- * @return //淇敼鐞嗙墖绗煎唴淇℃伅
+ * @return //淇敼鐞嗙墖绗煎唴淇℃伅
*/
boolean updatedownStorageCageDetails(DownStorageCageDetails details);
+
List<DownStorageCageDetails> getCacheLeisure();
/**
@@ -29,7 +28,7 @@
List<DownStorageCageDetails> getCacheOut(int start, int end);
/**
- * @return 鏌ヨ绗煎瓙鍐呬俊鎭�
+ * @return 鏌ヨ绗煎瓙鍐呬俊鎭�
*/
List<Map> getCacheInfo();
@@ -44,11 +43,13 @@
/**
* @param start
* @param end
- * @return log.info("鍗曠墖鎯呭喌鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓уぇ灏忓嚭鐗�,骞朵笖浼樺厛鍑烘弧鏋剁殑灏忕墖");
+ * @return log.info(" 鍗曠墖鎯呭喌鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓уぇ灏忓嚭鐗�, 骞朵笖浼樺厛鍑烘弧鏋剁殑灏忕墖 ");
*/
List<DownStorageCageDetails> CacheOut(int start, int end);
+
/**
* @return 鏌ヨ绌烘牸瀛�
*/
List<DownStorageCageDetails> selectCacheEmpty2();
+
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java
index ad8f49b..81a88a8 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java
@@ -22,19 +22,21 @@
// List<Map<String, Object>> selectCacheLeisure();
-
-
-
/**
* @param Number
- * @return 杩涚墖
+ * @return 杩涚墖
*/
boolean processInto(String Number);
+
/**
- *
- * @return 鍑虹墖
+
+ * @return 绌烘牸
+ */
+
+ /**
+ * @return 鍑虹墖
*/
boolean processOut();
-
+ List<DownStorageCageDetails> selectCacheEmpty() ;
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java
index 1764024..b5c01ee 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.toolkit.JoinWrappers;
import com.mes.downstorage.entity.DownStorageCage;
import com.mes.downstorage.entity.DownStorageCageDetails;
import com.mes.downstorage.mapper.DownStorageCageDetailsMapper;
@@ -143,6 +144,9 @@
.orderByAsc("escd.sequence")
);
+
+
+
}
@@ -157,4 +161,6 @@
+
+
}
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 a723b66..d1a6673 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,5 +1,6 @@
package com.mes.downstorage.service.impl;
+import com.github.yulichang.toolkit.JoinWrappers;
import com.mes.common.PLCAutoMes;
import com.mes.common.S7control;
import com.mes.device.PlcParameterObject;
@@ -19,6 +20,7 @@
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -65,11 +67,11 @@
-
public DownGlassTask createDownGlassTask(GlassInfo glassInfo, String startCell, String endCell,String taskType ) {
DownGlassTask downGlassTask = new DownGlassTask();
- BeanUtils.copyProperties(downGlassTask,glassInfo);
+ BeanUtils.copyProperties(glassInfo,downGlassTask);
+
downGlassTask.setStartCell(startCell);
downGlassTask.setTaskType(taskType);
downGlassTask.setEndCell(endCell);
@@ -80,7 +82,7 @@
public DownGlassTask createDownGlassTask(DownStorageCageDetails glassInfo, String startCell, String endCell,String taskType ) {
DownGlassTask downGlassTask = new DownGlassTask();
- BeanUtils.copyProperties(downGlassTask,glassInfo);
+ BeanUtils.copyProperties(glassInfo,downGlassTask);
downGlassTask.setStartCell(startCell);
downGlassTask.setTaskType(taskType);
downGlassTask.setEndCell(endCell);
@@ -97,13 +99,13 @@
//瀛樺湪姝ょ幓鐠冪紪鍙�
if (GlassInfo != null) {
//鍚屾壘鍒板悓娴佺▼鍗￠檮杩戠┖鏍�
- List<DownStorageCageDetails> list = downStorageCageDetailsService.getIsExistIntoCacheByflowcardid(GlassInfo.getFlowcardId(), GlassInfo.getWidth());
+ List<DownStorageCageDetails> list = selectCacheEmpty();
- List<DownStorageCageDetails> selectCacheEmpty=downStorageCageDetailsService.selectCacheEmpty2();
+
// list<Map> list=selectCacheEmpty();
// list<Map> = downStorageCageService.selectCacheEmpty();
- if (selectCacheEmpty.size() > 0) {
+ if (list.size() > 0) {
//瀛樺湪绌烘牸
//1.鐢熸垚浠诲姟锛� 璧峰浣嶇疆0 缁撴潫浣嶇疆this.slot 浠诲姟绫诲瀷 1 锛堣繘鐗囦换鍔★級
//2.鍥炲 1杩涚墖
@@ -115,7 +117,7 @@
downGlassTaskService.insertCacheTask(downGlassTask);
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1);
+ //S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1);
//瀹屾垚鍚庢彃鍏ュ皬鐗囨暟鎹埌缂撳瓨琛�
@@ -159,13 +161,13 @@
String endcell = "13";
String SendEndcell = "1";
-// selectInfo.insertCacheTask(item3.getGlassId() + "", "0", endcell, "2", item3.getWidth(), item3.getHeight(), item3.getFilmsid(), item3.getThickness(), item3.getFlowCardId());
+
DownGlassTask downGlassTask =createDownGlassTask(item3,"0",endcell,"2");
downGlassTaskService.insertCacheTask(downGlassTask);
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
+ // S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
+ // S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
return true;
}
}
@@ -177,7 +179,7 @@
DownStorageCageDetails item3 = list2.get(0);
String endcell = "11";
String SendEndcell = "1";
- // selectInfo.insertCacheTask(item3.getGlassId() + "", "0", endcell, "2", item3.getWidth(), item3.getHeight(), item3.getFilmsid(), item3.getThickness(), item3.getFlowCardId());
+
DownGlassTask downGlassTask =createDownGlassTask(item3,"0",endcell,"2");
downGlassTaskService.insertCacheTask(downGlassTask);
@@ -191,7 +193,7 @@
DownStorageCageDetails item = list.get(0);
// 鍑哄埌 G06
- //selectInfo.insertCacheTask(item.getGlassId() + "", "0", "06", "2", item.getWidth(), item.getHeight(), item.getFilmsid(), item.getThickness(), item.getFlowCardId());
+
DownGlassTask downGlassTask =createDownGlassTask(item,"0","06","2");
downGlassTaskService.insertCacheTask(downGlassTask);
@@ -204,7 +206,7 @@
DownStorageCageDetails item2 = list2.get(0);
// 鍑哄埌 G11
- // selectInfo.insertCacheTask(item2.getGlassId() + "", "0", "11", "2", item2.getWidth(), item2.getHeight(), item2.getFilmsid(), item2.getThickness(), item2.getFlowCardId());
+
DownGlassTask downGlassTask =createDownGlassTask(item2,"0","11","2");
downGlassTaskService.insertCacheTask(downGlassTask);
@@ -222,8 +224,17 @@
}
-
-
-
+ @Override
+ public List<DownStorageCageDetails> selectCacheEmpty() {
+ return baseMapper.selectJoinList(DownStorageCageDetails.class,
+ JoinWrappers.lambda(DownStorageCage.class)
+ .selectAll(DownStorageCage.class)
+ .select(DownStorageCageDetails::getWidth, DownStorageCageDetails::getHeight, DownStorageCageDetails::getGlassId)
+ .leftJoin(DownStorageCageDetails.class, on -> on
+ .eq(DownStorageCageDetails::getDeviceId, DownStorageCage::getDeviceId)
+ .eq(DownStorageCageDetails::getSlot, DownStorageCage::getSlot))
+ .isNull(DownStorageCageDetails::getSlot)
+ );
+ }
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java
index 19c0f67..7ac060a 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java
@@ -55,6 +55,8 @@
* 浠诲姟鐘舵��
*/
private Integer state;
-
-
+ /**
+ * 鐜荤拑
+ */
+ private String glassId;
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationService.java
index 9c8659f..7a1348b 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationService.java
@@ -19,22 +19,19 @@
/**
* @param startId
* @param endId
- * @return
- * 鑾峰彇宸ヤ綅淇℃伅
+ * @return 鑾峰彇宸ヤ綅淇℃伅
*/
List<DownWorkstation> getoneDownWorkstations(int startId, int endId);
/**
* @param workstationId
- * @return
- * 鑾峰彇鎬绘暟閲�
+ * @return 鑾峰彇鎬绘暟閲�
*/
int getTotalQuantity(int workstationId);
/**
* @param workstationId
- * @return
- * 鑾峰彇钀芥灦鏁伴噺
+ * @return 鑾峰彇钀芥灦鏁伴噺
*/
int getRacksNumber(int workstationId);
@@ -45,8 +42,7 @@
/**
* @param flowCardId
- * @param racksnumber
- * 鏇存柊钀芥灦鏁伴噺
+ * @param racksnumber 鏇存柊钀芥灦鏁伴噺
*/
void updateracksnumber(String flowCardId, int racksnumber);
@@ -58,11 +54,12 @@
* @return 鏇存柊鏋跺瓙鍜屾暟閲�
*/
int updateFlowCardIdAndCount(String flowCardId, int glassInfoCount, int workstationId);
+
void insertdownglassinfo();
/**
- * @return //
+ * @return //
* 宸ヤ綅鏄剧ず
*/
- List<Map<String, Object>> getTotalGlassDimensionsByWorkstation();
+ List<Map<String, Object>> getTotalGlassDimensionsByWorkstation();
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationTaskService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationTaskService.java
index 1fe8402..a40bc9b 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationTaskService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationTaskService.java
@@ -16,20 +16,17 @@
*/
public interface DownWorkstationTaskService extends IService<DownWorkstationTask> {
/**
- * @param downGlassInfo
- * 鎻掑叆浠诲姟
+ * @param downGlassInfo 鎻掑叆浠诲姟
*/
void insertdownWorkstationtask(DownGlassInfo downGlassInfo);
/**
- * @param Id
- * 鏇存柊浠诲姟鐘舵��
+ * @param Id 鏇存柊浠诲姟鐘舵��
*/
void updateTaskStateToZero(long Id);
/**
- * @return
- * 鑾峰彇浠诲姟鐘舵�佷负1鐨勪俊鎭�
+ * @return 鑾峰彇浠诲姟鐘舵�佷负1鐨勪俊鎭�
*/
List<DownWorkstationTask> getTaskState();
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
index 46acc64..56172d8 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -32,7 +32,7 @@
* 娴佺▼鍗�
*/
@TableField("flow_card_Id")
- private String flowcardId;
+ private String flowCardId;
/**
* 娴佺▼鍗＄幓鐠冪被鍨�
@@ -57,7 +57,7 @@
/**
* 鑶滅郴
*/
- private Integer filmsid;
+ private String filmsid;
/**
* 纾ㄥ墠瀹�
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
index fb560c7..a783463 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
@@ -135,7 +135,7 @@
public void selectCacheEmpty2() {
- downStorageCageDetailsService.selectCacheEmpty2();
+ downStorageCageServiceImpl.selectCacheEmpty();
}
--
Gitblit v1.8.0