From c9a82de64a983720c479cd40a7a28d692248ea24 Mon Sep 17 00:00:00 2001 From: Administrator <56479841@QQ.COM> Date: 星期五, 30 六月 2023 13:34:08 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java index e859f7c..ca96989 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -105,7 +105,7 @@ } Date now = new Date(); - int matType = 0; + Integer matType = 0; // 鏃犲崟缁勬墭 if (Cools.isEmpty(param.getOrderNo())) { @@ -151,15 +151,15 @@ waitPakin.setFrozen(param.getFrozen()); // 鏄惁鍐荤粨 waitPakin.setManu(detlDto.getCstmr()); waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷 -// if (Cools.isEmpty(mat.getMatType())){ -// throw new CoolException("鐗╂枡绫诲瀷寮傚父"+mat.getMatnr()); -// }else { -// if (matType == 0){ -// matType = mat.getMatType(); -// }else if (matType!=mat.getMatType()){ -// throw new CoolException("璇风粍鎵樺悓涓�绫诲瀷鐨勭墿鏂�"); -// } -// } + if (Cools.isEmpty(mat.getMatType())){ + throw new CoolException("鐗╂枡绫诲瀷寮傚父"+mat.getMatnr()); + }else { + if (matType == 0){ + matType = mat.getMatType(); + }else if (!matType.equals(mat.getMatType())){ + throw new CoolException("璇风粍鎵樺悓涓�绫诲瀷鐨勭墿鏂�"); + } + } if (!waitPakinService.insert(waitPakin)) { throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�"); } -- Gitblit v1.9.1