From 65058e7227fcfc53e81d9bb87e0e2667879edd05 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 15 四月 2024 10:40:15 +0800
Subject: [PATCH] 优化查询
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java | 19
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/GlassInfoServiceImpl.java | 41 ++
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/uppattenusage/service/GlassInfoService.java | 6
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java | 27 +
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassInfoController.java | 26 -
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java | 5
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java | 51 +--
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java | 113 +++++++-
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationTaskMapper.java | 6
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java | 16
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageDetailsMapper.java | 54 ++++
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java | 23 +
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java | 29 +
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java | 48 ++-
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationTaskService.java | 4
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml | 9
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassInfoMapper.java | 14
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationService.java | 13
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/uppattenusage/mapper/GlassInfoMapper.java | 10
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassTaskMapper.java | 5
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 13 +
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java | 57 ++++
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstation.java | 2
/dev/null | 21 -
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassTaskService.java | 9
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java | 10
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationTaskController.java | 1
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java | 29 +-
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java | 16
hangzhoumesParent/moduleService/UnLoadGlassModule/pom.xml | 10
31 files changed, 486 insertions(+), 203 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/pom.xml b/hangzhoumesParent/moduleService/UnLoadGlassModule/pom.xml
index 2c49e6f..a707999 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/pom.xml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/pom.xml
@@ -21,6 +21,16 @@
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
<version>3.5.2</version>
</dependency>
+
+
+
+
+ <dependency>
+ <groupId>com.github.yulichang</groupId>
+ <artifactId>mybatis-plus-join</artifactId>
+ <version>1.2.4</version>
+ </dependency>
+
</dependencies>
<properties>
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassInfoController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassInfoController.java
index b678660..22e6105 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassInfoController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassInfoController.java
@@ -1,30 +1,22 @@
package com.mes.downglassinfo.controller;
-
import com.mes.downglassinfo.entity.DownGlassInfo;
import com.mes.downglassinfo.service.DownGlassInfoService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author zhoush
- * @since 2024-03-27
- */
-@Api(tags = "涓嬫枡淇℃伅")
@RestController
@RequestMapping("/downGlassInfo")
public class DownGlassInfoController {
+ @Autowired
+ private DownGlassInfoService downGlassInfoService;
+
+
+
+
+ // Other endpoints can be added for CRUD operations
}
-
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java
index cbabf74..b871250 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java
@@ -51,7 +51,7 @@
private Double thickness;
- private int Filmsid;
+ private String Filmsid;
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassInfoMapper.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassInfoMapper.java
index ede1a18..7fd31e5 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassInfoMapper.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassInfoMapper.java
@@ -2,7 +2,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.downglassinfo.entity.DownGlassInfo;
+import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -10,12 +13,11 @@
@Repository
public interface DownGlassInfoMapper extends BaseMapper<DownGlassInfo> {
- // 鏌ヨ涓嬬墖浠诲姟琛ㄤ腑鐘舵�佷负1鐨勪笅鐗囦俊鎭�
- List<DownGlassInfo> selectunloadingtaskstate();
+// @Select("SELECT MAX(sequence) FROM down_glass_info WHERE flow_card_id = #{flowCardId} LIMIT 1")
+// Integer getMaxSequenceByFlowCardId(@Param("flowCardId") String flowCardId);
+////
+// @Delete("delete from down_glass_task where flow_card_id = #{flowCardId}")
+// void deletetask(@Param("flowCardId") String flowCardId);
- void updateTaskStateToZero(@Param("flowCardId") String flowCardId);
- Integer getMaxSequenceByFlowCardId(@Param("flowCardId") String flowCardId);
-
- void deletetask(@Param("flowCardId") String flowCardId);
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassTaskMapper.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassTaskMapper.java
index 159421b..7fdfb20 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassTaskMapper.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassTaskMapper.java
@@ -1,7 +1,11 @@
package com.mes.downglassinfo.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mes.downglassinfo.entity.DownGlassInfo;
import com.mes.downglassinfo.entity.DownGlassTask;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +17,5 @@
*/
public interface DownGlassTaskMapper extends BaseMapper<DownGlassTask> {
+
}
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 656f504..e3368d3 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
@@ -2,18 +2,16 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.downglassinfo.entity.DownGlassInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author zhoush
- * @since 2024-03-27
- */
public interface DownGlassInfoService extends IService<DownGlassInfo> {
+
+ Integer getMaxSequenceByFlowCardId(String flowCardId);
+ 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 db99ff9..cfa1764 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
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.downglassinfo.entity.DownGlassTask;
+import java.util.List;
+
/**
* <p>
* 鏈嶅姟绫�
@@ -13,4 +15,11 @@
*/
public interface DownGlassTaskService extends IService<DownGlassTask> {
+ List<DownGlassTask> getUnloadingTaskState();
+
+ void updateTaskStateToZero(String flowCardId);
+ void deleteTask(String flowCardId);
+
+ DownGlassTask selectLastOutCacheInfo(String endCell);
+ Integer insertCacheTask(int id, String start, String end, String type, double width, double height, String filmsId, double thickness, String flowCardId);
}
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 a141494..3c7b2d0 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,22 +1,33 @@
package com.mes.downglassinfo.service.impl;
-
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.downglassinfo.entity.DownGlassInfo;
import com.mes.downglassinfo.mapper.DownGlassInfoMapper;
import com.mes.downglassinfo.service.DownGlassInfoService;
import org.springframework.stereotype.Service;
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author zhoush
- * @since 2024-03-27
- */
@Service
public class DownGlassInfoServiceImpl extends ServiceImpl<DownGlassInfoMapper, DownGlassInfo> implements DownGlassInfoService {
+ // 鏍规嵁娴佺▼鍗″彿鏌ヨ鏈�澶у簭鍙�
+ @Override
+ public Integer getMaxSequenceByFlowCardId(String flowCardId) {
+ QueryWrapper<DownGlassInfo> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("flow_card_id", flowCardId);
+ queryWrapper.select("MAX(sequence)"); // 閫夋嫨鏈�澶у簭鍙�
+ DownGlassInfo downGlassInfo = baseMapper.selectOne(queryWrapper);
+ if (downGlassInfo != null) {
+ return downGlassInfo.getSequence(); // 杩斿洖鏈�澶у簭鍙�
+ }
+ return 0; // 濡傛灉娌℃湁鎵惧埌璁板綍锛岃繑鍥�0鎴栬�呭叾浠栭�傚綋鐨勫��
+ }
+ @Override
+ public void insertDownGlassInfo(DownGlassInfo downGlassInfo) {
+ baseMapper.insert(downGlassInfo);
+ }
+
+
+
}
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 1fb724b..9087138 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
@@ -1,11 +1,17 @@
package com.mes.downglassinfo.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.downglassinfo.entity.DownGlassInfo;
import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downglassinfo.mapper.DownGlassTaskMapper;
import com.mes.downglassinfo.service.DownGlassTaskService;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -18,4 +24,55 @@
@Service
public class DownGlassTaskServiceImpl extends ServiceImpl<DownGlassTaskMapper, DownGlassTask> implements DownGlassTaskService {
+
+
+ @Override
+ public List<DownGlassTask> getUnloadingTaskState() {
+ QueryWrapper<DownGlassTask> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("task_stauts", 1);
+ return baseMapper.selectList(queryWrapper);
+ }
+
+ @Override
+ public void updateTaskStateToZero(String flowCardId) {
+ UpdateWrapper<DownGlassTask> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("task_stauts", 0).eq("flow_card_id", flowCardId);
+ baseMapper.update(null, updateWrapper);
+ }
+ @Override
+ public void deleteTask(String flowCardId) {
+ LambdaQueryWrapper<DownGlassTask> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(DownGlassTask::getFlowCardId, flowCardId);
+
+ baseMapper.delete(queryWrapper);
+ }
+ @Override
+ public DownGlassTask selectLastOutCacheInfo(String endCell) {
+ QueryWrapper<DownGlassTask> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("task_type", "2")
+ .eq("task_status", "2")
+ .eq("end_cell", endCell)
+ .last("LIMIT 1");
+
+ return baseMapper.selectOne(queryWrapper);
+ }
+ @Override
+ public Integer insertCacheTask(int id, String start, String end, String type, double width, double height, String filmsId, double thickness, String flowCardId) {
+ DownGlassTask glassInfo = new DownGlassTask();
+ glassInfo.setId(id);
+ glassInfo.setStartCell(start);
+ glassInfo.setEndCell(end);
+ glassInfo.setTaskType(type);
+ glassInfo.setWidth(width);
+ glassInfo.setHeight(height);
+ glassInfo.setFilmsid(filmsId);
+ glassInfo.setThickness(thickness);
+ glassInfo.setFlowCardId(flowCardId);
+ glassInfo.setTaskStauts(0); // 榛樿浠诲姟鐘舵�佷负0
+
+ int rows = baseMapper.insert(glassInfo);
+ return rows > 0 ? rows : null;
+ }
+
+
}
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 bf31d83..f78f833 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
@@ -1,21 +1,22 @@
package com.mes.downstorage.controller;
+import com.mes.downstorage.entity.DownStorageCageDetails;
+import com.mes.downstorage.service.DownStorageCageDetailsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author zhoush
- * @since 2024-03-27
- */
@RestController
-@RequestMapping("/downStorageCageDetails")
+@RequestMapping("/down-storage-cage-details")
public class DownStorageCageDetailsController {
-}
+ @Autowired
+ private DownStorageCageDetailsService downStorageCageDetailsService;
+ @PostMapping("/add")
+ public String addDownStorageCageDetails(@RequestBody DownStorageCageDetails details) {
+ downStorageCageDetailsService.addDownStorageCageDetails(details);
+ return "Details added successfully";
+ }
+
+ // Other CRUD operations can be defined here
+}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageDetailsMapper.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageDetailsMapper.java
index e8c5d15..e5e57bf 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageDetailsMapper.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageDetailsMapper.java
@@ -1,7 +1,12 @@
package com.mes.downstorage.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downstorage.entity.DownStorageCageDetails;
+import com.mes.uppattenusage.entity.GlassInfo;
+import org.apache.ibatis.annotations.*;
+
+import java.util.List;
/**
* <p>
@@ -11,6 +16,55 @@
* @author zhoush
* @since 2024-03-27
*/
+@Mapper
public interface DownStorageCageDetailsMapper extends BaseMapper<DownStorageCageDetails> {
+//
+// @Select("select * from `glass_info` where id=#{id}")
+// GlassInfo SelectGlassId(String id);
+ // 鏌ヨ绗煎瓙鍐呯┖闂�
+ @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is null order by escd.slot")
+ List<DownStorageCageDetails> SelectCacheLeisure();
+
+ // 鏌ヨ绗煎瓙鍐呭嚭鐗囦换鍔�
+ @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot WHERE escd.slot IS NOT NULL order by escd.tempering_layout_id,escd.tempering_feed_sequence")
+ List<DownStorageCageDetails> SelectCacheOut();
+
+ // 鏌ヨ绗煎瓙鍐呬俊鎭�
+ @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot order by esc.slot")
+ List<DownStorageCageDetails> SelectCachInfo();
+
+ // 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿
+ @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is not null escd.tempering_layout_id=#{tempering_layout_id} and escd.tempering_feed_sequence<#{tempering_feed_sequence} and esc.remain_width-#{width}>0 order by escd.tempering_feed_sequence")
+ List<DownStorageCageDetails> SelectIsExistIntoCache(Integer tempering_layout_id, Integer tempering_feed_sequence,
+ double width);
+
+ // 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿
+ @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is not null escd.tempering_layout_id<#{tempering_layout_id} and esc.remain_width-#{width}>0 order by escd.tempering_layout_id desc,escd.tempering_feed_sequence")
+ List<DownStorageCageDetails> SelectIsExistIntoCache(Integer tempering_layout_id, double width);
+
+// // 鏌ヨ鍏ㄩ儴浠诲姟
+// @Select("select * from down_glass_task")
+// List<DownGlassTask> SelectCacheInfoAll();
+//
+// // 鏌ヨ杩涚墖浠诲姟
+// @Select("select * from down_glass_task where task_type='1' and task_stauts='0'")
+// List<DownGlassTask> SelectInputCacheInfo();
+//
+// // 鏌ヨ鍑虹墖浠诲姟
+// @Select("select * from down_glass_task where task_type='2' and task_stauts='0'")
+// List<DownGlassTask> SelectOutCacheInfo();
+
+ // 鏌ヨ A06 鎴� A11 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
+ @Select("select * from down_glass_task where task_type='2' and task_stauts='2' and end_cell=#{EndCell} limit 1")
+ GlassInfo SelectLastOutCacheInfo(String EndCell);
+
+ // 淇敼绗煎瓙鍐呬俊鎭�
+// @Update("update")
+// Integer UpdateCache(@Param("id") Integer id, @Param("order_id") String order_id);
+
+ // 娣诲姞涓嬬墖浠诲姟
+ @Insert("INSERT into down_glass_task VALUES(#{id},#{start},#{end},#{type},0,)")
+ Integer insertCacheTask(String id, String start, String end, String type,double width,double height,Integer filmsId,double thickness,String flowCardId);
+
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/SelectInfo.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/SelectInfo.java
deleted file mode 100644
index 5005692..0000000
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/SelectInfo.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.mes.downstorage.mapper;
-
-import com.mes.downstorage.entity.DownStorageCageDetails;
-import com.mes.uppattenusage.entity.GlassInfo;
-import com.mes.downglassinfo.entity.DownGlassTask;
-import org.apache.ibatis.annotations.*;
-
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface SelectInfo {
- // 鐜荤拑淇℃伅 鎸塈D鏌ヨ
- @Select("select * from `glass_info` where id=#{id}")
- GlassInfo SelectGlassId(String id);
-
- // 閽㈠寲鎸夊伐绋嬫煡璇�
- //@Select("select * from `v_optimize_heat_layout` where project_no=#{projeceid} ")
- //List<Map> SelectTemperedTerritory(String projeceid);
-//
-// // 鍒囧壊鐗堝浘鎸夊伐绋嬫煡璇�
- // @Select("select * from optimize_detail where project_no=#{projeceid} ")
- // List<Map> SelectCutTerritory(String projeceid);
-//
-// // 鏌ヨ纾ㄨ竟淇℃伅
-// @Select("select * from task_cache where task_type='2' and task_stauts='2' and end_cell=#{EndCell}")
-// List<Map> SelectEdgInfo(String EndCell);
-
- // 鏌ヨ绗煎瓙鍐呯┖闂�
- @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is null order by escd.slot")
- List<DownStorageCageDetails> SelectCacheLeisure();
-
- // 鏌ヨ绗煎瓙鍐呭嚭鐗囦换鍔�
- @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot WHERE escd.slot IS NOT NULL order by escd.tempering_layout_id,escd.tempering_feed_sequence")
- List<DownStorageCageDetails> SelectCacheOut();
-
- // 鏌ヨ绗煎瓙鍐呬俊鎭�
- @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot order by esc.slot")
- List<DownStorageCageDetails> SelectCachInfo();
-
- // 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿
- @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is not null escd.tempering_layout_id=#{tempering_layout_id} and escd.tempering_feed_sequence<#{tempering_feed_sequence} and esc.remain_width-#{width}>0 order by escd.tempering_feed_sequence")
- List<DownStorageCageDetails> SelectIsExistIntoCache(Integer tempering_layout_id, Integer tempering_feed_sequence,
- double width);
-
- // 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿
- @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is not null escd.tempering_layout_id<#{tempering_layout_id} and esc.remain_width-#{width}>0 order by escd.tempering_layout_id desc,escd.tempering_feed_sequence")
- List<DownStorageCageDetails> SelectIsExistIntoCache(Integer tempering_layout_id, double width);
-
- // 鏌ヨ鍏ㄩ儴浠诲姟
- @Select("select * from down_glass_task")
- List<DownGlassTask> SelectCacheInfoAll();
-
- // 鏌ヨ杩涚墖浠诲姟
- @Select("select * from down_glass_task where task_type='1' and task_stauts='0'")
- List<DownGlassTask> SelectInputCacheInfo();
-
- // 鏌ヨ鍑虹墖浠诲姟
- @Select("select * from down_glass_task where task_type='2' and task_stauts='0'")
- List<DownGlassTask> SelectOutCacheInfo();
-
- // 鏌ヨ A06 鎴� A11 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
- @Select("select * from down_glass_task where task_type='2' and task_stauts='2' and end_cell=#{EndCell} limit 1")
- GlassInfo SelectLastOutCacheInfo(String EndCell);
-
- // 淇敼绗煎瓙鍐呬俊鎭�
- @Update("update")
- Integer UpdateCache(@Param("id") Integer id, @Param("order_id") String order_id);
-
- // 娣诲姞涓嬬墖浠诲姟
- @Insert("INSERT into down_glass_task VALUES(#{id},#{start},#{end},#{type},0,)")
- Integer insertCacheTask(String id, String start, String end, String type,double width,double height,Integer filmsId,double thickness,String flowCardId);
-
-
-}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java
index 67de8c9..e839f95 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java
@@ -3,9 +3,13 @@
import com.mes.common.PLCAutoMes;
import com.mes.common.S7control;
import com.mes.device.PlcParameterObject;
+
import com.mes.downstorage.entity.DownStorageCageDetails;
-import com.mes.downstorage.mapper.SelectInfo;
+import com.mes.downstorage.mapper.DownStorageCageDetailsMapper;
+import com.mes.downworkstation.mapper.DownWorkstationMapper;
+import com.mes.tools.WebSocketServer;
import com.mes.uppattenusage.entity.GlassInfo;
+import com.mes.uppattenusage.service.GlassInfoService;
import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -16,7 +20,9 @@
@Service
public class DownGlassCacheLogic {
@Autowired
- private SelectInfo selectInfo;
+ private DownStorageCageDetailsMapper selectInfo;
+ private GlassInfoService GlassInfoService;
+ private DownStorageCageDetailsService downStorageCageDetailsService;
/**
* @param Number
@@ -71,8 +77,9 @@
*/
public boolean processInto(String Number){
+ GlassInfoService = WebSocketServer.applicationContext.getBean(GlassInfoService.class);
//鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
+ GlassInfo GlassInfo=GlassInfoService.selectGlassId(Number);
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
//瀛樺湪姝ょ幓鐠冪紪鍙�
if(GlassInfo!=null){
@@ -137,7 +144,7 @@
GlassInfo glassInfo06= selectInfo.SelectLastOutCacheInfo("06");
GlassInfo glassInfo11= selectInfo.SelectLastOutCacheInfo("11");
GlassInfo glassInfo13= selectInfo.SelectLastOutCacheInfo("13");
- if(glassInfo06!=null&&glassInfo11.getWidth()==item.getWidth()&&glassInfo06.getHeight()==item.getHeight()){
+ if(glassInfo06!=null&& glassInfo11.getWidth().equals(item.getWidth()) && glassInfo06.getHeight().equals(item.getHeight())){
endcell="11";
SendEndcell="2";
}else if(item.getHeight()>=3440&&item.getWidth()>=1440){
@@ -154,6 +161,10 @@
//杩斿洖缁撴灉
return false;
}
+//鏌ヨ鏄惁缁戝畾鏋跺瓙
+// public boolean selectFlowCardId(String FlowCardId){
+//
+// }
/**
* @param Number
@@ -162,7 +173,7 @@
public void processMb(String Number){
//鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
+ GlassInfo GlassInfo=GlassInfoService.selectGlassId(Number);
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
if(GlassInfo!=null){
//鍙戦�佷换鍔� ID 闀� 瀹� 鍘� 鍊掕 宸ヨ壓鍔熻兘绛�
@@ -185,7 +196,7 @@
public boolean selectMessageId(String Number){
//鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
+ GlassInfo GlassInfo=GlassInfoService.selectGlassId(Number);
if(GlassInfo==null){
//杩斿洖 涓嶅瓨鍦�
return false;
@@ -203,7 +214,7 @@
public boolean deleteMessageId(String Number){
//鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
+ GlassInfo GlassInfo=GlassInfoService.selectGlassId(Number);
if(GlassInfo==null){
//杩斿洖 涓嶅瓨鍦�
return false;
@@ -221,7 +232,7 @@
*/
public boolean isExist(String Number){
//鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
+ GlassInfo GlassInfo=GlassInfoService.selectGlassId(Number);
if(GlassInfo==null){
//杩斿洖 涓嶅瓨鍦�
return false;
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 1dfaec9..a5c57bc 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
@@ -1,16 +1,12 @@
package com.mes.downstorage.service;
-import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.downstorage.entity.DownStorageCageDetails;
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author zhoush
- * @since 2024-03-27
- */
-public interface DownStorageCageDetailsService extends IService<DownStorageCageDetails> {
+public interface DownStorageCageDetailsService {
+
+ void addDownStorageCageDetails(DownStorageCageDetails details);
+
+
+
}
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 588071f..87595f5 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
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.downstorage.entity.DownStorageCage;
+import java.util.List;
+import java.util.Map;
+
/**
* <p>
* 鏈嶅姟绫�
@@ -12,5 +15,5 @@
* @since 2024-03-27
*/
public interface DownStorageCageService extends IService<DownStorageCage> {
-
+ public List<Map> gettask();
}
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 b28c67a..cb8604a 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
@@ -1,20 +1,21 @@
package com.mes.downstorage.service.impl;
-import com.mes.downstorage.entity.DownStorageCageDetails;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.downstorage.entity.DownStorageCageDetails;
import com.mes.downstorage.mapper.DownStorageCageDetailsMapper;
import com.mes.downstorage.service.DownStorageCageDetailsService;
import org.springframework.stereotype.Service;
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author zhoush
- * @since 2024-03-27
- */
@Service
public class DownStorageCageDetailsServiceImpl extends ServiceImpl<DownStorageCageDetailsMapper, DownStorageCageDetails> implements DownStorageCageDetailsService {
+ @Override
+ public void addDownStorageCageDetails(DownStorageCageDetails details) {
+ this.save(details);
+ }
+
+
+
+
+ // Other business methods can be implemented here
}
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 1ace668..618c2b1 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
@@ -4,7 +4,11 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.downstorage.mapper.DownStorageCageMapper;
import com.mes.downstorage.service.DownStorageCageService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -16,5 +20,12 @@
*/
@Service
public class DownStorageCageServiceImpl extends ServiceImpl<DownStorageCageMapper, DownStorageCage> implements DownStorageCageService {
-
+ @Autowired
+ private DownStorageCageMapper downStorageCageMapper;
+ @Override
+ public List<Map> gettask(){
+ downStorageCageMapper.selectList(null);
+// downStorageCageMapper.selectJoin();
+ return null;
+ };
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
index 1483cac..d46ac47 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
@@ -34,7 +34,7 @@
@GetMapping("/getone")
public ResponseEntity<?> getOneDownWorkstations() {
try {
- List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations();
+ List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1,5);
// 鏋勫缓绗﹀悎棰勬湡鏍煎紡鐨勫搷搴旀暟鎹�
Map<String, Object> responseData = new HashMap<>();
responseData.put("code", 200);
@@ -54,13 +54,13 @@
@GetMapping("/gettwo")
public List<DownWorkstation> gettwoDownWorkstations() {
- return downWorkstationService.gettwoDownWorkstations();
+ return downWorkstationService.getoneDownWorkstations(6,10);
}
@GetMapping("/getflowCardId")
public ResponseEntity<Map<String, Object>> getflowCardId() {
Map<String, Object> responseData = new HashMap<>();
try {
- List<Map<String, Object>> data = downWorkstationService.getflowCardId();
+ List<Map<String, Object>> data = glassInfoService.getFlowCardId();
responseData.put("code", 200);
responseData.put("msg", "鎴愬姛");
responseData.put("data", data);
@@ -75,7 +75,7 @@
-
+//缁戝畾鏋跺瓙
@PostMapping("/updateFlowCardId")
public ResponseEntity<Map<String, Object>> updateFlowCardId(@RequestBody Map<String, Object> requestData) {
// 浠� requestData 涓幏鍙栦紶鍏ョ殑 flowCardId
@@ -86,7 +86,7 @@
int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId);
// 鏇存柊 down_workstation 琛ㄤ腑鐨勬�绘暟閲�
- glassInfoService.updateFlowCardIdAndCount(flowCardId, glassInfoCount, workstationId);
+ downWorkstationService.updateFlowCardIdAndCount(flowCardId, glassInfoCount, workstationId);
// 鏋勫缓鍝嶅簲鏁版嵁
Map<String, Object> responseData = new HashMap<>();
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationTaskController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationTaskController.java
index 713d8db..9e83179 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationTaskController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationTaskController.java
@@ -1,6 +1,5 @@
package com.mes.downworkstation.controller;
-
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstation.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstation.java
index 802dd59..ad9296c 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstation.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstation.java
@@ -52,6 +52,8 @@
private Integer workState;
+ private Integer total_quantity;
+
private Integer Racksnumber;
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java
index 0ebb1bd..454897c 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java
@@ -31,54 +31,47 @@
@Select("SELECT dwt.flow_card_id,dw.id,dw.racks_number FROM down_workstation_task dwt JOIN down_workstation dw ON dwt.flow_card_id = dw.flow_card_id WHERE dwt.state = 1 LIMIT 1")
List<DownWorkstation> selectdownWorkstationstate();
//鏇存柊钀芥灦鏁伴噺
- @Update("UPDATE down_workstation SET racks_number = #{racksNumber} " +
- "WHERE flow_card_id = #{flowCardId}")
- void update_racks_number(@Param("flowCardId") String flowCardId,
- @Param("racksNumber") Integer racksNumber);
+// @Update("UPDATE down_workstation SET racks_number = #{racksNumber} " +
+// "WHERE flow_card_id = #{flowCardId}")
+// void update_racks_number(@Param("flowCardId") String flowCardId,
+// @Param("racksNumber") Integer racksNumber);
//鎻掑叆鏈烘浠诲姟琛�
- @Insert("INSERT INTO down_workstation_task (flow_card_id, width, height, thickness, filmsid,state) " +
- "VALUES (#{flowCardId}, #{width}, #{height}, #{thickness}, #{filmsid},1)")
- void insertdownWorkstationtask(DownGlassInfo downGlassInfo);
+// @Insert("INSERT INTO down_workstation_task (flow_card_id, width, height, thickness, filmsid,state) " +
+// "VALUES (#{flowCardId}, #{width}, #{height}, #{thickness}, #{filmsid},1)")
+// void insertdownWorkstationtask(DownGlassInfo downGlassInfo);
//鏍规嵁宸ヤ綅id鏇存柊瀹炰綋绫绘帴鏀剁殑鏁版嵁
- @Update("UPDATE down_workstation SET width = #{width}, height = #{height}, flow_card_id = #{flowCardId} WHERE workstation_id = #{workstationId}")
- void updateFlowCardId(DownWorkstation downWorkstation);
+// @Update("UPDATE down_workstation SET width = #{width}, height = #{height}, flow_card_id = #{flowCardId} WHERE workstation_id = #{workstationId}")
+// void updateFlowCardId(DownWorkstation downWorkstation);
- //婊℃灦鎷夎蛋锛屾竻绌轰俊鎭�
- @Update("UPDATE down_workstation SET width = null, height = null, flow_card_id = null WHERE workstation_id = #{workstationId}")
- void clearFlowCardId(DownWorkstation downWorkstation);
- @Update("UPDATE down_workstation_task SET state = 0 WHERE flow_card_id = #{flowCardId}")
- void update_task_state_to_zero(@Param("flowCardId") String flowCardId);
+// @Update("UPDATE down_workstation_task SET state = 0 WHERE flow_card_id = #{flowCardId}")
+// void update_task_state_to_zero(@Param("flowCardId") String flowCardId);
- @Select(" SELECT * FROM down_workstation WHERE workstation_id >= 1 AND workstation_id <= 5")
- List<DownWorkstation> getoneDownWorkstations();
-
-
- @Select(" SELECT * FROM down_workstation WHERE workstation_id >= 6 AND workstation_id <= 10")
- List<DownWorkstation> gettwoDownWorkstations();
+// @Select("SELECT * FROM down_workstation WHERE workstation_id BETWEEN #{startId} AND #{endId}")
+// List<DownWorkstation> getDownWorkstationsInRange(@Param("startId") int startId, @Param("endId") int endId);
- @Select("SELECT DISTINCT flowcard_id from glass_info")
- @ResultType(Map.class)
- List<Map<String, Object>> getflowCardId();
+// @Select("SELECT DISTINCT flowcard_id from glass_info")
+// @ResultType(Map.class)
+// List<Map<String, Object>> getflowCardId();
- @Update("UPDATE down_workstation SET flow_card_id = NULL, total_quantity = 0, racks_number = 0 WHERE workstation_id = #{workstationId}")
- void clearFlowCardInfoByWorkstationId(@Param("workstationId") int workstationId);
+// @Update("UPDATE down_workstation SET flow_card_id = NULL, total_quantity = 0, racks_number = 0 WHERE workstation_id = #{workstationId}")
+// void clearFlowCardInfoByWorkstationId(@Param("workstationId") int workstationId);
// 鑾峰彇鎬绘暟閲�
- @Select("SELECT total_quantity FROM down_workstation WHERE workstation_id = #{workstationId}")
- int getTotalQuantity(@Param("workstationId") int workstationId);
+// @Select("SELECT total_quantity FROM down_workstation WHERE workstation_id = #{workstationId}")
+// int getTotalQuantity(@Param("workstationId") int workstationId);
// 鑾峰彇钀芥灦鏁伴噺
- @Select("SELECT racks_number FROM down_workstation WHERE workstation_id = #{workstationId}")
- int getRacksNumber(@Param("workstationId") int workstationId);
+// @Select("SELECT racks_number FROM down_workstation WHERE workstation_id = #{workstationId}")
+// int getRacksNumber(@Param("workstationId") int workstationId);
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationTaskMapper.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationTaskMapper.java
index 076b258..1183e63 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationTaskMapper.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationTaskMapper.java
@@ -1,7 +1,10 @@
package com.mes.downworkstation.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.entity.DownWorkstationTask;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +16,7 @@
*/
public interface DownWorkstationTaskMapper extends BaseMapper<DownWorkstationTask> {
+ List<DownWorkstationTask> selectList();
+
+ DownWorkstation selectdownWorkstationstate();
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java
index b4889ac..2fceea5 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java
@@ -2,7 +2,9 @@
import com.mes.common.PLCAutoMes;
import com.mes.downglassinfo.entity.DownGlassInfo;
+import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downglassinfo.service.DownGlassInfoService;
+import com.mes.downglassinfo.service.DownGlassTaskService;
import com.mes.downstorage.entity.DownStorageCageDetails;
import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.device.PlcParameterObject;
@@ -21,9 +23,12 @@
@Autowired
private DownGlassInfo downGlassInfo;
private DownWorkstation downWorkstation;
- private DownGlassInfoMapper downGlassInfoMapper;
+ // private DownGlassInfoMapper downGlassInfoMapper;
private DownGlassInfoService downGlassInfoService;
+ private DownGlassTaskService downGlassTaskService;
private DownWorkstationMapper downWorkstationMapper;
+ private DownWorkstationService downWorkstationService;
+ private DownWorkstationTaskService downWorkstationTaskService;
PlcParameterObject plcread = PLCAutoMes.PlcReadObject;
/**
* // 鏈烘鎵�1PLC璇锋眰瀛�
@@ -59,10 +64,13 @@
public void insertdownglassinfo() {
- downWorkstationMapper = WebSocketServer.applicationContext.getBean(DownWorkstationMapper.class);
+ downWorkstationMapper = WebSocketServer.applicationContext.getBean(DownWorkstationMapper.class);
+ downWorkstationService = WebSocketServer.applicationContext.getBean(DownWorkstationService.class);
+ downWorkstationTaskService = WebSocketServer.applicationContext.getBean(DownWorkstationTaskService.class);
downGlassInfoService = WebSocketServer.applicationContext.getBean(DownGlassInfoService.class);
- downGlassInfoMapper = WebSocketServer.applicationContext.getBean(DownGlassInfoMapper.class);
- List<DownGlassInfo> taskdownGlassInf = downGlassInfoMapper.selectunloadingtaskstate();
+ // downGlassInfoMapper = WebSocketServer.applicationContext.getBean(DownGlassInfoMapper.class);
+ downGlassTaskService = WebSocketServer.applicationContext.getBean(DownGlassTaskService.class);
+ List<DownGlassTask> taskdownGlassInf = downGlassTaskService.getUnloadingTaskState();
//
@@ -70,12 +78,12 @@
//
- for (DownGlassInfo downGlassInfo : taskdownGlassInf) {
+ for (DownGlassTask downGlassInfo : taskdownGlassInf) {
// 鍒涘缓鏂扮殑 DownGlassInfo 瀵硅薄骞惰缃浉鍏冲睘鎬�
DownGlassInfo newdownGlassInfo = new DownGlassInfo();
newdownGlassInfo.setFlowCardId(downGlassInfo.getFlowCardId());
- Integer maxSequence = downGlassInfoMapper.getMaxSequenceByFlowCardId(downGlassInfo.getFlowCardId());
+ Integer maxSequence = downGlassInfoService.getMaxSequenceByFlowCardId(downGlassInfo.getFlowCardId());
// 鍒濆鍖栭『搴忓瓧娈靛��
int sequence = maxSequence != null ? maxSequence + 1 : 1;
@@ -87,12 +95,12 @@
newdownGlassInfo.setSequence(sequence);
// 鎻掑叆鏁版嵁鍒颁笅鐗囩幓鐠冧俊鎭〃
- downGlassInfoMapper.insert(newdownGlassInfo);
+ downGlassInfoService.insertDownGlassInfo(newdownGlassInfo);
//鎻掑叆鏁版嵁鍒版満姊版墜浠诲姟琛�
- downWorkstationMapper.insertdownWorkstationtask(newdownGlassInfo);
+ downWorkstationTaskService.insertdownWorkstationtask(newdownGlassInfo);
//鏇存柊涓嬬墖浠诲姟琛ㄧ姸鎬佷负0
- downGlassInfoMapper.updateTaskStateToZero(downGlassInfo.getFlowCardId());
+ downGlassTaskService.updateTaskStateToZero(downGlassInfo.getFlowCardId());
sequence++; // 閫掑椤哄簭瀛楁鍊�
@@ -117,12 +125,12 @@
for (DownWorkstation downWorkstation : taskdownWorkstation) {
//鏇存柊涓嬬墖宸ヤ綅琛ㄤ腑宸茶惤鏋舵暟閲�
- downWorkstationMapper.update_racks_number(downWorkstation.getFlowCardId(), downWorkstation.getRacksnumber() + 1);
+ downWorkstationService.updateracksnumber(downWorkstation.getFlowCardId(), downWorkstation.getRacksnumber() + 1);
//鏇存柊鏈烘浠诲姟琛ㄤ腑鐘舵�佷负0
- downWorkstationMapper.update_task_state_to_zero(downWorkstation.getFlowCardId());
+ downWorkstationTaskService.updateTaskStateToZero(downWorkstation.getFlowCardId());
//鍒犻櫎涓嬬墖浠诲姟琛ㄤ腑鐨勮褰�
- downGlassInfoMapper.deletetask(downWorkstation.getFlowCardId());
+ downGlassTaskService.deleteTask(downWorkstation.getFlowCardId());
}
}
@@ -136,23 +144,19 @@
}
- /**
- * @param downWorkstation // 缁戝畾娴佺▼鍗″彿鏋跺瓙
- */
- public void bindingshelf(DownWorkstation downWorkstation) {
- downWorkstationMapper.updateFlowCardId(downWorkstation);
- }
+
+
/**
* @param downWorkstation // 婊℃灦鎷夎蛋 娓呴櫎娴佺▼鍗′俊鎭�
*/
- public void clearFlowCardId(DownWorkstation downWorkstation) {
-
- downWorkstationMapper.clearFlowCardId(downWorkstation);
- }
+// public void clearFlowCardId(DownWorkstation downWorkstation) {
+//
+// downWorkstationMapper.clearFlowCardId(downWorkstation);
+// }
}
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 e26331f..04f8dc2 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
@@ -16,15 +16,18 @@
*/
public interface DownWorkstationService extends IService<DownWorkstation> {
- List<DownWorkstation> getoneDownWorkstations();
-
- List<DownWorkstation> gettwoDownWorkstations();
-
- List<Map<String, Object>> getflowCardId();
+ List<DownWorkstation> getoneDownWorkstations(int startId, int endId);
int getTotalQuantity(int workstationId);
int getRacksNumber(int workstationId);
void clearFlowCardId(int workstationId);
+
+ void updateracksnumber( String flowCardId, int racksnumber);
+
+
+ int updateFlowCardIdAndCount(String flowCardId, int glassInfoCount, int workstationId);
+
+
}
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 a60ce62..3ba5fe1 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
@@ -1,6 +1,7 @@
package com.mes.downworkstation.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.downglassinfo.entity.DownGlassInfo;
import com.mes.downworkstation.entity.DownWorkstationTask;
/**
@@ -12,5 +13,6 @@
* @since 2024-04-07
*/
public interface DownWorkstationTaskService extends IService<DownWorkstationTask> {
-
+ void insertdownWorkstationtask(DownGlassInfo downGlassInfo);
+ void updateTaskStateToZero(String flowCardId);
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
index 865c54c..6e07df0 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
@@ -1,11 +1,17 @@
package com.mes.downworkstation.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downworkstation.entity.DownWorkstation;
+import com.mes.downworkstation.entity.DownWorkstationTask;
import com.mes.downworkstation.mapper.DownWorkstationMapper;
+import com.mes.downworkstation.mapper.DownWorkstationTaskMapper;
import com.mes.downworkstation.service.DownWorkstationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
@@ -15,36 +21,107 @@
@Autowired
private DownWorkstationMapper downWorkstationMapper;
+ private DownWorkstationTaskMapper downWorkstationTaskMapper;
- @Override
- public List<DownWorkstation> getoneDownWorkstations() {
- return downWorkstationMapper.getoneDownWorkstations();
- }
- @Override
- public List<DownWorkstation> gettwoDownWorkstations() {
- return downWorkstationMapper.gettwoDownWorkstations();
- }
- @Override
- public List<Map<String, Object>> getflowCardId() {
- return downWorkstationMapper.getflowCardId();
- }
-
+// @Override
+// public List<DownWorkstation> gettwoDownWorkstations() {
+// return downWorkstationMapper.getDownWorkstationsInRange(6,10);
+// }
+//鑾峰彇鎬绘暟閲�
@Override
public int getTotalQuantity(int workstationId) {
- Integer totalQuantity = downWorkstationMapper.getTotalQuantity(workstationId);
- return totalQuantity != null ? totalQuantity : 0;
+ QueryWrapper<DownWorkstation> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("total_quantity")
+ .eq("workstation_id", workstationId);
+
+ DownWorkstation result = baseMapper.selectOne(queryWrapper);
+ return result != null ? result.getTotal_quantity() : 0;
}
+// @Override
+// public int getTotalQuantity(int workstationId) {
+// Integer totalQuantity = downWorkstationMapper.getTotalQuantity(workstationId);
+// return totalQuantity != null ? totalQuantity : 0;
+// }
+
+// @Override
+// public int getRacksNumber(int workstationId) {
+// Integer racksNumber = downWorkstationMapper.getRacksNumber(workstationId);
+// return racksNumber != null ? racksNumber : 0;
+// }
+ //鏍规嵁鏉′欢鑾峰彇钀芥灦鏁伴噺
@Override
public int getRacksNumber(int workstationId) {
- Integer racksNumber = downWorkstationMapper.getRacksNumber(workstationId);
- return racksNumber != null ? racksNumber : 0;
+ QueryWrapper<DownWorkstation> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("racks_number")
+ .eq("workstation_id", workstationId);
+
+ DownWorkstation result = baseMapper.selectOne(queryWrapper);
+ return result != null ? result.getRacksnumber() : 0;
+ }
+//鏍规嵁鏉′欢鑾峰彇宸ヤ綅鐜荤拑淇℃伅
+ @Override
+ public List<DownWorkstation> getoneDownWorkstations(int startId, int endId) {
+ QueryWrapper<DownWorkstation> queryWrapper = new QueryWrapper<>();
+ queryWrapper.between("workstation_id", startId, endId);
+
+ return baseMapper.selectList(queryWrapper);
+ }
+
+
+//
+
+
+ @Override
+ public void updateracksnumber(String flowCardId, int racksNumber) {
+ UpdateWrapper<DownWorkstation> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("racks_number",racksNumber).eq("flow_card_id", flowCardId);
+ baseMapper.update(null, updateWrapper);
+ }
+
+
+
+ @Override
+ public int updateFlowCardIdAndCount(String flowCardId, int glassInfoCount, int workstationId) {
+ UpdateWrapper<DownWorkstation> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("total_quantity", glassInfoCount)
+ .set("flow_card_id", flowCardId)
+ .eq("workstation_id", workstationId);
+
+ return baseMapper.update(null, updateWrapper);
}
@Override
public void clearFlowCardId(int workstationId) {
- downWorkstationMapper.clearFlowCardInfoByWorkstationId(workstationId);
+ UpdateWrapper<DownWorkstation> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("flow_card_id", null)
+ .set("total_quantity", 0)
+ .set("racks_number", 0)
+ .eq("workstation_id", workstationId);
+
+ baseMapper.update(null, updateWrapper);
}
+
+
+
+
+
+
+
+
+
+ @Transactional
+ public void crossDatabaseQuery() {
+ // 浠� MySQL 鏁版嵁搴撲腑鏌ヨ鏁版嵁锛屽彧杩斿洖涓�鏉＄鍚堟潯浠剁殑鏁版嵁
+ DownWorkstation downWorkstation = downWorkstationTaskMapper.selectdownWorkstationstate();
+
+ // 浠� SQL Server 鏁版嵁搴撲腑鏌ヨ鏁版嵁
+ List<DownWorkstationTask> downWorkstationTasks = downWorkstationTaskMapper.selectList();
+
+
+
+ }
+
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java
index 5814861..1b35075 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java
@@ -1,6 +1,8 @@
package com.mes.downworkstation.service.impl;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.downglassinfo.entity.DownGlassInfo;
import com.mes.downworkstation.entity.DownWorkstationTask;
import com.mes.downworkstation.mapper.DownWorkstationTaskMapper;
import com.mes.downworkstation.service.DownWorkstationTaskService;
@@ -17,4 +19,25 @@
@Service
public class DownWorkstationTaskServiceImpl extends ServiceImpl<DownWorkstationTaskMapper, DownWorkstationTask> implements DownWorkstationTaskService {
+
+
+ public void insertdownWorkstationtask(DownGlassInfo downGlassInfo) {
+ DownWorkstationTask entity = new DownWorkstationTask();
+ entity.setFlowCardId(downGlassInfo.getFlowCardId());
+ entity.setWidth(downGlassInfo.getWidth());
+ entity.setHeight(downGlassInfo.getHeight());
+ entity.setThickness(downGlassInfo.getThickness());
+ entity.setFilmsid(downGlassInfo.getFilmsid());
+ entity.setState(1);
+
+ baseMapper.insert(entity);
+ }
+
+ @Override
+ public void updateTaskStateToZero(String flowCardId) {
+ UpdateWrapper<DownWorkstationTask> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("state", 0).eq("flow_card_id", flowCardId);
+
+ baseMapper.update(null, updateWrapper);
+ }
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/uppattenusage/mapper/GlassInfoMapper.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/uppattenusage/mapper/GlassInfoMapper.java
index f47d7bc..6a4aa97 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/uppattenusage/mapper/GlassInfoMapper.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/uppattenusage/mapper/GlassInfoMapper.java
@@ -7,6 +7,7 @@
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
+import org.mapstruct.Mapper;
import java.util.List;
@@ -18,13 +19,14 @@
* @author zhoush
* @since 2024-03-27
*/
+@Mapper
public interface GlassInfoMapper extends BaseMapper<GlassInfo> {
- @Select("SELECT COUNT(*) FROM glass_info WHERE flowcard_id = #{flowCardId}")
- int getGlassInfoCountByFlowCardId(@Param("flowCardId") String flowCardId);
+// @Select("SELECT COUNT(*) FROM glass_info WHERE flowcard_id = #{flowCardId}")
+// int getGlassInfoCountByFlowCardId(@Param("flowCardId") String flowCardId);
- @Update("UPDATE down_workstation SET total_quantity = #{glassInfoCount},flow_card_id=#{flowCardId} WHERE workstation_id = #{workstationId}")
- int updateFlowCardIdAndCount(@Param("flowCardId") String flowCardId, @Param("glassInfoCount") int glassInfoCount,@Param("workstationId")int workstationId);
+// @Update("UPDATE down_workstation SET total_quantity = #{glassInfoCount},flow_card_id=#{flowCardId} WHERE workstation_id = #{workstationId}")
+// int updateFlowCardIdAndCount(@Param("flowCardId") String flowCardId, @Param("glassInfoCount") int glassInfoCount,@Param("workstationId")int workstationId);
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/uppattenusage/service/GlassInfoService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/uppattenusage/service/GlassInfoService.java
index 57215a7..48490d3 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/uppattenusage/service/GlassInfoService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/uppattenusage/service/GlassInfoService.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.uppattenusage.entity.GlassInfo;
+import java.util.List;
+import java.util.Map;
+
/**
* <p>
* 鏈嶅姟绫�
@@ -15,5 +18,6 @@
int getGlassInfoCountByFlowCardId(String flowCardId);
- void updateFlowCardIdAndCount(String flowCardId, int glassInfoCount, int workstationId);
+ List<Map<String, Object>> getFlowCardId();
+ GlassInfo selectGlassId(String id);
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/GlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/GlassInfoServiceImpl.java
index 5c1a9b6..e3f797b 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/GlassInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/GlassInfoServiceImpl.java
@@ -1,11 +1,17 @@
package com.mes.uppattenusage.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.uppattenusage.entity.GlassInfo;
import com.mes.uppattenusage.mapper.GlassInfoMapper;
import com.mes.uppattenusage.service.GlassInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -27,16 +33,31 @@
@Override
public int getGlassInfoCountByFlowCardId(String flowCardId) {
- return glassInfoMapper.getGlassInfoCountByFlowCardId(flowCardId);
+ QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("flowcard_id", flowCardId);
+
+ return baseMapper.selectCount(queryWrapper);
+ }
+ @Override
+ public List<Map<String, Object>> getFlowCardId() {
+ return baseMapper.selectMaps(new QueryWrapper<GlassInfo>().select("DISTINCT flowcard_id"));
+ }
+ @Override
+ public GlassInfo selectGlassId(String id) {
+ QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("id", id);
+
+ return baseMapper.selectOne(queryWrapper);
}
- @Override
- public void updateFlowCardIdAndCount(String flowCardId, int glassInfoCount, int workstationId) {
- int rowsAffected = glassInfoMapper.updateFlowCardIdAndCount(flowCardId, glassInfoCount, workstationId);
- if (rowsAffected > 0) {
- System.out.println("鏇存柊鏋跺瓙涓婃祦绋嬪崱 ID 鍜屾暟閲忔垚鍔�");
- } else {
- System.out.println("鏇存柊鏋跺瓙涓婃祦绋嬪崱 ID 鍜屾暟閲忓け璐�");
- }
- }
+
+
+// public void updateFlowCardIdAndCount(String flowCardId, int glassInfoCount, int workstationId) {
+// int rowsAffected = glassInfoMapper.updateFlowCardIdAndCount(flowCardId, glassInfoCount, workstationId);
+// if (rowsAffected > 0) {
+// System.out.println("鏇存柊鏋跺瓙涓婃祦绋嬪崱 ID 鍜屾暟閲忔垚鍔�");
+// } else {
+// System.out.println("鏇存柊鏋跺瓙涓婃祦绋嬪崱 ID 鍜屾暟閲忓け璐�");
+// }
+// }
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
index b42ad64..8e81bad 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
@@ -12,6 +12,12 @@
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
+
+ sqlserver:
+ url: jdbc:sqlserver://localhost:1433;databaseName=hangzhoumes
+ username: sa
+ password: beibo.123/
+ driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
cloud:
nacos:
discovery:
@@ -24,7 +30,8 @@
port: 6379
password: 123456
mybatis-plus:
- mapper-locations: classpath*:mapper/*.xml
+
+ mapper-locations: classpath*:mapper/sqlserver/*.xml
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# 璁剧疆 MyBatis 鏃ュ織绾у埆涓� ERROR
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml
deleted file mode 100644
index 59e29ae..0000000
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.downglassinfo.mapper.DownGlassInfoMapper">
-
- <select id="selectunloadingtaskstate" resultType="com.mes.downglassinfo.entity.DownGlassInfo">
- SELECT flow_card_id, filmsid, width, height, thickness FROM down_glass_task WHERE task_stauts = 1
- </select>
-
- <update id="updateTaskStateToZero">
- UPDATE down_glass_task SET task_stauts = 0 WHERE flow_card_id = #{flowCardId}
- </update>
-
- <select id="getMaxSequenceByFlowCardId" resultType="java.lang.Integer">
- SELECT MAX(sequence) FROM down_glass_info WHERE flow_card_id = #{flowCardId}
- </select>
-
- <delete id="deletetask">
- DELETE FROM down_glass_task WHERE flow_card_id = #{flowCardId}
- </delete>
-
-</mapper>
--
Gitblit v1.8.0