From 25314b5ee613c48e7db31138d7fcb8abc4c536be Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 14 一月 2024 20:15:05 +0800
Subject: [PATCH] # 功能完善
---
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 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 dc3d7c8..20541c1 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -2,11 +2,11 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
-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.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 org.springframework.stereotype.Service;
import java.util.List;
@@ -21,6 +21,8 @@
@Override
public Page<OrderDetl> getPakoutPage(Page<OrderDetl> page) {
+ List<OrderDetl> pakoutPage = baseMapper.getPakoutPage(page.getCondition());
+ System.out.println(pakoutPage);
page.setRecords(baseMapper.getPakoutPage(page.getCondition()));
page.setTotal(baseMapper.getPakoutPageCount(page.getCondition()));
return page;
@@ -49,15 +51,15 @@
}
@Override
- public boolean increase(Long orderId, String matnr, String batch, Double qty) {
- return this.baseMapper.increase(orderId, matnr, batch, qty) > 0;
+ public boolean increase(Long orderId, String matnr, String batch, Double workQty) {
+ return this.baseMapper.increase(orderId, matnr, batch, workQty) > 0;
}
@Override
- public boolean decrease(String orderNo, String matnr, String batch, Double qty) {
- int decrease = this.baseMapper.decrease(orderNo, matnr, batch, qty);
+ public boolean decrease(String orderNo, String matnr, String batch, Double workQty) {
+ int decrease = this.baseMapper.decrease(orderNo, matnr, batch, workQty);
if (decrease == 0) {
- return this.baseMapper.decrease(orderNo, matnr, null, qty) > 0;
+ return this.baseMapper.decrease(orderNo, matnr, null, workQty) > 0;
} else {
return true;
}
@@ -73,6 +75,11 @@
return this.baseMapper.addToLogTable(orderDetl) > 0;
}
+ @Override
+ public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) {
+ return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch, qty) > 0;
+ }
+
/**
* 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
* @param orderId
@@ -85,4 +92,27 @@
public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) {
return this.baseMapper.increaseWorkQty(orderId, matnr, batch, workQty) > 0;
}
+
+ @Override
+ public Boolean checkAllDetlFinish(String orderNo) {
+ return this.baseMapper.checkAllDetlFinish(orderNo) <= 0 ;
+ }
+
+ /**
+ * 鑾峰彇鐩稿悓鍗曞彿锛岀浉鍚屾壒鍙凤紝鐩稿悓鐗╂枡浠ｇ爜宸茬粡鍦ㄥ叆搴撻�氱煡妗ｉ噷缁勬墭鐨勬暟閲�
+ * @param orderNo
+ * @param matnr
+ * @param batch
+ * @return
+ */
+ @Override
+ public Integer sameOrderComb(String orderNo, String matnr, String batch) {
+ Integer sum = this.baseMapper.sameOrderComb(orderNo, matnr, batch);
+ return sum != null ? sum : 0;
+ }
+
+ @Override
+ public OrderDetl selectByOrderNoAndMaktx(String orderNo, String maktx) {
+ return this.selectOne(new EntityWrapper<OrderDetl>().eq("order_no",orderNo).eq("maktx",maktx));
+ }
}
--
Gitblit v1.9.1