From e2e54a4b17bf96ea2753abe2b63883fdae3af5dc Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期三, 07 九月 2022 10:57:56 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2 +- src/main/java/com/zy/asrs/controller/OutController.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java index f5a68ca..c06e2e9 100644 --- a/src/main/java/com/zy/asrs/controller/OutController.java +++ b/src/main/java/com/zy/asrs/controller/OutController.java @@ -11,6 +11,7 @@ import com.zy.common.model.TaskDto; import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; @@ -88,6 +89,7 @@ @PostMapping("/out/pakout/auth") @ManagerAuth(memo = "璁㈠崟鍑哄簱") + @Transactional public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException { if (Cools.isEmpty(locDtos)) { return R.parse(BaseRes.PARAM); diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java index 8bf8696..9ec3730 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -947,7 +947,7 @@ Collections.reverse(locMasts); break; default: - throw new IllegalStateException("Unexpected value: " + locMasts.get(0).getRow1()); + break; } if (locNos.size() > locMasts.size()) { throw new CoolException("鏈嶅姟鍣ㄩ敊璇�"); -- Gitblit v1.9.1