From 983c8fc9697223956db395af1b781ddb75c6e0b5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 17 十月 2022 16:01:04 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderDetlMapper.xml | 9 +++++++++
src/main/java/com/zy/asrs/service/OrderService.java | 2 +-
src/main/java/com/zy/asrs/service/OrderDetlService.java | 1 +
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 9 ++++++---
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 2 ++
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 5 +++++
src/main/java/com/zy/asrs/controller/OutController.java | 4 +---
src/main/java/com/zy/common/model/OrderMergeVo.java | 16 ++++++++++++++++
8 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 0eda27d..d9617b6 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -8,7 +8,6 @@
import com.zy.asrs.service.*;
import com.zy.common.model.LocDto;
import com.zy.common.model.OrderDto;
-import com.zy.common.model.OrderMergeVo;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -165,8 +164,7 @@
@RequestMapping(value = "/order/merge/preview/auth")
@ManagerAuth
public R mergePreview(@RequestParam(value = "orderIds[]") List<Long> orderIds){
- OrderMergeVo merge = orderService.mergePreview(orderIds);
- return R.ok().add(merge);
+ return R.ok().add(orderService.mergePreview(orderIds));
}
}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index f55c61a..901910d 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -31,4 +31,6 @@
int modifyStatus(@Param("orderId") Long orderId, @Param("status")Integer status);
+ List<OrderDetl> selectRemainder(@Param("orderId") Long orderId);
+
}
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index 20cf173..73740a9 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -26,4 +26,5 @@
boolean modifyStatus(Long orderId, Integer status);
+ List<OrderDetl> selectRemainder(Long orderId);
}
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index 5a0434e..f5b50e5 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -28,6 +28,6 @@
/**
* 璁㈠崟鍚堝苟棰勮
*/
- OrderMergeVo mergePreview(List<Long> ids);
+ List<OrderMergeVo> mergePreview(List<Long> ids);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index f069bb5..806dba6 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -73,4 +73,9 @@
return this.baseMapper.modifyStatus(orderId, status) > 0;
}
+ @Override
+ public List<OrderDetl> selectRemainder(Long orderId) {
+ return this.baseMapper.selectRemainder(orderId);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index d15d0eb..9dec861 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -167,14 +167,17 @@
}
@Override
- public OrderMergeVo mergePreview(List<Long> ids) {
- OrderMergeVo vo = new OrderMergeVo();
+ public List<OrderMergeVo> mergePreview(List<Long> ids) {
+ List<OrderMergeVo> result = new ArrayList<>();
for (Long orderId : ids) {
Order order = this.selectById(orderId);
// 鑾峰彇鎵�鏈夋湭浣滀笟鐨勬槑缁�
+ List<OrderDetl> orderDetls = orderDetlService.selectRemainder(orderId);
+ for (OrderDetl orderDetl : orderDetls) {
+ }
}
- return vo;
+ return result;
}
}
diff --git a/src/main/java/com/zy/common/model/OrderMergeVo.java b/src/main/java/com/zy/common/model/OrderMergeVo.java
index 81153be..54642c4 100644
--- a/src/main/java/com/zy/common/model/OrderMergeVo.java
+++ b/src/main/java/com/zy/common/model/OrderMergeVo.java
@@ -2,9 +2,25 @@
import lombok.Data;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Created by vincent on 2022/10/17
*/
@Data
public class OrderMergeVo {
+
+ private String matnr;
+
+ private String maktx;
+
+ private String batch;
+
+ private String specs;
+
+ private Double anfme;
+
+ private List<DetlDto> detlDtos = new ArrayList<>();
+
}
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index ed77f18..6cab66f 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -181,4 +181,13 @@
and order_id = #{orderId}
</update>
+ <select id="selectRemainder" resultMap="BaseResultMap">
+ select
+ *
+ from man_order_detl
+ where 1=1
+ and anfme > qty
+ and order_id = #{orderId}
+ </select>
+
</mapper>
--
Gitblit v1.9.1