From 41b60e560952a6db3a99a3972dc146c3b177cb77 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期三, 28 五月 2025 18:15:57 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java | 45 +++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java index 2437d39..d491daf 100644 --- a/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java @@ -81,28 +81,28 @@ } if (complete) { // 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏 - DocType docType = docTypeService.selectById(order.getDocType()); - if (null != docType && docType.getPakout() == 1) { - if (!orderDetlService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_id", order.getId()))) { - throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�"); - } - List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo); - for (WrkDetl wrkDetl : wrkDetls) { - OrderDetlPakin orderDetl = new OrderDetlPakin(); - orderDetl.sync(wrkDetl); - orderDetl.setQty(orderDetl.getAnfme()); - orderDetl.setOrderId(order.getId()); - orderDetl.setOrderNo(orderNo); - orderDetl.setStatus(1); - orderDetl.setCreateTime(order.getCreateTime()); - orderDetl.setCreateBy(order.getCreateBy()); - orderDetl.setUpdateTime(order.getUpdateTime()); - orderDetl.setUpdateBy(order.getUpdateBy()); - if (!orderDetlService.insert(orderDetl)) { - throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�"); - } - } - } +// DocType docType = docTypeService.selectById(order.getDocType()); +// if (null != docType && docType.getPakout() == 1) { +// if (!orderDetlService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_id", order.getId()))) { +// throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�"); +// } +// List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo); +// for (WrkDetl wrkDetl : wrkDetls) { +// OrderDetlPakin orderDetl = new OrderDetlPakin(); +// orderDetl.sync(wrkDetl); +// orderDetl.setQty(orderDetl.getAnfme()); +// orderDetl.setOrderId(order.getId()); +// orderDetl.setOrderNo(orderNo); +// orderDetl.setStatus(1); +// orderDetl.setCreateTime(order.getCreateTime()); +// orderDetl.setCreateBy(order.getCreateBy()); +// orderDetl.setUpdateTime(order.getUpdateTime()); +// orderDetl.setUpdateBy(order.getUpdateBy()); +// if (!orderDetlService.insert(orderDetl)) { +// throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�"); +// } +// } +// } if (!this.updateSettle(order.getId(), 4L, null)) { throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�"); @@ -172,6 +172,7 @@ orderDetlService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_id", orderId)); } + @Override public List<OrderPakin> selectComplete() { return this.baseMapper.selectComplete(); -- Gitblit v1.9.1