From a404bc18b884ea14c8e56510909436d7b8dd9558 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 31 八月 2024 15:05:37 +0800
Subject: [PATCH] #组托的时间间距不能超过4小时

---
 src/main/java/com/zy/common/web/WcsController.java |   13 +++++++++++++
 1 files changed, 13 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..1cd6753 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()));

--
Gitblit v1.9.1