From 3971255dadf007563d83d887e8c2ef465242fc87 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 28 四月 2026 22:03:31 +0800
Subject: [PATCH] 双伸出库改成订单出库
---
src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java
index 1faf2da..9b8f484 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java
@@ -27,19 +27,32 @@
}
@Override
- public OrderDetlPakout selectItem(Long orderId, String matnr, String batch) {
- return this.baseMapper.selectItem(orderId, matnr, batch);
+ public OrderDetlPakout selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
+ return this.baseMapper.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
}
@Override
- public OrderDetlPakout selectItem(String orderNo, String matnr, String batch) {
- return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch);
+ public OrderDetlPakout selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
+ return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
}
@Override
- public OrderDetlPakout findByLook(List<OrderDetlPakout> orderDetls, Long orderId, String matnr, String batch) {
+ public OrderDetlPakout selectItemByOrderNoAndPallet(String orderNo, String palletId) {
+ if (Cools.isEmpty(orderNo) || Cools.isEmpty(palletId)) {
+ return null;
+ }
+ return this.selectOne(new EntityWrapper<OrderDetlPakout>()
+ .eq("order_no", orderNo)
+ .eq("pallet_id", palletId));
+ }
+
+ @Override
+ public OrderDetlPakout findByLook(List<OrderDetlPakout> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
for (OrderDetlPakout orderDetl : orderDetls) {
- if (orderDetl.getOrderId().equals(orderId) && orderDetl.getMatnr().equals(matnr)) {
+ if (orderDetl.getOrderId().equals(orderId) && orderDetl.getMatnr().equals(matnr) && orderDetl.getBrand().equals(brand)
+ && orderDetl.getStandby1().equals(standby1) && orderDetl.getStandby2().equals(standby2) && orderDetl.getStandby3().equals(standby3)
+ && orderDetl.getBoxType1().equals(boxType1) && orderDetl.getBoxType2().equals(boxType2) && orderDetl.getBoxType3().equals(boxType3)
+ ) {
if (Cools.eq(batch, orderDetl.getBatch())) {
return orderDetl;
}
@@ -49,15 +62,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, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
+ return this.baseMapper.increase(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty) > 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, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
+ int decrease = this.baseMapper.decrease(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
if (decrease == 0) {
- return this.baseMapper.decrease(orderNo, matnr, null, qty) > 0;
+ return this.baseMapper.decrease(orderNo, matnr, "",brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty) > 0;
} else {
return true;
}
@@ -74,8 +87,20 @@
}
@Override
- public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) {
- return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch, qty) > 0;
+ public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
+ return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty) > 0;
+ }
+
+ @Override
+ public boolean increaseQtyByOrderNoAndPallet(String orderNo, String palletId, Double qty) {
+ OrderDetlPakout orderDetl = selectItemByOrderNoAndPallet(orderNo, palletId);
+ if (orderDetl == null) {
+ return false;
+ }
+ // qty 鏄畬鎴愭暟閲忥紝鐢变换鍔″畬鎴愬洖鍐欓�掑锛泈orkQty 鏄换鍔＄敓鎴愭暟閲忥紝瀹氭椂鐢熸垚浠诲姟鏃跺凡缁存姢銆�
+ Double oldQty = orderDetl.getQty() == null ? 0.0D : orderDetl.getQty();
+ orderDetl.setQty(oldQty + (qty == null ? 0.0D : qty));
+ return this.updateById(orderDetl);
}
/**
@@ -87,7 +112,7 @@
* @return
*/
@Override
- public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) {
- return this.baseMapper.increaseWorkQty(orderId, matnr, batch, workQty) > 0;
+ public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty) {
+ return this.baseMapper.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, workQty) > 0;
}
}
--
Gitblit v1.9.1