From 47c22da4acff495a4571424836d160d3cd2fbd42 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 22 Nov 2024 16:57:31 +0800 Subject: [PATCH] =?UTF-8?q?11/22=20=E5=8D=95=E6=8D=AE=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=A1=A8=E8=AE=BE=E7=BD=AE=E8=8D=AF=E5=93=81?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/service/inout/IoAddInoutService.java | 3 ++- src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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 a7645a75..3166d60b 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -754,7 +754,8 @@ public class IoAddInoutService { ioOrderDetailCodeEntity.setYlqxzcrbarmc(udiRelevanceResponse.getYlqxzcrbarmc()); ioOrderDetailCodeEntity.setManufacturer(udiRelevanceResponse.getManufactory()); ioOrderDetailCodeEntity.setMeasname(udiRelevanceResponse.getMeasname()); - ioOrderDetailCodeEntity.setSpec(StrUtil.isEmpty(udiRelevanceResponse.getGgxh()) ? "" : udiRelevanceResponse.getBzgg()); +// 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()); diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 9fe9ce27..612c1f13 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -1531,6 +1531,7 @@ basic_products.requireScanCode, basic_products.bhltcjsl, basic_products.bhsycjsl, + basic_products.bzgg, company_product_relevance.unitFk, basic_corp.name companyName, basic_products.cphhhbh