From 9d5f53ac13f03b21472401e0bc6980ff1fd7a97f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 27 三月 2022 22:43:38 +0800
Subject: [PATCH] #杰克缝纫机立库 【订单出库接口 - 合并同类项】
---
src/main/java/com/zy/asrs/controller/OutController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index f714bab..9e66c95 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -3,18 +3,20 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
-import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
+import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
/**
* Created by vincent on 2022/3/26
@@ -35,10 +37,20 @@
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
+ // 鍚堝苟鍚岀被椤�
List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
+ Set<DetlDto> detlDtos = new HashSet<>();
for (OrderDetl orderDetl : orderDetls) {
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo());
+ if (DetlDto.hasList(detlDtos, orderDetl)) {
+ DetlDto detlDto = DetlDto.find(detlDtos, orderDetl.getMatnr(), orderDetl.getBatch());
+ assert detlDto != null;
+ detlDto.setAnfme(detlDto.getAnfme() + orderDetl.getAnfme());
+ } else {
+ detlDtos.add(new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getAnfme()));
+ }
}
+ //
+// List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo());
return R.ok().add(orderDetls);
--
Gitblit v1.9.1