From 3fd2ec65c4f8b2d0338f6e3f069b8d3c0ed2b197 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 03 九月 2024 08:06:22 +0800
Subject: [PATCH] #agv led显示信息修改
---
src/main/java/com/zy/asrs/entity/AgvWrkDetl.java | 12 ++++++++++++
src/main/java/com/zy/common/web/WcsController.java | 11 +++++++++++
2 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/AgvWrkDetl.java b/src/main/java/com/zy/asrs/entity/AgvWrkDetl.java
index 7f89042..52685c3 100644
--- a/src/main/java/com/zy/asrs/entity/AgvWrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/AgvWrkDetl.java
@@ -269,6 +269,18 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ public AgvWrkDetl() {
+ }
+
+ public AgvWrkDetl(String suppCode, String matnr, String maktx, String specs, Double volume) {
+// this.wrkNo = wrkNo;
+ this.suppCode = suppCode;
+ this.matnr = matnr;
+ this.maktx = maktx;
+ this.volume = volume;
+ this.specs = specs;
+ }
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index f6e5cce..1e81bee 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -726,6 +726,17 @@
}
}
};
+ if (agvWrkMast.getIoType() == 103){
+ List<AgvLocDetl> suppCodes = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", agvWrkMast.getBarcode()));
+ if (!Cools.isEmpty(suppCodes)){
+ for (AgvLocDetl agvLocDetl : suppCodes){
+ AgvWrkDetl agvWrkDetl = new AgvWrkDetl(agvLocDetl.getSuppCode(), agvLocDetl.getMatnr(), agvLocDetl.getMaktx(), agvLocDetl.getSpecs(), agvLocDetl.getAnfme());
+ agvWrkDetlList.add(agvWrkDetl);
+ }
+
+ }
+ }
+
agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList);
agvBasDevpDto.setAgvWrkMast(agvWrkMast);
--
Gitblit v1.9.1