From a508f850a259183a936ee2a84eddf8a595b3acbd Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 9 Jul 2024 09:56:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E9=9D=96=E6=96=B0=E5=A2=9E=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E4=BA=A7=E5=93=81=E7=BC=96=E7=A0=81=E8=BF=94?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrsys/ForThirdSysApiController.java | 1 + .../com/glxp/api/res/inv/InvProductResponse.java | 5 +++++ .../mybatis/mapper/inv/invProductDao.xml | 15 ++++++++------- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/thrsys/ForThirdSysApiController.java b/src/main/java/com/glxp/api/controller/thrsys/ForThirdSysApiController.java index 788d40f12..9dadb5ad6 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ForThirdSysApiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ForThirdSysApiController.java @@ -142,6 +142,7 @@ public class ForThirdSysApiController { } InvProductResponse invProductResponse = new InvProductResponse(); BeanUtil.copyProperties(checkUdi, invProductResponse); + invProductResponse.setThrCode(checkUdi.getThirdId()); invProductResponse.setReCount(count); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/src/main/java/com/glxp/api/res/inv/InvProductResponse.java b/src/main/java/com/glxp/api/res/inv/InvProductResponse.java index 728dfa280..345810518 100644 --- a/src/main/java/com/glxp/api/res/inv/InvProductResponse.java +++ b/src/main/java/com/glxp/api/res/inv/InvProductResponse.java @@ -132,4 +132,9 @@ public class InvProductResponse { * 生产规格 */ private String bzgg; + + /** + * 第三方产品编码 + */ + private String thrCode; } diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml index 4d4631180..9f22881ea 100644 --- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml @@ -89,7 +89,7 @@ AND ip.reCount 0 - AND basic_udirel.attributeType = #{attributeType} + AND basic_udirel.attributeType = #{attributeType} AND ip.invCode in @@ -341,14 +341,15 @@ ip.expireDate, bp.ylqxzcrbarmc, bp.zczbhhzbapzbh, - sum(ip.inCount) as inCount, - sum(ip.outCount) as outCount, - sum(ip.reCount) as reCount, + basic_udirel.thirdId thrCode, + sum(ip.inCount) as inCount, + sum(ip.outCount) as outCount, + sum(ip.reCount) as reCount, ip.customerId, - basic_corp.name supName, + basic_corp.name supName, ip.supId, - auth_dept.name deptName, - auth_warehouse.name invName, + auth_dept.name deptName, + auth_warehouse.name invName, ip.deptCode, ip.invCode from inv_product ip