From 307ba2fc4f1b7c09111f6ff8fd7fa13a0b9b4a46 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 09 九月 2023 13:45:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 5 deletions(-)
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 5a3dc21..ae757e0 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -1,21 +1,31 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.zy.asrs.mapper.OrderDetlMapper;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.OrderDetlService;
+import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.mapper.OrderDetlMapper;
+import com.zy.asrs.service.OrderDetlService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.List;
+@Slf4j
@Service("orderDetlService")
public class OrderDetlServiceImpl extends ServiceImpl<OrderDetlMapper, OrderDetl> implements OrderDetlService {
@Override
public List<OrderDetl> selectByOrderId(Long orderId) {
return this.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
+ }
+
+ @Override
+ public Page<OrderDetl> getPakoutPage(Page<OrderDetl> page) {
+ page.setRecords(baseMapper.getPakoutPage(page.getCondition()));
+ page.setTotal(baseMapper.getPakoutPageCount(page.getCondition()));
+ return page;
}
@Override
@@ -26,6 +36,16 @@
@Override
public OrderDetl selectItem(String orderNo, String matnr, String batch) {
return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch);
+ }
+
+ @Override
+ public OrderDetl selectItemNoneOfBatch(String orderNo, String matnr) {
+ return this.baseMapper.selectItemNoneOfBatch(orderNo, matnr);
+ }
+
+ @Override
+ public OrderDetl selectItemOfBatch(String matnr, String batch) {
+ return this.baseMapper.selectItemOfBatch(matnr, batch);
}
@Override
@@ -41,13 +61,23 @@
}
@Override
+ public boolean increaseAnfme(Long orderId, String matnr, String batch, Double qty) {
+ return this.baseMapper.increaseAnfme(orderId, matnr, batch, qty) > 0;
+ }
+
+ @Override
public boolean increase(Long orderId, String matnr, String batch, Double qty) {
return this.baseMapper.increase(orderId, matnr, batch, qty) > 0;
}
@Override
public boolean decrease(String orderNo, String matnr, String batch, Double qty) {
- return this.baseMapper.decrease(orderNo, matnr, batch, qty) > 0;
+ int decrease = this.baseMapper.decrease(orderNo, matnr, batch, qty);
+ if (decrease == 0) {
+ return this.baseMapper.decrease(orderNo, matnr, null, qty) > 0;
+ } else {
+ return true;
+ }
}
@Override
@@ -55,4 +85,24 @@
return this.baseMapper.modifyStatus(orderId, status) > 0;
}
+ @Override
+ public List<OrderDetl> selectRemainder(Long orderId) {
+ return this.baseMapper.selectRemainder(orderId);
+ }
+
+ @Override
+ public OrderDetl selectContainBatch(String batch) {
+ OrderDetl orderDetl = this.selectOne(new EntityWrapper<OrderDetl>().like("batch", batch));
+ return orderDetl;
+// if (!Cools.isEmpty(orderDetls)) {
+// if (orderDetls.size() > 1) {
+// log.error("{}鏉＄爜鍚屾椂瀛樺湪澶氱瑪璁㈠崟锛岃娉ㄦ剰鏌ョ湅锛�", matnr);
+// } else {
+// return orderDetls.get(0);
+// }
+// }
+// return null;
+ }
+
+
}
--
Gitblit v1.9.1