From d55581ed00fd0a8ecce78a6ebe6f9e2ee86274b3 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 04 八月 2023 17:01:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs

---
 src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java |   79 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
index fbecf3d..069fae5 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
@@ -1,16 +1,25 @@
 package com.zy.asrs.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
 import com.zy.asrs.entity.AgvBasDevp;
+import com.zy.asrs.entity.AgvWaitPakin;
+import com.zy.asrs.entity.AgvWrkDetl;
+import com.zy.asrs.entity.AgvWrkMast;
 import com.zy.asrs.mapper.AgvBasDevpMapper;
 import com.zy.asrs.service.AgvBasDevpService;
+import com.zy.asrs.service.AgvWaitPakinService;
+import com.zy.asrs.service.AgvWrkDetlService;
+import com.zy.asrs.service.AgvWrkMastService;
+import com.zy.common.model.AgvBasDevpDto;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @Transactional
@@ -18,6 +27,12 @@
 
     @Autowired
     AgvBasDevpMapper agvBasDevpMapper;
+    @Autowired
+    AgvWrkMastService agvWrkMastService;
+    @Autowired
+    AgvWrkDetlService agvWrkDetlService;
+    @Autowired
+    AgvWaitPakinService agvWaitPakinService;
 
     public void clearBasDevp(){
         agvBasDevpMapper.deleteAll();
@@ -80,4 +95,62 @@
         this.updateById(agvBasDevp);
     }
 
+    public Map<String, Object> getAgvBasDevpDtoByStationCode(String stationCode) {
+
+        List<Map<String, Object>> body = new ArrayList<>();
+        for(int i=3; i>=1; i--){
+            List<AgvBasDevp> agvBasDevpList = this.selectList(new EntityWrapper<AgvBasDevp>()
+                    .eq("station_code", stationCode)
+                    .like("dev_no","0"+ i +"@"));
+
+            Map<String, Object> map = new HashMap<>();
+
+            List<AgvBasDevpDto> agvBasDevpDtoList = agvBasDevpList.stream().map(agvBasDevp -> {
+                AgvBasDevpDto agvBasDevpDto = new AgvBasDevpDto();
+                BeanUtils.copyProperties(agvBasDevp, agvBasDevpDto);
+
+//                if (Cools.isEmpty(agvBasDevpDto.getBarcode())) {
+//                    return agvBasDevpDto;
+//                }
+
+                if("O".equals(agvBasDevpDto.getLocSts())){
+                    return agvBasDevpDto;
+                }
+
+//              AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
+//                        .eq("barcode", agvBasDevpDto.getBarcode()));
+                AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
+                        .eq("loc_no", agvBasDevpDto.getDevNo())
+                        .or().eq("source_loc_no",agvBasDevpDto.getDevNo()));
+
+                agvBasDevpDto.setAgvWrkMast(agvWrkMast);
+
+                if("F".equals(agvBasDevpDto.getLocSts()) || "R".equals(agvBasDevpDto.getLocSts())){
+                    AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectOne(new EntityWrapper<AgvWaitPakin>()
+                            .eq("zpallet", agvBasDevpDto.getBarcode()));
+
+                    agvBasDevpDto.setAgvWaitPakin(agvWaitPakin);
+
+                    if(Cools.isEmpty(agvWaitPakin)){
+                        AgvWrkDetl agvWrkDetl = agvWrkDetlService.selectOne(new EntityWrapper<AgvWrkDetl>().
+                                eq("wrk_no",agvWrkMast.getWrkNo()));
+
+                        agvBasDevpDto.setAgvWrkDetl(agvWrkDetl);
+                    }
+                }
+
+                return agvBasDevpDto;
+
+            }).collect(Collectors.toList());
+
+            map.put("loc",agvBasDevpDtoList);
+            body.add(map);
+        }
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("body", body);
+
+        return result;
+    }
+
 }

--
Gitblit v1.9.1