From efac58964167be8db7cc5e967051c104d741bac2 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期五, 20 九月 2024 09:23:41 +0800 Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp --- src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 4 ++++ 1 files changed, 4 insertions(+), 0 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 a80a11a..042e5e2 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -135,6 +135,9 @@ } OrderDetl orderDetl = new OrderDetl(); orderDetl.sync(mat); + if (!Cools.isEmpty(detlDto.getCFree1())){ + orderDetl.setSpecs(detlDto.getCFree1()); + } orderDetl.setBatch(detlDto.getBatch()); orderDetl.setAnfme(detlDto.getAnfme()); orderDetl.setOrderId(order.getId()); @@ -1031,6 +1034,7 @@ od.setLength(odParam.getINum()); + od.setSource(order.getDocType().intValue()); od.setStatus(1); od.setQty(0.0D); od.setCreateBy(9999L); -- Gitblit v1.9.1