From 48b15cebf27b803fedf1cb5073b5266542d8fce5 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 17 Mar 2023 13:05:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BB=B7=E6=A0=BC=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/sale/admin/thread/IoTransInoutService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java index 38efafa..f9c239e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java @@ -856,6 +856,8 @@ public class IoTransInoutService { StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity(); stockOrderDetailEntity.setProductId(erpOrderEntity.getGoodsid()); stockOrderDetailEntity.setRelId(erpOrderEntity.getGoodsid()); + + CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findByUdiRlIdUnitFk(erpOrderEntity.getGoodsid(), erpOrderEntity.getSupId()); UdiRelevanceResponse udiRelevanceEntity = udiRelevanceService.selectGroupById(stockOrderDetailEntity.getRelId()); stockOrderDetailEntity.setProductName(erpOrderEntity.getGoodsname()); stockOrderDetailEntity.setYlqxzcrbarmc(udiRelevanceEntity.getYlqxzcrbarmc()); @@ -875,8 +877,8 @@ public class IoTransInoutService { stockOrderDetailEntity.setProductDate(erpOrderEntity.getProductDate()); stockOrderDetailEntity.setExpireDate(erpOrderEntity.getExpireDate()); if (erpOrderEntity.getPrice() == null) { - if (StrUtil.isNotEmpty(udiRelevanceEntity.getPrice())) { - stockOrderDetailEntity.setPrice(new BigDecimal(udiRelevanceEntity.getPrice())); + if (companyProductRelevanceEntity.getPrice() != null) { + stockOrderDetailEntity.setPrice(companyProductRelevanceEntity.getPrice()); } } // stockOrderDetailEntity.setYlqxzcrbarmc(erpOrderEntity.get());