#

18516761980

2023-03-03 ce05ef49b5f0bf700cfb763437c200d943de0d13

#

 src/main/java/com/zy/common/web/WcsController.java

@@ -77,7 +77,7 @@
//            }
            waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));

            if (Cools.isEmpty(waitPakins)) {
            if (Cools.isEmpty(waitPakins) || waitPakins.size()!=1) {
                WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
                if (wrkMast != null && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 104 || wrkMast.getIoType() == 107)) {
                    return R.parse(CodeRes.PICK_600);
@@ -85,6 +85,7 @@
                return R.parse(CodeRes.NO_COMB_700);
            }
            mat = matService.selectByMatnr(waitPakins.get(0).getMatnr());
            mat.setWeight(waitPakins.get(0).getAnfme());
            int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
            int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
            if (countLoc > 0 || countWrk > 0) {