From b1b7826369cc951eebb804c29ccb9c5dccc94b5e Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 23 十月 2023 14:09:59 +0800
Subject: [PATCH] agv可视化站点管理更新

---
 src/main/java/com/zy/asrs/service/AgvLocDetlService.java          |    2 ++
 src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java |    4 ++++
 src/main/webapp/views/agvBasDevpVisualized/basDevp.html           |   10 ++++++++--
 src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java    |    6 +++---
 src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java |   35 ++++++++++++++++++++++++-----------
 5 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
index 6c7550f..d0b67a4 100644
--- a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
@@ -28,4 +28,6 @@
      */
     boolean updateAnfme(Double anfme, String locNo, String matnr, String batch);
 
+    public AgvLocDetl selectByLocNo(String locNo);
+
 }
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..1b46c02 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) || "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);
                     }
                 }
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index 68a127c..ef4811a 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -166,4 +166,8 @@
             wrapper.eq(column,condition);
         }
     }
+
+    public AgvLocDetl selectByLocNo(String locNo){
+        return this.selectOne(new EntityWrapper<AgvLocDetl>().eq("loc_no",locNo));
+    }
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 1ed3d71..240f471 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -175,10 +175,10 @@
             //鎷f枡鍏ュ簱
             if(ioType == 53){
                 //淇敼宸ヤ綔鍏氭槑缁�
-                agvWrkDetl.setAnfme(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme());
-                agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>().eq("wrk_no",agvWrkDetl.getWrkNo()));
+                //agvWrkDetl.setAnfme(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme());
+                //agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>().eq("wrk_no",agvWrkDetl.getWrkNo()));
                 //淇敼搴撳瓨淇℃伅
-                agvLocDetl.setAnfme(agvWrkDetl.getAnfme());
+                agvLocDetl.setAnfme(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme());
                 agvLocDetlService.update(agvLocDetl,new EntityWrapper<AgvLocDetl>().eq("loc_no",agvLocDetl.getLocNo()));
             }
             //淇敼搴撲綅淇℃伅
diff --git a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
index b016b59..a7d7137 100644
--- a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
+++ b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
@@ -77,6 +77,9 @@
                     </div>
                     {{#if agvWaitPakin}}
                     <div style="padding-top: 10px;">
+                        {{#if agvWaitPakin.orderNo}}
+                        璁㈠崟鍙凤細{{agvWaitPakin.orderNo}} </br>
+                        {{/if}}
                         鐗╂枡鍙凤細{{agvWaitPakin.matnr}} </br>
                         {{#if agvWaitPakin.batch}}
                         搴忓垪鐮侊細{{agvWaitPakin.batch}} </br>
@@ -94,12 +97,15 @@
                     {{/if}}
                     {{#if agvWrkDetl}}
                     <div style="padding-top: 10px;">
+                        {{#if agvWrkDetl.orderNo}}
+                        璁㈠崟鍙凤細{{agvWrkDetl.orderNo}} </br>
+                        {{/if}}
                         鐗╂枡鍙凤細{{agvWrkDetl.matnr}} </br>
                         {{#if agvWrkDetl.batch}}
                         搴忓垪鐮侊細{{agvWrkDetl.batch}} </br>
                         {{/if}}
-                        鏂欑鐮侊細{{agvWaitPakin.suppCode}} </br>
-                        鏁伴噺锛歿{agvWrkDetl.anfme}}
+                        鏂欑鐮侊細{{agvWrkDetl.suppCode}} </br>
+                        鍙栬揣鏁伴噺锛歿{agvWrkDetl.anfme}}      缁撲綑鏁伴噺锛歿{agvWrkDetl.volume}}
                     </div>
                     {{/if}}
                 </div>

--
Gitblit v1.9.1