From 5fd6f0511fc663b950452359e611414586c3d100 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Fri, 12 Jul 2024 14:44:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20DI=E9=80=89=E5=85=A5=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=97=B6=E8=BF=9B=E8=A1=8C=E6=98=AF=E5=90=A6=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrsys/ThrProductsAddDiController.java | 15 +++++++++++++++ .../com/glxp/api/dao/system/ClassifyCodeDao.java | 3 +++ .../mybatis/mapper/system/ClassifyCodeDao.xml | 10 ++++++++++ 3 files changed, 28 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java index d9b7b178..f979c5b1 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java @@ -15,8 +15,10 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.BusinessType; +import com.glxp.api.dao.system.ClassifyCodeDao; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.system.ClassifyCodeEntity; import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; @@ -164,6 +166,8 @@ public class ThrProductsAddDiController { @Resource ThrSystemService thrSystemService; + @Resource + ClassifyCodeDao classifyCodeDao; /** * 更新DI产品信息 @@ -328,6 +332,17 @@ public class ThrProductsAddDiController { udiRelevanceEntity.setAttributeType(thrProductsAddDiResponse.getAttributeType()); udiRelevanceEntity.setHcType(thrProductsAddDiResponse.getHcType()); + String flbm = thrProductsAddDiResponse.getFlbm(); + //是否需要扫码 初始化 + if (StrUtil.isNotEmpty(flbm)){ + ClassifyCodeEntity classifyCodeEntity = classifyCodeDao.ClassifyByCode(flbm); + if (classifyCodeEntity != null){ + udiProductEntity.setRequireScanCode(1); + }else { + udiProductEntity.setRequireScanCode(0); + } + } + udiProductEntity.setNameCode(null); udiProductService.updateUdiInfoByUuid(udiProductEntity); UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); diff --git a/src/main/java/com/glxp/api/dao/system/ClassifyCodeDao.java b/src/main/java/com/glxp/api/dao/system/ClassifyCodeDao.java index 61b2dc3c..d1b5e612 100644 --- a/src/main/java/com/glxp/api/dao/system/ClassifyCodeDao.java +++ b/src/main/java/com/glxp/api/dao/system/ClassifyCodeDao.java @@ -3,6 +3,7 @@ package com.glxp.api.dao.system; import com.glxp.api.entity.system.ClassifyCodeEntity; import com.glxp.api.req.system.FilterClassifyCodeRequest; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -10,4 +11,6 @@ import java.util.List; public interface ClassifyCodeDao { List filteClassifyCode(FilterClassifyCodeRequest filterClassifyCodeRequest); + + ClassifyCodeEntity ClassifyByCode(@Param("code") String code); } diff --git a/src/main/resources/mybatis/mapper/system/ClassifyCodeDao.xml b/src/main/resources/mybatis/mapper/system/ClassifyCodeDao.xml index 49300f36..aa707311 100644 --- a/src/main/resources/mybatis/mapper/system/ClassifyCodeDao.xml +++ b/src/main/resources/mybatis/mapper/system/ClassifyCodeDao.xml @@ -32,4 +32,14 @@ + +