From 26b4bddec08eb4e32452167b5fe10e58765be949 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 11 七月 2024 10:59:08 +0800
Subject: [PATCH] 接口返回改为封装类
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
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 56a0fdd..3d8482d 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
@@ -10,6 +10,7 @@
import com.mes.downglassinfo.mapper.DownGlassInfoMapper;
import com.mes.downglassinfo.service.DownGlassInfoService;
import com.mes.downglassinfo.service.DownGlassTaskService;
+import com.mes.downstorage.entity.DownStorageCage;
import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.entity.DownWorkstationTask;
import com.mes.downworkstation.entity.DownWorkstionAndDownGlassinfo;
@@ -34,7 +35,7 @@
@Autowired
private DownWorkstationMapper downWorkstationMapper;
- @Autowired(required = false)
+ @Autowired(required=false)
private DownWorkstationTaskMapper downWorkstationTaskMapper;
@Autowired
private DownGlassInfoService downGlassInfoService;
@@ -67,7 +68,7 @@
//宸ヤ綅鏄剧ず
@Override
- public List<Map<String, Object>> getTotalGlassDimensionsByWorkstation(int start, int end) {
+ public List<Map<String, Object>> getTotalGlassDimensionsByWorkstation(int start,int end) {
MPJQueryWrapper<DownWorkstation> queryWrapper = new MPJQueryWrapper<>();
queryWrapper.select("t.workstation_id", "t.flow_card_id", "COALESCE(SUM(b.width), 0) AS totalwidth", "COALESCE(SUM(b.height), 0) AS totalheight")
.leftJoin("down_glass_info b on t.flow_card_id = b.flow_card_id")
@@ -76,8 +77,8 @@
;
- List<DownWorkstionAndDownGlassinfo> workstationList = downWorkstationMapper.selectJoinList(DownWorkstionAndDownGlassinfo.class, queryWrapper);
- // List<DownWorkstionAndDownGlassinfo> workstationList = null;
+ List<DownWorkstionAndDownGlassinfo> workstationList = downWorkstationMapper.selectJoinList(DownWorkstionAndDownGlassinfo.class, queryWrapper);
+ // List<DownWorkstionAndDownGlassinfo> workstationList = null;
List<Map<String, Object>> result = new ArrayList<>();
for (DownWorkstionAndDownGlassinfo downWorkstionAndDownGlassinfo : workstationList) {
Map<String, Object> rack = new HashMap<>();
@@ -94,7 +95,7 @@
List<DownGlassInfo> downGlassInfoList = downGlassInfoMapper.selectList(glassInfoQueryWrapper);
- if (!downGlassInfoList.isEmpty()) {
+ if (!downGlassInfoList.isEmpty()) {
item.put("downGlassInfoList", downGlassInfoList);
@@ -103,7 +104,7 @@
rack.put("item", item);
result.add(rack);
}
- log.info("result" + (result));
+ log.info("result"+(result));
return result; // 杩斿洖鏈�缁堢粨鏋�
}
@@ -141,21 +142,22 @@
@Override
- public int updateFlowCardIdAndCount(String flowCardId, int workstationId, int layer) {
- int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId, layer);
+ public void updateFlowCardIdAndCount(String flowCardId, int workstationId,int layer) {
+ int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId,layer);
QueryWrapper<Damage> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("process_id", flowCardId);
queryWrapper.eq("technology_number", layer);
- int otherNumber = damageservice.count(queryWrapper);
+ int otherNumber=damageservice.count(queryWrapper);
UpdateWrapper<DownWorkstation> updateWrapper = new UpdateWrapper<>();
updateWrapper.set("total_quantity", glassInfoCount)
.set("flow_card_id", flowCardId)
.set("layer", layer)
.set("other_number", otherNumber)
.eq("workstation_id", workstationId);
+
this.update(updateWrapper);
- return 1;
+
}
@Override
@@ -168,6 +170,9 @@
baseMapper.update(new DownWorkstation(), updateWrapper);
}
+
+
+
@Override
@@ -190,4 +195,12 @@
}
+ @Override
+ public boolean updateDownWorkstationstate(DownWorkstation downWorkstation) {
+ DownWorkstation downWork = baseMapper.selectById(downWorkstation.getId());
+ downWork.setEnableState(downWorkstation.getEnableState());
+ baseMapper.updateById(downWork);
+ return true;
+ }
+
}
--
Gitblit v1.8.0