From 513ae49dd33d2e3fb9c4513ea3be2e501c4a80f2 Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期一, 10 二月 2025 08:48:37 +0800 Subject: [PATCH] 库存明细行内容超出隐藏,默认显示500条数据 --- src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java index 7f15db0..080b2f9 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -34,6 +34,7 @@ import java.util.Date; import java.util.List; import java.util.Map; +import java.util.concurrent.TimeUnit; /** * Created by vincent on 2022/4/9 @@ -51,6 +52,8 @@ @Autowired private OrderService orderService; + @Autowired + private OrderLogService orderLogService; @Autowired private OrderDetlService orderDetlService; @Autowired @@ -211,6 +214,11 @@ } orderService.remove(order.getId()); } + OrderLog orderLog = orderLogService.selectByNo(param.getCCode()); + if (!Cools.isEmpty(orderLog)) { + throw new CoolException(param.getCCode() + "鍗曟嵁宸茬粡瀹屾垚锛屼笉闇�瑕佸啀浼犻��"); + } + DocType docType = docTypeService.selectOrAdd(param.getType(), Boolean.FALSE); Date now = new Date(); @@ -596,7 +604,8 @@ OpenOrderPakoutParam.Body body = new OpenOrderPakoutParam.Body(); body.setcInvCode(mat.getMatnr()); body.setiQuantity(pla.getWeightAnfme()); - body.setcBatch(""); + body.setcBatch(pla.getBatch()); + body.setCPackage(pla.getPackageNo()+""); body.setCbMemo(pla.getMemo()); bodyList.add(body); @@ -612,10 +621,14 @@ body = new OpenOrderPakoutParam.Body(); body.setcInvCode(mat.getMatnr()); body.setiQuantity(pla.getWeightAnfme()); + body.setcBatch(pla.getBatch()); + body.setCPackage(pla.getPackageNo()+""); body.setCbMemo(pla.getMemo()); bodyList.add(body); } else { body.setiQuantity(body.getIQuantity() + pla.getWeightAnfme()); + body.setcBatch(pla.getBatch()); + body.setCPackage(pla.getPackageNo()+""); } } } @@ -692,6 +705,7 @@ log.info("璇锋眰鍙傛暟锛歿}", requestParam); response = new HttpHandler.Builder() .setUri(url) + .setTimeout(30, TimeUnit.SECONDS) .setPath(path) .setJson(JSONObject.toJSONString(requestParam)) .build() -- Gitblit v1.9.1