From 3aaa2f73d832be9f277e3bad798896d061c85516 Mon Sep 17 00:00:00 2001 From: Administrator <56479841@QQ.COM> Date: 星期二, 12 十二月 2023 13:04:12 +0800 Subject: [PATCH] #20231212-1304 --- src/main/java/com/zy/asrs/controller/MatController.java | 3 +++ src/main/java/com/zy/common/service/CommonService.java | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java index 2d12e18..bc0e15f 100644 --- a/src/main/java/com/zy/asrs/controller/MatController.java +++ b/src/main/java/com/zy/asrs/controller/MatController.java @@ -273,6 +273,9 @@ List<MatPrint> res = new ArrayList<>(); for (String matnr : param){ Mat mat = matService.selectByMatnr(matnr); + if(Cools.isEmpty(mat)) { + continue; + } // 鎵撳嵃鏁版嵁娉ㄥ叆 MatPrint print = new MatPrint(); print.setMatnr(mat.getMatnr()); diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 84ee80d..c78ded9 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -178,9 +178,12 @@ throw new CoolException("娣锋斁鐗╂枡绫诲瀷涓嶄竴鑷�"); } } - if (!matTypeIn.equals(0)) { - matType = matTypeIn; + if (!Cools.isEmpty(matTypeIn)) { + if (!matTypeIn.equals(0)) { + matType = matTypeIn; + } } + if (matNos.size() > 1 && matType == 1) { //鐗╂枡涓哄崟鍝佺被鍨嬶紝涓旂墿鏂欑绫昏秴杩�1(瀹為檯涓洪珮棰戞贩鏀�)锛屽垯绂佹鍏ュ簱 throw new CoolException("鐗╂枡绫诲瀷鍜屽疄闄呯绫讳笉涓�鑷�"); -- Gitblit v1.9.1