From 8407e277e156a55fee38e7bb7b8930ec16a15f0e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 24 四月 2026 09:08:47 +0800
Subject: [PATCH] 库存上下限预警，物料高低频摆放
---
src/main/java/com/zy/common/web/WcsController.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index a139fe3..ee32eda 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -9,6 +9,7 @@
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.mapper.LocMastMapper;
+import com.zy.asrs.mapper.MatMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.CodeRes;
@@ -29,6 +30,7 @@
import java.util.Arrays;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2020/10/30
@@ -231,7 +233,7 @@
rows.add(row[i * 4 + 1]);
rows.add(row[i * 4 + 2]);
rows.add(row[i * 4 + 3]);
- dto = commonService.getLocNoNew(1, 0, Integer.valueOf(locTypeDto.getLocType1()),rows);
+ dto = commonService.getLocNoNew(1, 0, Integer.valueOf(locTypeDto.getLocType1()),rows,0);
if (dto != null) {
break;
}
@@ -373,6 +375,9 @@
return R.ok(!Cools.isEmpty(wrkMast) ? R.ok("鑷姩绌烘墭鍑哄簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍑哄簱澶辫触"));
}
+ @Resource
+ private MatMapper matMapper;
+
/**
* 鍏ㄦ澘鍏ュ簱
*/
@@ -380,6 +385,12 @@
public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins, int[] row) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
+ /// 鍒ゆ柇鏄惁鏈変綆棰戠墿鏂�
+ int sortRole = 0;
+ if(!waitPakins.isEmpty()) {
+ sortRole = matMapper.selectCount(new EntityWrapper<Mat>().eq("be_batch",1).in("matnr", waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList())));
+ }
+
// 妫�绱㈠簱浣�
// FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(waitPakins.get(0));
// StartupDto dto = commonService.getLocNo(1, devpNo, findLocNoAttributeVo, locTypeDto);
@@ -396,7 +407,7 @@
// break;
// }
// }
- StartupDto dto = commonService.getLocNoNew(1, devpNo, Integer.valueOf(locTypeDto.getLocType1()),null);;
+ StartupDto dto = commonService.getLocNoNew(1, devpNo, Integer.valueOf(locTypeDto.getLocType1()),null,sortRole);;
if (dto == null) {
throw new CoolException("娌℃湁鍖归厤鍒板簱浣嶏紝妫�鏌ュ彲鐢ㄥ簱浣�/鍫嗗灈鏈烘姤璀�");
}
@@ -491,7 +502,7 @@
// break;
// }
// }
- StartupDto dto = commonService.getLocNoNew(10, devpNo, Integer.valueOf(locTypeDto.getLocType1()),null);;
+ StartupDto dto = commonService.getLocNoNew(10, devpNo, Integer.valueOf(locTypeDto.getLocType1()),null,0);;
if (dto == null) {
throw new CoolException("娌℃湁鍖归厤鍒板簱浣嶏紝妫�鏌ュ彲鐢ㄥ簱浣�/鍫嗗灈鏈烘姤璀�");
}
--
Gitblit v1.9.1