From dcaa739b0c28e0ea4628a4d08e0683001ced273a Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 10 十一月 2023 18:16:05 +0800
Subject: [PATCH] agv物料混载更改 新增根据物料频率查找库位
---
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 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 46f1a15..0f8c4b7 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -31,13 +31,13 @@
}
@Override
- public OrderDetl selectItem(Long orderId, String matnr, String batch) {
- return this.baseMapper.selectItem(orderId, matnr, batch);
+ public OrderDetl selectItem(Long orderId, String matnr, String batch, String csocode, String isoCode) {
+ return this.baseMapper.selectItem(orderId,matnr,batch,csocode,isoCode);
}
@Override
- public OrderDetl selectItem(String orderNo, String matnr, String batch) {
- return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch);
+ public OrderDetl selectItem(String orderNo, String matnr, String batch, String csocode, String isoCode) {
+ return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch,csocode,isoCode);
}
@Override
@@ -63,20 +63,20 @@
}
@Override
- public boolean increaseAnfme(Long orderId, String matnr, String batch, Double qty) {
- return this.baseMapper.increaseAnfme(orderId, matnr, batch, qty) > 0;
+ public boolean increaseAnfme(Long orderId, String matnr, String batch, Double qty, String csocode, String isoCode) {
+ return this.baseMapper.increaseAnfme(orderId, matnr, batch, qty, csocode, isoCode) > 0;
}
@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 qty, String csocode, String isoCode) {
+ return this.baseMapper.increase(orderId, matnr, batch, qty, csocode, isoCode) > 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 qty, String csocode, String isoCode) {
+ int decrease = this.baseMapper.decrease(orderNo, matnr, batch, qty, csocode, isoCode);
if (decrease == 0) {
- return this.baseMapper.decrease(orderNo, matnr, null, qty) > 0;
+ return this.baseMapper.decrease(orderNo, matnr, null, qty, csocode, isoCode) > 0;
} else {
return true;
}
@@ -109,8 +109,8 @@
@Override
public OrderDetl selectByOrderNoAndMatnr(String orderNo, String matnr, String csocode, String isoseq) {
Wrapper<OrderDetl> wrapper = new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("matnr", matnr);
- Utils.wapperSetCondition(wrapper,"csocode",csocode);
- Utils.wapperSetCondition(wrapper,"isoseq",isoseq);
+ Utils.wapperSetCondition(wrapper,"three_code",csocode);
+ Utils.wapperSetCondition(wrapper,"dead_time",isoseq);
return this.selectOne(wrapper);
}
--
Gitblit v1.9.1