From b6b46e1c4d390c80cf9bd7d4daa23202f2d11a22 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 26 五月 2023 13:47:57 +0800
Subject: [PATCH] 站点管理编辑高低库位
---
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 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 99f70f4..806dba6 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;
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;
@@ -19,6 +20,13 @@
}
@Override
+ public Page<OrderDetl> getPakoutPage(Page<OrderDetl> page) {
+ page.setRecords(baseMapper.getPakoutPage(page.getCondition()));
+ page.setTotal(baseMapper.getPakoutPageCount(page.getCondition()));
+ return page;
+ }
+
+ @Override
public OrderDetl selectItem(Long orderId, String matnr, String batch) {
return this.baseMapper.selectItem(orderId, matnr, batch);
}
@@ -32,16 +40,17 @@
public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch) {
for (OrderDetl orderDetl : orderDetls) {
if (orderDetl.getOrderId().equals(orderId) && orderDetl.getMatnr().equals(matnr)) {
- if (!Cools.isEmpty(batch)) {
- if (orderDetl.getBatch().equals(batch)) {
- return orderDetl;
- }
- } else {
+ if (Cools.eq(batch, orderDetl.getBatch())) {
return orderDetl;
}
}
}
return null;
+ }
+
+ @Override
+ public boolean increaseAnfme(Long orderId, String matnr, String batch, Double qty) {
+ return this.baseMapper.increaseAnfme(orderId, matnr, batch, qty) > 0;
}
@Override
@@ -51,7 +60,22 @@
@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
+ public boolean modifyStatus(Long orderId, Integer status) {
+ return this.baseMapper.modifyStatus(orderId, status) > 0;
+ }
+
+ @Override
+ public List<OrderDetl> selectRemainder(Long orderId) {
+ return this.baseMapper.selectRemainder(orderId);
}
}
--
Gitblit v1.9.1