From 9d0c16cb86438f7dae85048c1be7a427662cb1cf Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 28 Nov 2024 17:22:02 +0800 Subject: [PATCH] =?UTF-8?q?11/28=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/service/inout/IoAddInoutService.java | 2 +- .../resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index 3166d60b..a026bb95 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -757,7 +757,7 @@ public class IoAddInoutService { // ioOrderDetailCodeEntity.setSpec(StrUtil.isEmpty(udiRelevanceResponse.getGgxh()) ? "" : udiRelevanceResponse.getBzgg()); ioOrderDetailCodeEntity.setSpec(StrUtil.isEmpty(udiRelevanceResponse.getGgxh()) ? udiRelevanceResponse.getBzgg() : udiRelevanceResponse.getGgxh()); ioOrderDetailCodeEntity.setSupId(codeTempEntity.getSupId()); - ioOrderDetailCodeEntity.setProductType(codeTempEntity.getProductType()); + ioOrderDetailCodeEntity.setProductType(orderEntity.getProductType()); if (codeTempEntity.getPrice() == null) { ioOrderDetailCodeEntity.setPrice(udiRelevanceResponse.getPrice()); diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml index 7c95ac30..1519950a 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml @@ -7,7 +7,8 @@ bp.prepnUnit, bp.prepnSpec, bp.packUnit, - (select `name` from basic_corp where erpId = io_order_detail_code.supId) supName + bp.ggxh, + (select `name` from basic_corp where erpId = io_order_detail_code.supId) supName from io_order_detail_code left join basic_udirel bu on bu.id = io_order_detail_code.bindRlFk left join basic_products bp on bp.uuid = bu.uuid