From e1c7f150792a5085dd64e86e6af82820ab34dc05 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 03 九月 2024 08:06:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2
---
src/main/java/com/zy/common/web/WcsController.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 1cd6753..c748620 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -739,6 +739,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