From 8b3d5b19b746a808d447b67164ba86e673fd9822 Mon Sep 17 00:00:00 2001 From: pjb <pjb123456> Date: 星期日, 24 八月 2025 16:10:14 +0800 Subject: [PATCH] 订单出库,统一出库时间 --- src/main/java/com/zy/asrs/controller/OutController.java | 19 ++++++++++++++++++- 1 files changed, 18 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 5336d71..c56325f 100644 --- a/src/main/java/com/zy/asrs/controller/OutController.java +++ b/src/main/java/com/zy/asrs/controller/OutController.java @@ -5,11 +5,14 @@ import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.R; +import com.core.exception.CoolException; import com.zy.asrs.entity.*; import com.zy.asrs.service.*; import com.zy.common.model.LocDto; import com.zy.common.model.TaskDto; import com.zy.common.web.BaseController; +import com.zy.system.entity.Config; +import com.zy.system.service.ConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -46,6 +49,9 @@ @Resource private OrderPakoutService orderPakOutService; + + @Resource + private ConfigService configService; @PostMapping("/out/pakout/orderDetlIds/auth") @@ -214,10 +220,21 @@ taskDtos.add(taskDto); } } + Date now = new Date(); // ----------------------------------------------------------------------------------------------- for (TaskDto taskDto : taskDtos) { BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo()); - workService.stockOut(staNo, taskDto, getUserId()); + // 鍒ゆ柇浠诲姟鐩爣绔欑偣鏄惁鏄嚭搴撴ā寮� + if (staNo.getDevNo() == 1016 || staNo.getDevNo() == 1043) { + Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "inOrOutBoundMode").eq("status", 1)); + if (config != null && !Cools.isEmpty(config.getValue())) { + int value = Integer.parseInt(config.getValue()); + if (value != 2) { + throw new CoolException("鐩爣绔欑偣" + staNo.getDevNo() + "涓嶆槸鍑哄簱妯″紡锛屽綋鍓嶆ā寮忎负锛�" + value); + } + } + } + workService.stockOut(staNo, taskDto, getUserId(),now); } return R.ok(); } -- Gitblit v1.9.1