#

zjj

2024-09-04 06b6bb92988ff3723cd112a51b797be0af878dfb

 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()));