From 4c7732b2d35a0074a7b6f7c768d73f5dbeffdca3 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 04 十二月 2024 09:12:57 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/web/WcsController.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 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 f6e5cce..c748620 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -177,10 +177,23 @@
                 return R.parse(CodeRes.NO_COMB_700);
             }
 
+            boolean checkTimeout = false;
             for (WaitPakin waitPakin : waitPakins) {
                 Mat mat = matService.selectByMatnr(waitPakin.getMatnr());
                 mat.setWeight(waitPakin.getAnfme());
                 mats.add(mat);
+
+                Date appeTime = waitPakin.getAppeTime();
+                Date now = new Date();
+                long diffTime = now.getTime() - appeTime.getTime();
+                if (diffTime >= 1000 * 60 * 60 * 4) {
+                    checkTimeout = true;
+                    break;
+                }
+            }
+
+            if (checkTimeout) {
+                return R.error("鎵樼洏缁勬墭瓒呮椂锛屽垹闄ゅ悗閲嶆柊缁勬墭");
             }
 
             int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
@@ -726,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