From 61435c9ca2b12877e26438dc54c19d1dc3884e41 Mon Sep 17 00:00:00 2001 From: lsh <lsh123456> Date: 星期一, 10 二月 2025 20:38:55 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java index e5ba7e8..39f9afb 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -725,9 +725,9 @@ }else if (Cools.isEmpty(matList.getWeight()) || matList.getWeight().equals(0D)){ throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍑�閲� weight涓虹┖"); }else if (Cools.isEmpty(matList.getRoughWeight()) || matList.getRoughWeight().equals(0D)){ - throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細姣涢噸 roughWeight"); + throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細姣涢噸 roughWeight涓虹┖"); }else if (Cools.isEmpty(matList.getRollExtent()) || matList.getRollExtent().equals(0D)){ - throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍗烽暱搴� rollExtent"); + throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍗烽暱搴� rollExtent涓虹┖"); } // else if (Cools.isEmpty(matList.getJoint()) || matList.getJoint()==0){ // throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鎺ュご鏁� joint"); @@ -876,16 +876,16 @@ throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matLists涓虹┖"); } -// if (Cools.isEmpty(param.getBarcode())){ -// throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode涓虹┖"); -// } -// WrkMast wrkMastMatrix = wrkMastService.selectByBarcode(param.getBarcode()); -// if (Cools.isEmpty(wrkMastMatrix)){ -// throw new CoolException("鍙傛暟锛氭墭鐩樼爜鏌ヨ宸ヤ綔妗eけ璐ワ細"+param.getBarcode()); -// } -// if (!wrkMastMatrix.getSheetNo().equals("1")){ -// throw new CoolException("鍙傛暟锛氭浠诲姟鏈笂鎶ョ姝㈠畬鎴愶細"+param.getBarcode()); -// } + if (Cools.isEmpty(param.getBarcode())){ + throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode涓虹┖"); + } + WrkMast wrkMastMatrix = wrkMastService.selectByBarcode(param.getBarcode()); + if (Cools.isEmpty(wrkMastMatrix)){ + throw new CoolException("鍙傛暟锛氭墭鐩樼爜鏌ヨ宸ヤ綔妗eけ璐ワ細"+param.getBarcode()); + } + if (!wrkMastMatrix.getSheetNo().equals("1")){ + throw new CoolException("鍙傛暟锛氭浠诲姟鏈笂鎶ョ姝㈠畬鎴愶細"+param.getBarcode()); + } ArrayList<WrkDetl> wrkDetlsNew = new ArrayList<>(); ArrayList<WrkDetlSingle> wrkDetlsOld = new ArrayList<>(); -- Gitblit v1.9.1