From 1a30e1b9238a1f4cc3f893ae8a0a94b0836853b3 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 29 Sep 2023 15:34:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E7=BB=88=E7=AB=AF=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E4=BE=9B=E5=BA=94=E5=95=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/UdiRelevanceController.java         |  11 +-
 .../inout/IoCodeTempController.java           |   5 -
 .../glxp/api/dao/basic/UdiRelevanceDao.java   |   5 +-
 .../api/service/inout/IoAddInoutService.java  |   1 -
 .../mybatis/mapper/basic/UdiRelevanceDao.xml  | 678 +++++++++++-------
 5 files changed, 411 insertions(+), 289 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
index e02ead65..5bf5a1bd 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
@@ -1,5 +1,6 @@
 package com.glxp.api.controller.basic;
 
+import com.glxp.api.dao.basic.UdiRelevanceDao;
 import org.springframework.beans.BeanUtils;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
@@ -70,6 +71,9 @@ public class UdiRelevanceController extends BaseController {
     UdiRlSupService udiRlSupService;
     @Resource
     ProductInfoService productInfoService;
+    @Resource
+    UdiRelevanceDao udiRelevanceDao;
+
 
     //手持终端下载UDI产品信息
     @AuthRuleAnnotation("")
@@ -81,8 +85,7 @@ public class UdiRelevanceController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<UdiRelevanceResponse> udiRelevanceResponses = null;
-        udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiRelRequest);
-
+        udiRelevanceResponses = udiRelevanceDao.pdaDlUdiRel(filterUdiRelRequest);
         PageInfo<UdiRelevanceResponse> pageInfo;
         pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
@@ -246,10 +249,9 @@ public class UdiRelevanceController extends BaseController {
     }
 
 
-
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/udiinfo/selectProduct")
-    public BaseResponse selectProduct(@RequestBody  FilterUdiRelRequest filterUdiRelRequest) {
+    public BaseResponse selectProduct(@RequestBody FilterUdiRelRequest filterUdiRelRequest) {
         List<UdiRelevanceResponse> udiRelevanceResponses = null;
         filterUdiRelRequest.setKey("1");
         udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiRelRequest);
@@ -262,7 +264,6 @@ public class UdiRelevanceController extends BaseController {
     }
 
 
-
     //多选删除
     @AuthRuleAnnotation("")
     @PostMapping("/udi/udirel/deleteAll")
diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index 315b3869..5b498b92 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -1033,14 +1033,9 @@ public class IoCodeTempController extends BaseController {
     //校验供应商唯一性
     public BaseResponse checkSupId(BasicBussinessTypeEntity bussinessTypeEntity, IoCodeTempEntity codeEnttity, String unitFk) {
         String originSupId = unitFk;
-//        if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
-//            if (unitFk != null)
-//                originSupId = unitFk;
-//        }
         if (originSupId != null) {
             codeEnttity.setSupId(originSupId);
         } else {
-
             IoCodeEntity ioCodeEntity = new IoCodeEntity();
             BeanUtils.copyProperties(codeEnttity, ioCodeEntity);
             String supId = transInoutService.checkInvExitSup(ioCodeEntity);
diff --git a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java
index 3a81a024..a2001961 100644
--- a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java
+++ b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java
@@ -13,6 +13,10 @@ import java.util.List;
 public interface UdiRelevanceDao extends BaseMapperPlus<UdiRelevanceDao, UdiRelevanceEntity, UdiRelevanceEntity> {
 
     List<UdiRelevanceResponse> filterUdiRelevance(FilterUdiRelRequest filterUdiRelRequest);
+
+    List<UdiRelevanceResponse> pdaDlUdiRel(FilterUdiRelRequest filterUdiRelRequest);
+
+
     String selectPackLevel(@Param("nameCode") String nameCode);
 
 
@@ -123,7 +127,6 @@ public interface UdiRelevanceDao extends BaseMapperPlus<UdiRelevanceDao, UdiRele
     UdiRelevanceResponse selectOneUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest);
 
     /**
-     *
      * @param productName
      * @return
      */
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 3fe5e14a..4d11aa9a 100644
--- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
@@ -622,7 +622,6 @@ public class IoAddInoutService {
     }
 
     public String checkInvExitSup(IoCodeEntity codeEnttity) {
-
         String supId = checkNorInv(codeEnttity);
         if (supId == null) {
             return checkPreInv(codeEnttity);
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index a0632a67..40696b6d 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -131,6 +131,130 @@
         </choose>
         ORDER BY modifyTime DESC
     </select>
+
+
+    <select id="pdaDlUdiRel" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
+            resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
+        select basic_udirel.*,
+               basic_udirel.id relId,
+               basic_products.originUuid,
+               basic_products.nameCode,
+               basic_products.deviceRecordKey,
+               basic_products.packRatio,
+               basic_products.packUnit,
+               basic_products.packLevel,
+               basic_products.bhxjsl,
+               basic_products.bhzxxsbzsl,
+               basic_products.zxxsbzbhsydysl,
+               basic_products.bhxjcpbm,
+               basic_products.bzcj,
+               basic_products.cpmctymc,
+               basic_products.cplb,
+               basic_products.flbm,
+               basic_products.ggxh,
+               basic_products.qxlb,
+               basic_products.tyshxydm,
+               basic_products.ylqxzcrbarmc,
+               basic_products.zczbhhzbapzbh,
+               basic_products.ylqxzcrbarywmc,
+               basic_products.sydycpbs,
+               basic_products.sjcpbm,
+               basic_products.versionNumber,
+               basic_products.diType,
+               basic_products.ybbm,
+               basic_products.sptm,
+               basic_products.manufactory,
+               basic_products.measname,
+               basic_products.productType,
+               basic_products.scbssfbhph,
+               basic_products.scbssfbhxlh,
+               basic_products.scbssfbhscrq,
+               basic_products.scbssfbhsxrq,
+               basic_products.cpms,
+               basic_products.allowNoBatch,
+               basic_products.allowNoExpire,
+               basic_products.allowNoProduct,
+               basic_products.allowNoSerial,
+
+               basic_products.spmc,
+               basic_products.cplx,
+               basic_products.hchzsb,
+               basic_products.cpdls,
+               basic_products.price,
+               basic_products.basicPrductRemak1,
+               basic_products.basicPrductRemak2,
+               basic_products.basicPrductRemak3,
+               basic_products.basicPrductRemak4,
+               basic_products.basicPrductRemak5,
+               basic_products.basicPrductRemak6,
+               basic_products.basicPrductRemak7,
+               basic_products.basicPrductRemak8
+        FROM basic_udirel
+                     inner JOIN basic_products ON basic_products.uuid = basic_udirel.uuid
+        <where>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
+            </if>
+            <if test="manufactory != '' and manufactory != null">
+                AND basic_products.manufactory LIKE concat('%', #{manufactory}, '%')
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode}, '%')
+            </if>
+            <if test="thirdId != '' and thirdId != null">
+                AND thirdId LIKE concat(#{thirdId}, '%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND basic_udirel.uuid = #{uuid}
+            </if>
+            <if test="id != '' and id != null">
+                AND basic_udirel.id = #{id}
+            </if>
+            <if test="udplatCode != '' and udplatCode != null">
+                AND basic_udirel.udplatCode = #{udplatCode}
+            </if>
+            <if test="diType != null">
+                AND basic_products.diType = #{diType}
+            </if>
+
+            <if test="lockStatus != '' and lockStatus != null">
+                AND basic_udirel.lockStatus = #{lockStatus}
+            </if>
+
+            <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
+                AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
+            </if>
+            <if test="lastUpdateTime != null and lastUpdateTime != ''">
+                <![CDATA[
+                and DATE_FORMAT(basic_udirel.updateTime, '%Y-%m-%d %H:%i:%S') >=
+                    DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
+            </if>
+            <if test="mainId != '' and mainId != null">
+                AND mainId = #{mainId}
+            </if>
+            <if test="unionFilterStr != '' and unionFilterStr != null">
+                or basic_products.cpmctymc LIKE concat('%', #{unionFilterStr}, '%')
+                or basic_products.ylqxzcrbarmc LIKE concat('%', #{unionFilterStr}, '%')
+                or basic_products.ggxh LIKE concat('%', #{unionFilterStr}, '%')
+                or basic_products.zczbhhzbapzbh LIKE concat('%', #{unionFilterStr}, '%')
+            </if>
+            <if test="isAdavence != '' and isAdavence != null">
+                AND isAdavence = #{isAdavence}
+            </if>
+            <if test="uniqueNameCode != '' and uniqueNameCode != null">
+                AND nameCode = #{uniqueNameCode}
+            </if>
+        </where>
+        <choose>
+            <when test="key != null and key != ''">
+                GROUP BY basic_udirel.id
+            </when>
+        </choose>
+    </select>
     <select id="selectPackLevel" parameterType="java.lang.String"
             resultType="java.lang.String">
         select basic_products.packLevel
@@ -1087,70 +1211,70 @@
 
     <insert id="insertUdiRelevance" keyProperty="id" parameterType="com.glxp.api.entity.basic.UdiRelevanceEntity">
         replace
-                INTO basic_udirel
-                (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
-                 isLock,
-                 lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
-                 updateUser,
-                 remark, useExpireTime, dispatch, groupBuy, needCert)
+        INTO basic_udirel
+        (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
+        isLock,
+        lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
+        updateUser,
+        remark, useExpireTime, dispatch, groupBuy, needCert)
         values (#{id},
-                #{uuid},
-                #{mainId},
-                #{thirdId},
-                #{thirdId1},
-                #{thirdId2},
-                #{thirdId3},
-                #{thirdId4},
-                #{udplatCode},
-                #{isUseDy},
-                #{isDisable},
-                #{isLock},
-                #{lockStatus},
-                #{isAdavence},
-                #{useMuti},
-                #{useNum},
-                #{supName},
-                #{createTime},
-                #{updateTime},
-                #{modifyTime},
-                #{createUser},
-                #{updateUser},
-                #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert})
+        #{uuid},
+        #{mainId},
+        #{thirdId},
+        #{thirdId1},
+        #{thirdId2},
+        #{thirdId3},
+        #{thirdId4},
+        #{udplatCode},
+        #{isUseDy},
+        #{isDisable},
+        #{isLock},
+        #{lockStatus},
+        #{isAdavence},
+        #{useMuti},
+        #{useNum},
+        #{supName},
+        #{createTime},
+        #{updateTime},
+        #{modifyTime},
+        #{createUser},
+        #{updateUser},
+        #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert})
     </insert>
 
     <insert id="insertUdiRelevanceignore"
             parameterType="com.glxp.api.entity.basic.UdiRelevanceEntity">
         insert
-                ignore
+        ignore
         INTO basic_udirel
-                (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
-                 isLock,
-                 lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
-                 updateUser,
-                 remark, useExpireTime, dispatch, groupBuy, needCert)
+        (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
+        isLock,
+        lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
+        updateUser,
+        remark, useExpireTime, dispatch, groupBuy, needCert)
         values (#{id},
-                #{uuid},
-                #{mainId},
-                #{thirdId},
-                #{thirdId1},
-                #{thirdId2},
-                #{thirdId3},
-                #{thirdId4},
-                #{udplatCode},
-                #{isUseDy},
-                #{isDisable},
-                #{isLock},
-                #{lockStatus},
-                #{isAdavence},
-                #{useMuti},
-                #{useNum},
-                #{supName},
-                #{createTime},
-                #{updateTime},
-                #{modifyTime},
-                #{createUser},
-                #{updateUser},
-                #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert})
+        #{uuid},
+        #{mainId},
+        #{thirdId},
+        #{thirdId1},
+        #{thirdId2},
+        #{thirdId3},
+        #{thirdId4},
+        #{udplatCode},
+        #{isUseDy},
+        #{isDisable},
+        #{isLock},
+        #{lockStatus},
+        #{isAdavence},
+        #{useMuti},
+        #{useNum},
+        #{supName},
+        #{createTime},
+        #{updateTime},
+        #{modifyTime},
+        #{createUser},
+        #{updateUser},
+        #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert})
     </insert>
 
     <delete id="deleteById" parameterType="Map">
@@ -1291,106 +1415,106 @@
 
     <insert id="importUdiRelevance" parameterType="java.util.List">
         replace
-                into basic_udirel
-                (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
-                 isLock,
-                 lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
-                 updateUser,
-                 remark, useExpireTime, dispatch, groupBuy, needCert)
-                values
+        into basic_udirel
+        (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
+        isLock,
+        lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
+        updateUser,
+        remark, useExpireTime, dispatch, groupBuy, needCert)
+        values
 
         <foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
             (#{item.id},
-             #{item.uuid},
-             #{item.mainId},
-             #{item.thirdId},
-             #{item.thirdId1},
-             #{item.thirdId2},
-             #{item.thirdId3},
-             #{item.thirdId4},
-             #{item.udplatCode},
-             #{item.isUseDy},
-             #{item.isDisable},
-             #{item.isLock},
-             #{item.lockStatus},
-             #{item.isAdavence},
-             #{item.useMuti},
-             #{item.useNum},
-             #{item.supName},
-             #{item.createTime},
-             #{item.updateTime},
-             #{item.modifyTime},
-             #{item.createUser},
-             #{item.updateUser},
-             #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}, #{item.needCert})
+            #{item.uuid},
+            #{item.mainId},
+            #{item.thirdId},
+            #{item.thirdId1},
+            #{item.thirdId2},
+            #{item.thirdId3},
+            #{item.thirdId4},
+            #{item.udplatCode},
+            #{item.isUseDy},
+            #{item.isDisable},
+            #{item.isLock},
+            #{item.lockStatus},
+            #{item.isAdavence},
+            #{item.useMuti},
+            #{item.useNum},
+            #{item.supName},
+            #{item.createTime},
+            #{item.updateTime},
+            #{item.modifyTime},
+            #{item.createUser},
+            #{item.updateUser},
+            #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}, #{item.needCert})
         </foreach>
     </insert>
 
     <select id="selectGroupByNameCode" parameterType="java.lang.String"
             resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
         select basic_udirel.*,
-               basic_products.originUuid,
-               basic_products.nameCode,
-               basic_products.deviceRecordKey,
-               basic_products.packRatio,
-               basic_products.packUnit,
-               basic_products.packLevel,
-               basic_products.bhxjsl,
-               basic_products.bhzxxsbzsl,
-               basic_products.zxxsbzbhsydysl,
-               basic_products.bhxjcpbm,
-               basic_products.bzcj,
-               basic_products.cpmctymc,
-               basic_products.cplb,
-               basic_products.flbm,
-               basic_products.ggxh,
-               basic_products.qxlb,
-               basic_products.tyshxydm,
-               basic_products.ylqxzcrbarmc,
-               basic_products.zczbhhzbapzbh,
-               basic_products.ylqxzcrbarywmc,
-               basic_products.sydycpbs,
-               basic_products.sjcpbm,
-               basic_products.versionNumber,
-               basic_products.diType,
-               basic_products.ybbm,
-               basic_products.sptm,
-               basic_products.manufactory,
-               basic_products.measname,
-               basic_products.productType,
-               basic_products.scbssfbhph,
-               basic_products.scbssfbhxlh,
-               basic_products.scbssfbhscrq,
-               basic_products.scbssfbhsxrq,
-               basic_products.cpms,
-               basic_products.allowNoBatch,
-               basic_products.allowNoExpire,
-               basic_products.allowNoProduct,
-               basic_products.allowNoSerial,
-               basic_products.spmc,
-               basic_products.cplx,
-               basic_products.hchzsb,
-               basic_products.cpdls,
-               basic_products.price,
-               basic_products.basicPrductRemak1,
-               basic_products.basicPrductRemak2,
-               basic_products.basicPrductRemak3,
-               basic_products.basicPrductRemak4,
-               basic_products.basicPrductRemak5,
-               basic_products.basicPrductRemak6,
-               basic_products.basicPrductRemak7,
-               basic_products.basicPrductRemak8,
-               basic_products.sfwblztlcp,
-               basic_products.cgzmraqxgxx,
-               basic_products.sfbjwycxsy,
-               basic_products.zdcfsycs,
-               basic_products.sfwwjbz,
-               basic_products.syqsfxyjxmj,
-               basic_products.mjfs,
-               basic_products.categoryName
+        basic_products.originUuid,
+        basic_products.nameCode,
+        basic_products.deviceRecordKey,
+        basic_products.packRatio,
+        basic_products.packUnit,
+        basic_products.packLevel,
+        basic_products.bhxjsl,
+        basic_products.bhzxxsbzsl,
+        basic_products.zxxsbzbhsydysl,
+        basic_products.bhxjcpbm,
+        basic_products.bzcj,
+        basic_products.cpmctymc,
+        basic_products.cplb,
+        basic_products.flbm,
+        basic_products.ggxh,
+        basic_products.qxlb,
+        basic_products.tyshxydm,
+        basic_products.ylqxzcrbarmc,
+        basic_products.zczbhhzbapzbh,
+        basic_products.ylqxzcrbarywmc,
+        basic_products.sydycpbs,
+        basic_products.sjcpbm,
+        basic_products.versionNumber,
+        basic_products.diType,
+        basic_products.ybbm,
+        basic_products.sptm,
+        basic_products.manufactory,
+        basic_products.measname,
+        basic_products.productType,
+        basic_products.scbssfbhph,
+        basic_products.scbssfbhxlh,
+        basic_products.scbssfbhscrq,
+        basic_products.scbssfbhsxrq,
+        basic_products.cpms,
+        basic_products.allowNoBatch,
+        basic_products.allowNoExpire,
+        basic_products.allowNoProduct,
+        basic_products.allowNoSerial,
+        basic_products.spmc,
+        basic_products.cplx,
+        basic_products.hchzsb,
+        basic_products.cpdls,
+        basic_products.price,
+        basic_products.basicPrductRemak1,
+        basic_products.basicPrductRemak2,
+        basic_products.basicPrductRemak3,
+        basic_products.basicPrductRemak4,
+        basic_products.basicPrductRemak5,
+        basic_products.basicPrductRemak6,
+        basic_products.basicPrductRemak7,
+        basic_products.basicPrductRemak8,
+        basic_products.sfwblztlcp,
+        basic_products.cgzmraqxgxx,
+        basic_products.sfbjwycxsy,
+        basic_products.zdcfsycs,
+        basic_products.sfwwjbz,
+        basic_products.syqsfxyjxmj,
+        basic_products.mjfs,
+        basic_products.categoryName
         FROM basic_udirel
-                     INNER JOIN basic_products
-                on basic_udirel.uuid = basic_products.uuid
+        INNER JOIN basic_products
+        on basic_udirel.uuid = basic_products.uuid
         <where>
             <if test="nameCode != null">
                 AND nameCode = #{nameCode}
@@ -1412,14 +1536,14 @@
     <select id="selectProductNameByRelId" resultType="java.lang.String">
         select basic_products.cpmctymc
         from basic_udirel
-                     left join basic_products on basic_udirel.uuid = basic_products.uuid
+        left join basic_products on basic_udirel.uuid = basic_products.uuid
         where basic_udirel.id = #{relId}
     </select>
 
     <update id="updateBatchById" parameterType="java.util.List">
         <foreach collection="list" item="item" separator=";">
             update
-                    basic_udirel
+            basic_udirel
             set `relCode` = #{item.relCode}
             where id = #{item.id}
         </foreach>
@@ -1441,79 +1565,79 @@
     <select id="selectRelIdByNameCode" resultType="java.lang.String">
         select basic_udirel.id
         from basic_udirel
-                     inner join basic_products on basic_udirel.uuid = basic_products.uuid
+        inner join basic_products on basic_udirel.uuid = basic_products.uuid
         where basic_products.nameCode = #{nameCode}
     </select>
 
     <select id="selectOneUdiJoinSup" resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
         select basic_udirel.*,
-               basic_products.originUuid,
-               basic_products.nameCode,
-               basic_products.deviceRecordKey,
-               basic_products.packRatio,
-               basic_products.packUnit,
-               basic_products.packLevel,
-               basic_products.bhxjsl,
-               basic_products.bhzxxsbzsl,
-               basic_products.zxxsbzbhsydysl,
-               basic_products.bhxjcpbm,
-               basic_products.bzcj,
-               basic_products.cpmctymc,
-               basic_products.cplb,
-               basic_products.flbm,
-               basic_products.ggxh,
-               basic_products.qxlb,
-               basic_products.tyshxydm,
-               basic_products.ylqxzcrbarmc,
-               basic_products.zczbhhzbapzbh,
-               basic_products.ylqxzcrbarywmc,
-               basic_products.sydycpbs,
-               basic_products.sjcpbm,
-               basic_products.versionNumber,
-               basic_products.diType,
-               basic_products.ybbm,
-               basic_products.sptm,
-               basic_products.manufactory,
-               basic_products.measname,
-               basic_products.productType,
-               basic_products.scbssfbhph,
-               basic_products.scbssfbhxlh,
-               basic_products.scbssfbhscrq,
-               basic_products.scbssfbhsxrq,
-               basic_products.cpms,
-               basic_products.allowNoBatch,
-               basic_products.allowNoExpire,
-               basic_products.allowNoProduct,
-               basic_products.allowNoSerial,
-               basic_products.spmc,
-               basic_products.cplx,
-               basic_products.hchzsb,
-               basic_products.cpdls,
-               company_product_relevance.price,
-               basic_products.basicPrductRemak1,
-               basic_products.basicPrductRemak2,
-               basic_products.basicPrductRemak3,
-               basic_products.basicPrductRemak4,
-               basic_products.basicPrductRemak5,
-               basic_products.basicPrductRemak6,
-               basic_products.basicPrductRemak7,
-               basic_products.basicPrductRemak8,
-               basic_products.sfwblztlcp,
-               basic_products.cgzmraqxgxx,
-               basic_products.sfbjwycxsy,
-               basic_products.zdcfsycs,
-               basic_products.sfwwjbz,
-               basic_products.syqsfxyjxmj,
-               basic_products.mjfs,
-               basic_products.categoryName,
-               company_product_relevance.unitFk,
-               basic_corp.name companyName
+        basic_products.originUuid,
+        basic_products.nameCode,
+        basic_products.deviceRecordKey,
+        basic_products.packRatio,
+        basic_products.packUnit,
+        basic_products.packLevel,
+        basic_products.bhxjsl,
+        basic_products.bhzxxsbzsl,
+        basic_products.zxxsbzbhsydysl,
+        basic_products.bhxjcpbm,
+        basic_products.bzcj,
+        basic_products.cpmctymc,
+        basic_products.cplb,
+        basic_products.flbm,
+        basic_products.ggxh,
+        basic_products.qxlb,
+        basic_products.tyshxydm,
+        basic_products.ylqxzcrbarmc,
+        basic_products.zczbhhzbapzbh,
+        basic_products.ylqxzcrbarywmc,
+        basic_products.sydycpbs,
+        basic_products.sjcpbm,
+        basic_products.versionNumber,
+        basic_products.diType,
+        basic_products.ybbm,
+        basic_products.sptm,
+        basic_products.manufactory,
+        basic_products.measname,
+        basic_products.productType,
+        basic_products.scbssfbhph,
+        basic_products.scbssfbhxlh,
+        basic_products.scbssfbhscrq,
+        basic_products.scbssfbhsxrq,
+        basic_products.cpms,
+        basic_products.allowNoBatch,
+        basic_products.allowNoExpire,
+        basic_products.allowNoProduct,
+        basic_products.allowNoSerial,
+        basic_products.spmc,
+        basic_products.cplx,
+        basic_products.hchzsb,
+        basic_products.cpdls,
+        company_product_relevance.price,
+        basic_products.basicPrductRemak1,
+        basic_products.basicPrductRemak2,
+        basic_products.basicPrductRemak3,
+        basic_products.basicPrductRemak4,
+        basic_products.basicPrductRemak5,
+        basic_products.basicPrductRemak6,
+        basic_products.basicPrductRemak7,
+        basic_products.basicPrductRemak8,
+        basic_products.sfwblztlcp,
+        basic_products.cgzmraqxgxx,
+        basic_products.sfbjwycxsy,
+        basic_products.zdcfsycs,
+        basic_products.sfwwjbz,
+        basic_products.syqsfxyjxmj,
+        basic_products.mjfs,
+        basic_products.categoryName,
+        company_product_relevance.unitFk,
+        basic_corp.name companyName
         FROM basic_udirel
-                     inner JOIN basic_products
-                ON basic_products.uuid = basic_udirel.uuid
-                     left join company_product_relevance
-                on basic_udirel.id = company_product_relevance.udiRlIdFk
-                     left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId
+        inner JOIN basic_products
+        ON basic_products.uuid = basic_udirel.uuid
+        left join company_product_relevance
+        on basic_udirel.id = company_product_relevance.udiRlIdFk
+        left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId
         <where>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
                 AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
@@ -1572,7 +1696,7 @@
                 AND nameCode = #{uniqueNameCode}
             </if>
             <if test="relIds != null and relIds.size() > 0">
-                and   basic_udirel.id in
+                and basic_udirel.id in
                 <foreach collection="relIds" item="item" index="index" separator="," open="(" close=")">
                     #{item}
                 </foreach>
@@ -1584,7 +1708,7 @@
     <select id="selectRelIdByName" resultType="java.lang.String">
         SELECT b2.id
         FROM basic_products b1
-                     LEFT JOIN basic_udirel b2 ON b1.uuid = b2.uuid
+        LEFT JOIN basic_udirel b2 ON b1.uuid = b2.uuid
         <where>
             <if test="productName != '' and productName != null">
                 AND b1.cpmctymc like concat('%', #{productName}, '%')
@@ -1596,67 +1720,67 @@
 
     <select id="selectOneUdi" resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
         select basic_udirel.*,
-               basic_products.originUuid,
-               basic_products.nameCode,
-               basic_products.deviceRecordKey,
-               basic_products.packRatio,
-               basic_products.packUnit,
-               basic_products.packLevel,
-               basic_products.bhxjsl,
-               basic_products.bhzxxsbzsl,
-               basic_products.zxxsbzbhsydysl,
-               basic_products.bhxjcpbm,
-               basic_products.bzcj,
-               basic_products.cpmctymc,
-               basic_products.cplb,
-               basic_products.flbm,
-               basic_products.ggxh,
-               basic_products.qxlb,
-               basic_products.tyshxydm,
-               basic_products.ylqxzcrbarmc,
-               basic_products.zczbhhzbapzbh,
-               basic_products.ylqxzcrbarywmc,
-               basic_products.sydycpbs,
-               basic_products.sjcpbm,
-               basic_products.versionNumber,
-               basic_products.diType,
-               basic_products.ybbm,
-               basic_products.sptm,
-               basic_products.manufactory,
-               basic_products.measname,
-               basic_products.productType,
-               basic_products.scbssfbhph,
-               basic_products.scbssfbhxlh,
-               basic_products.scbssfbhscrq,
-               basic_products.scbssfbhsxrq,
-               basic_products.cpms,
-               basic_products.allowNoBatch,
-               basic_products.allowNoExpire,
-               basic_products.allowNoProduct,
-               basic_products.allowNoSerial,
-               basic_products.spmc,
-               basic_products.cplx,
-               basic_products.hchzsb,
-               basic_products.cpdls,
-               basic_products.basicPrductRemak1,
-               basic_products.basicPrductRemak2,
-               basic_products.basicPrductRemak3,
-               basic_products.basicPrductRemak4,
-               basic_products.basicPrductRemak5,
-               basic_products.basicPrductRemak6,
-               basic_products.basicPrductRemak7,
-               basic_products.basicPrductRemak8,
-               basic_products.sfwblztlcp,
-               basic_products.cgzmraqxgxx,
-               basic_products.sfbjwycxsy,
-               basic_products.zdcfsycs,
-               basic_products.sfwwjbz,
-               basic_products.syqsfxyjxmj,
-               basic_products.mjfs,
-               basic_products.categoryName
+        basic_products.originUuid,
+        basic_products.nameCode,
+        basic_products.deviceRecordKey,
+        basic_products.packRatio,
+        basic_products.packUnit,
+        basic_products.packLevel,
+        basic_products.bhxjsl,
+        basic_products.bhzxxsbzsl,
+        basic_products.zxxsbzbhsydysl,
+        basic_products.bhxjcpbm,
+        basic_products.bzcj,
+        basic_products.cpmctymc,
+        basic_products.cplb,
+        basic_products.flbm,
+        basic_products.ggxh,
+        basic_products.qxlb,
+        basic_products.tyshxydm,
+        basic_products.ylqxzcrbarmc,
+        basic_products.zczbhhzbapzbh,
+        basic_products.ylqxzcrbarywmc,
+        basic_products.sydycpbs,
+        basic_products.sjcpbm,
+        basic_products.versionNumber,
+        basic_products.diType,
+        basic_products.ybbm,
+        basic_products.sptm,
+        basic_products.manufactory,
+        basic_products.measname,
+        basic_products.productType,
+        basic_products.scbssfbhph,
+        basic_products.scbssfbhxlh,
+        basic_products.scbssfbhscrq,
+        basic_products.scbssfbhsxrq,
+        basic_products.cpms,
+        basic_products.allowNoBatch,
+        basic_products.allowNoExpire,
+        basic_products.allowNoProduct,
+        basic_products.allowNoSerial,
+        basic_products.spmc,
+        basic_products.cplx,
+        basic_products.hchzsb,
+        basic_products.cpdls,
+        basic_products.basicPrductRemak1,
+        basic_products.basicPrductRemak2,
+        basic_products.basicPrductRemak3,
+        basic_products.basicPrductRemak4,
+        basic_products.basicPrductRemak5,
+        basic_products.basicPrductRemak6,
+        basic_products.basicPrductRemak7,
+        basic_products.basicPrductRemak8,
+        basic_products.sfwblztlcp,
+        basic_products.cgzmraqxgxx,
+        basic_products.sfbjwycxsy,
+        basic_products.zdcfsycs,
+        basic_products.sfwwjbz,
+        basic_products.syqsfxyjxmj,
+        basic_products.mjfs,
+        basic_products.categoryName
         FROM basic_udirel
-                     inner JOIN basic_products
-                ON basic_products.uuid = basic_udirel.uuid
+        inner JOIN basic_products
+        ON basic_products.uuid = basic_udirel.uuid
         <where>
             <if test="id != '' and id != null">
                 AND basic_udirel.id = #{id}