From e9f4a368fd3845a38eb54d3d18d77e96e5767b61 Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期二, 05 九月 2023 10:47:22 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/WaitPakinController.java | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java index 9898dde..91d5c7f 100644 --- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java +++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java @@ -11,7 +11,9 @@ import com.core.common.DateUtils; import com.core.common.R; import com.zy.asrs.entity.WaitPakin; +import com.zy.asrs.entity.WrkMast; import com.zy.asrs.service.WaitPakinService; +import com.zy.asrs.service.WrkMastService; import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -26,6 +28,9 @@ @Autowired private WaitPakinService waitPakinService; + + @Autowired + private WrkMastService wrkMastService; @RequestMapping(value = "/waitPakin/{id}/auth") @ManagerAuth @@ -88,7 +93,13 @@ return R.error(); } for (WaitPakin entity : list){ - waitPakinService.delete(new EntityWrapper<>(entity)); + WrkMast wrkMast = wrkMastService.selectByBarcode(entity.getBarcode()); + if (Cools.isEmpty(wrkMast)) { + waitPakinService.delete(new EntityWrapper<>(entity)); + } else { + return R.error("宸ヤ綔妗f暟鎹凡瀛樺湪,鏃犳硶鍒犻櫎锛侊紒"); + } + } return R.ok(); } -- Gitblit v1.9.1