From 74863c38a407b1e0f36250dfa0c63e5da7fe5f66 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 19 一月 2026 18:06:51 +0800
Subject: [PATCH] WMS功能完善
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index a008dca..32ba6a8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -300,9 +300,15 @@
@Override
@Transactional
- public R WarehouseOutPickMergeV1(WarehouseOutPickMergeParam param, Long hostId, Long userId) {
+ public R WarehouseOutPickMergeV1(WarehouseOutPickMergeParam param, Long userId) {
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
+ if(wrkMast1 == null) {
+ return R.parse("璇ユ潯鐮佷笉瀛樺湪浠诲姟锛�" + param.getBarcode());
+ } else if(wrkMast1.getIoType() != 103) {
+ return R.parse("璇ヤ换鍔″嚭搴撶被鍨嬩笉涓烘嫞鏂欏嚭搴擄細" + wrkMast1.getIoType());
+ }
//鍒ゆ柇搴撲綅鐘舵��
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getLocNo()));
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast1.getSourceLocNo()));
if (Cools.isEmpty(locMast)) {
return R.error("璇ュ簱浣嶄笉瀛樺湪");
}
@@ -319,9 +325,9 @@
wrkMast.setIoType(8); // 鍏ュ嚭搴撶姸鎬侊細8.鎷ｆ枡閫斾腑骞舵澘
wrkMast.setIoPri(13D); // 浼樺厛绾�
wrkMast.setCrnNo(1);
- wrkMast.setSourceStaNo(1 + "");
- wrkMast.setStaNo(1 + "");
- wrkMast.setLocNo(param.getLocNo());
+ wrkMast.setSourceStaNo(104 + "");
+ wrkMast.setStaNo(106 + "");
+ wrkMast.setLocNo(locMast.getLocNo());
wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
@@ -761,7 +767,8 @@
}
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
- int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
+// int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
+ int countWrk = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode",param.getBarcode()).ne("wrk_sts",15));
int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
if (countLoc > 0 || countWrk > 0 || countwait > 0) {
throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
--
Gitblit v1.9.1