From f31d540b81a786ea9c3430a4b4a696df638aecb8 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期一, 25 四月 2022 14:17:38 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 7 ++++++- src/main/java/com/zy/common/model/MesPakoutParam.java | 4 ++-- 2 files changed, 8 insertions(+), 3 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 c48d63a..6b89902 100644 --- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java @@ -55,7 +55,12 @@ @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 diff --git a/src/main/java/com/zy/common/model/MesPakoutParam.java b/src/main/java/com/zy/common/model/MesPakoutParam.java index 4a55967..464f195 100644 --- a/src/main/java/com/zy/common/model/MesPakoutParam.java +++ b/src/main/java/com/zy/common/model/MesPakoutParam.java @@ -52,14 +52,14 @@ public static void main(String[] args) { MesPakoutParam param = new MesPakoutParam(); param.setTag(true); - param.setOrderNo("8136024"); + param.setOrderNo("8135998"); param.setPakoutTime(DateUtils.convert(new Date())); param.setLgortFrom("5006"); param.setLgortTo("1111"); Detl detl = new Detl(); param.getList().add(detl); - detl.setBarcode("15099-10000-23132132"); + detl.setBarcode("1100146-10000-23132132"); detl.setAnfme(1.0D); System.out.println(JSON.toJSONString(param)); -- Gitblit v1.9.1