From c37ae85eab15d2c7566677bfb26920c31da879fe Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 24 十一月 2023 12:07:51 +0800
Subject: [PATCH] agv拣货流程更改
---
src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java
index 044917d..65b4f1a 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java
@@ -18,6 +18,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
+import java.util.stream.Collectors;
@Service
public class AutoReplenishmentHandler extends AbstractHandler<String> {
@@ -44,6 +45,7 @@
public ReturnT<String> create(Mat mat, double anfme) {
//鍒涘缓涓�涓柊鐨勮嚜鍔ㄨˉ璐у崟鎹�
Order order = createOrder();
+ orderService.insert(order);
OrderDetl orderDetl = createOrderDetl(order);
orderDetl.setMatnr(mat.getMatnr());
orderDetl.setMaktx(mat.getMaktx());
@@ -51,7 +53,7 @@
orderDetl.setAnfme(anfme);
orderDetl.setQty(0.0);
- orderService.insert(order);
+
orderDetlService.insert(orderDetl);
return SUCCESS;
@@ -157,6 +159,16 @@
//List<String> locNosSearch = locDetlService.selectLocNo(matnr);
Set<String> locNosSearch = locDetlService.selectLocNos(matnr);
+ //杩囨护搴撲綅璐х墿涓洪珮璐х墿
+ locNosSearch = locNosSearch.stream().filter(locNo -> {
+ LocMast locMast = locMastService.selectByLoc(locNo);
+ if(locMast.getLocType1() == 3){
+ return false;
+ }else {
+ return true;
+ }
+ }).collect(Collectors.toSet());
+
//閲嶆柊鎺掑簭 骞朵笖妫�娴嬭搴撲綅鏄惁鍚病鏈夋枡绠辩爜鐨勭墿鏂欙紝濡傛湁鏈夊垯涓嶅厑璁稿嚭搴�
Set<String> resort = resort(locNosSearch);
--
Gitblit v1.9.1