From ffcf87710c84ba534ae9298e6932067536b53e3d Mon Sep 17 00:00:00 2001 From: bfwms <1> Date: 星期六, 17 八月 2024 09:53:08 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/service/CommonService.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 84ee80d..9090ac1 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -117,6 +117,7 @@ ArrayList<Integer> rows = new ArrayList<>(); switch (sourceStaNo) { case 103://103鍏ュ簱绔� + case 113://103鍏ュ簱绔� whsType = 1; start = 1; end = 14; @@ -133,6 +134,7 @@ crnNo = 1; break; case 203://203鍏ュ簱绔� + case 213://203鍏ュ簱绔� whsType = 2; start = 8; end = 21; @@ -178,9 +180,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