From da3070daffbbe2ac420b2a4077c890dbf65d2557 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期四, 09 三月 2023 16:54:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
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 c50a9df..0bf3dcb 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -15,6 +15,7 @@
import com.zy.common.model.DetlDto;
import com.zy.common.model.OrderDto;
import com.zy.common.model.OrderMergeVo;
+import com.zy.common.service.erp.ErpService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -40,6 +41,8 @@
private WrkDetlService wrkDetlService;
@Autowired
private MatService matService;
+ @Autowired
+ private ErpService erpService;
@Override
public Order selectByNo(String orderNo) {
@@ -180,7 +183,7 @@
for (OrderDetl orderDetl : orderDetls) {
Double leave = orderDetl.getAnfme() - orderDetl.getQty();
OrderMergeVo vo = new OrderMergeVo(orderDetl.getMatnr(), orderDetl.getBatch(), leave);
- OrderDto orderDto = new OrderDto(orderDetl.getOrderNo(), null, leave);
+ OrderDto orderDto = new OrderDto(orderDetl.getOrderNo(), null,null, leave);
if (OrderMergeVo.has(result, vo)) {
OrderMergeVo exist = OrderMergeVo.find(result, vo.getMatnr(), vo.getBatch());
assert exist != null;
@@ -201,5 +204,9 @@
}
return result;
}
+ @Override
+ public List<Order> selectorderNoL(String orderNo) {
+ return this.baseMapper.selectorderNoL(orderNo);
+ }
}
--
Gitblit v1.9.1