From 7d9150b95d7db9833de2e57948f5985dfa2a1914 Mon Sep 17 00:00:00 2001 From: lsh <1> Date: 星期三, 13 十二月 2023 11:30:39 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/PakoutController.java | 6 +++++- src/main/java/com/zy/asrs/service/impl/PakoutServiceImpl.java | 6 ++++-- src/main/resources/application.yml | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/PakoutController.java b/src/main/java/com/zy/asrs/controller/PakoutController.java index fe360e4..c529c01 100644 --- a/src/main/java/com/zy/asrs/controller/PakoutController.java +++ b/src/main/java/com/zy/asrs/controller/PakoutController.java @@ -289,7 +289,11 @@ @RequestMapping(value = "/pakout/delete/auth") @ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟") public R delete(@RequestParam String docNum){ - pakoutService.deletePakout(docNum); + try{ + pakoutService.deletePakout(docNum); + }catch (Exception e){ + return R.error(e+""); + } return R.ok("鎷h揣鍗曞垹闄ゆ垚鍔�"); } diff --git a/src/main/java/com/zy/asrs/service/impl/PakoutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PakoutServiceImpl.java index 462f199..d359763 100644 --- a/src/main/java/com/zy/asrs/service/impl/PakoutServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/PakoutServiceImpl.java @@ -1,6 +1,7 @@ package com.zy.asrs.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.core.common.Cools; import com.zy.asrs.entity.ManLocDetl; import com.zy.asrs.entity.Order; import com.zy.asrs.entity.OrderDetl; @@ -28,6 +29,9 @@ @Override public void deletePakout(String docNum) { Order order = orderService.selectByNo(docNum); + if (Cools.isEmpty(order)){ + throw new RuntimeException("鏈煡璇㈠埌璁㈠崟妗f"); + } List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", docNum)); for (OrderDetl orderDetl: orderDetls){ @@ -61,7 +65,5 @@ if (!delete(new EntityWrapper<Pakout>().eq("doc_num",docNum))){ throw new RuntimeException("鎷h揣鍗曞垹闄ゅけ璐�"); } - - } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 28182e8..0eda618 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -41,7 +41,7 @@ path: /stock/out/@pom.build.finalName@/logs super: - pwd: xltys1995 + pwd: xltys2023 swagger: enable: false -- Gitblit v1.9.1