From 2261f6ef772af3df1eee7417a09987773e41342d Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 24 五月 2024 10:12:21 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java | 7 +++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WorkService.java | 5 +++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java | 20 ++++++++++++++++++++
3 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WorkService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WorkService.java
index 55002d2..5bfcf18 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WorkService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WorkService.java
@@ -37,6 +37,11 @@
void emptyPlateOut(EmptyPlateOutParam param, Long userId, Long hostId);
/**
+ * 鐩樼偣鍑哄簱
+ */
+ void locCheckOut(StockOutParam param, Long userId, Long hostId);
+
+ /**
* 鎵嬪姩瀹屾垚宸ヤ綔妗�
*/
void completeWrkMast(String workNo, Long userId, Long hostId);
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
index 80b6a53..4a9eeea 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
@@ -292,6 +292,26 @@
}
@Override
+ public void locCheckOut(StockOutParam param, Long userId, Long hostId) {
+ // 鐩爣绔欑偣鐘舵�佹娴�
+ BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite(), false, hostId);
+ // 鑾峰彇搴撲綅鏄庣粏
+ List<LocDetlDto> locDetlDtos = new ArrayList<>();
+ for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
+ if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
+ LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch(), hostId);
+ if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
+ }
+ }
+ if (!locDetlDtos.isEmpty()) {
+ // 鍚姩鍑哄簱寮�濮� 107.鐩樼偣鍑哄簱
+ stockOut(param.getOutSite(), locDetlDtos, IoWorkType.CHECK_OUT, userId, hostId);
+ } else {
+ throw new CoolException("搴撲綅鐗╂枡涓嶅瓨鍦�");
+ }
+ }
+
+ @Override
@Transactional
public void stockOut(Integer staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId, Long hostId) {
Date now = new Date();
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java
index d9029b4..60a7d0b 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java
@@ -107,6 +107,13 @@
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
+ @RequestMapping("/locCheck/out/start")
+ @ManagerAuth(memo = "鐩樼偣鍑哄簱")
+ public R locCheckOutStart(@RequestBody StockOutParam param) {
+ workService.locCheckOut(param, getUserId(), getHostId());
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
@RequestMapping("/hand/control/wrkMast")
@ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
public R handControlWrkMast(@RequestParam String workNo,
--
Gitblit v1.9.1