From fe8ccfb561140711d2c89542f65002cd577a1cef Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 30 十月 2023 19:09:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 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 b8cbc8f..9c4db97 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
@@ -1,17 +1,12 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
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.entity.*;
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.asrs.service.*;
import com.zy.common.model.AgvBasDevpDto;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +28,8 @@
AgvWrkDetlService agvWrkDetlService;
@Autowired
AgvWaitPakinService agvWaitPakinService;
+ @Autowired
+ AgvLocDetlService agvLocDetlService;
public void clearBasDevp(){
agvBasDevpMapper.deleteAll();
@@ -99,9 +96,15 @@
List<Map<String, Object>> body = new ArrayList<>();
for(int i=3; i>=1; i--){
- List<AgvBasDevp> agvBasDevpList = this.selectList(new EntityWrapper<AgvBasDevp>()
+ Wrapper<AgvBasDevp> wrapper = new EntityWrapper<AgvBasDevp>()
.eq("station_code", stationCode)
- .like("dev_no","0"+ i +"@"));
+ .like("dev_no", "0" + i + "@");
+
+ if("CS-305".equals(stationCode) || "CS-306".equals(stationCode) || "CS-307".equals(stationCode)){
+ wrapper.orderBy("dev_no",false);
+ }
+
+ List<AgvBasDevp> agvBasDevpList = this.selectList(wrapper);
Map<String, Object> map = new HashMap<>();
@@ -129,7 +132,17 @@
if(Cools.isEmpty(agvWaitPakin)){
AgvWrkDetl agvWrkDetl = agvWrkDetlService.selectOne(new EntityWrapper<AgvWrkDetl>().
eq("wrk_no",agvWrkMast.getWrkNo()));
-
+ //agv绔欑偣鍙鍖栫鐞嗕腑鐨勭粨浣欐暟閲忔樉绀�
+ agvWrkDetl.setVolume(0.0);
+ if(agvWrkMast.getIoType() == 103){
+ AgvLocDetl agvLocDetl = agvLocDetlService.selectByLocNo(agvWrkMast.getSourceLocNo());
+ agvWrkDetl.setVolume(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme());
+ }
+ if(agvWrkMast.getIoType() == 53){
+ AgvLocDetl agvLocDetl = agvLocDetlService.selectByLocNo(agvWrkMast.getLocNo());
+ agvWrkDetl.setVolume(agvLocDetl.getAnfme());
+ //agvWrkDetl.setAnfme(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme());
+ }
agvBasDevpDto.setAgvWrkDetl(agvWrkDetl);
}
}
--
Gitblit v1.9.1