From 5fb1c85805da8cf8d682bc07272b170d60fd31ea Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 12 十二月 2023 16:49:11 +0800
Subject: [PATCH] 可视化站点显示
---
src/main/webapp/views/agvBasDevpVisualized/basDevp.html | 32 ++++++++--------
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 6 +-
src/main/java/com/zy/common/model/AgvBasDevpDto.java | 6 ++-
src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | 37 +++++++++++-------
4 files changed, 45 insertions(+), 36 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 310b62a..a471d65 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
@@ -138,26 +138,33 @@
agvBasDevpDto.setAgvWrkMast(agvWrkMast);
if("F".equals(agvBasDevpDto.getLocSts()) || "R".equals(agvBasDevpDto.getLocSts())){
- AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectOne(new EntityWrapper<AgvWaitPakin>()
+ //AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectOne(new EntityWrapper<AgvWaitPakin>().eq("supp_code", agvBasDevpDto.getBarcode()));
+ List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>()
.eq("supp_code", agvBasDevpDto.getBarcode()));
- agvBasDevpDto.setAgvWaitPakin(agvWaitPakin);
+ agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
- if(Cools.isEmpty(agvWaitPakin)){
- AgvWrkDetl agvWrkDetl = agvWrkDetlService.selectOne(new EntityWrapper<AgvWrkDetl>().
- eq("wrk_no",agvWrkMast.getWrkNo()));
+ if(Cools.isEmpty(agvWaitPakinList)){
+ //AgvWrkDetl agvWrkDetl = agvWrkDetlService.selectOne(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",agvWrkMast.getWrkNo()));
+ List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(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());
+ for(AgvWrkDetl agvWrkDetl : agvWrkDetlList){
+ agvWrkDetl.setVolume(0.0);
+ AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getSourceLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
+ if(agvWrkMast.getIoType() == 103){
+ //AgvLocDetl agvLocDetl = agvLocDetlService.selectByLocNo(agvWrkMast.getSourceLocNo());
+ //AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getSourceLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
+ 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());
+ }
}
- if(agvWrkMast.getIoType() == 53){
- AgvLocDetl agvLocDetl = agvLocDetlService.selectByLocNo(agvWrkMast.getLocNo());
- agvWrkDetl.setVolume(agvLocDetl.getAnfme());
- //agvWrkDetl.setAnfme(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme());
- }
- agvBasDevpDto.setAgvWrkDetl(agvWrkDetl);
+
+ agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList);
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 801d692..9aeabad 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -77,9 +77,9 @@
@Override
@Transactional
public void comb(CombParam param, Long userId) {
- if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
- throw new CoolException(BaseRes.PARAM);
- }
+// if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
+// throw new CoolException(BaseRes.PARAM);
+// }
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
diff --git a/src/main/java/com/zy/common/model/AgvBasDevpDto.java b/src/main/java/com/zy/common/model/AgvBasDevpDto.java
index 1d4e2fb..5d9a130 100644
--- a/src/main/java/com/zy/common/model/AgvBasDevpDto.java
+++ b/src/main/java/com/zy/common/model/AgvBasDevpDto.java
@@ -6,6 +6,8 @@
import com.zy.asrs.entity.AgvWrkMast;
import lombok.Data;
+import java.util.List;
+
/**
* 鐢ㄤ簬灞曠ずAGV绔欑偣鍙鍖栫鐞嗛〉闈㈢殑鏁版嵁
*/
@@ -14,9 +16,9 @@
private AgvWrkMast agvWrkMast;
- private AgvWaitPakin agvWaitPakin;
+ private List<AgvWaitPakin> agvWaitPakins;
- private AgvWrkDetl agvWrkDetl;
+ private List<AgvWrkDetl> agvWrkDetls;
private boolean containerMoveOutFlag;
diff --git a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
index 8ef19c0..9de3dc1 100644
--- a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
+++ b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
@@ -75,17 +75,17 @@
宸ヤ綔绔欑紪鐮侊細{{devNo}} </br>
绔欑偣鐘舵�侊細{{locSts$}}
</div>
- {{#if agvWaitPakin}}
+ {{#if agvWaitPakins}}
<div style="padding-top: 10px;">
- {{#if agvWaitPakin.orderNo}}
- 璁㈠崟鍙凤細{{agvWaitPakin.orderNo}} </br>
+ {{#if agvWaitPakins[0].orderNo}}
+ 璁㈠崟鍙凤細{{agvWaitPakins[0].orderNo}} </br>
{{/if}}
- 鐗╂枡鍙凤細{{agvWaitPakin.matnr}} </br>
- {{#if agvWaitPakin.batch}}
- 搴忓垪鐮侊細{{agvWaitPakin.batch}} </br>
+ 鐗╂枡鍙凤細{{agvWaitPakins[0].matnr}} </br>
+ {{#if agvWaitPakins[0].batch}}
+ 搴忓垪鐮侊細{{agvWaitPakins[0].batch}} </br>
{{/if}}
- 鏂欑鐮侊細{{agvWaitPakin.suppCode}} </br>
- 鏁伴噺锛歿{agvWaitPakin.anfme}}
+ 鏂欑鐮侊細{{agvWaitPakins[0].suppCode}} </br>
+ 鏁伴噺锛歿{agvWaitPakins[0].anfme}}
</div>
{{/if}}
{{#if agvWrkMast}}
@@ -95,17 +95,17 @@
宸ヤ綔绫诲瀷锛歿{agvWrkMast.ioType$}}
</div>
{{/if}}
- {{#if agvWrkDetl}}
+ {{#if agvWrkDetls}}
<div style="padding-top: 10px;">
- {{#if agvWrkDetl.orderNo}}
- 璁㈠崟鍙凤細{{agvWrkDetl.orderNo}} </br>
+ {{#if agvWrkDetls[0].orderNo}}
+ 璁㈠崟鍙凤細{{agvWrkDetls[0].orderNo}} </br>
{{/if}}
- 鐗╂枡鍙凤細{{agvWrkDetl.matnr}} </br>
- {{#if agvWrkDetl.batch}}
- 搴忓垪鐮侊細{{agvWrkDetl.batch}} </br>
+ 鐗╂枡鍙凤細{{agvWrkDetls[0].matnr}} </br>
+ {{#if agvWrkDetls[0].batch}}
+ 搴忓垪鐮侊細{{agvWrkDetls[0].batch}} </br>
{{/if}}
- 鏂欑鐮侊細{{agvWrkDetl.suppCode}} </br>
- 鍙栬揣鏁伴噺锛歿{agvWrkDetl.anfme}} 缁撲綑鏁伴噺锛歿{agvWrkDetl.volume}}
+ 鏂欑鐮侊細{{agvWrkDetls[0].suppCode}} </br>
+ 鍙栬揣鏁伴噺锛歿{agvWrkDetls[0].anfme}} 缁撲綑鏁伴噺锛歿{agvWrkDetls[0].volume}}
</div>
{{/if}}
</div>
--
Gitblit v1.9.1