新增条码完整性校验缓存表，关联关系等

src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java

@@ -66,6 +66,7 @@ public class UdiRlSupController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
 
+        companyProductRelevanceRequest.setIsDisable(false);
         if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getUdiCode())) {
             UdiEntity udiEntity = FilterUdiUtils.getUdi(companyProductRelevanceRequest.getUdiCode());
             if (udiEntity != null) {

src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java

@@ -0,0 +1,90 @@
+package com.glxp.api.controller.inout;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.ConstantStatus;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.inout.IoCodeLostEntity;
+import com.glxp.api.entity.inout.IoCodeTempEntity;
+import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
+import com.glxp.api.res.inout.AcceptOrderResponse;
+import com.glxp.api.res.inout.IoOrderDetailResultResponse;
+import com.glxp.api.service.inout.IoCodeLostService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@RestController
+public class IoCodeLostController extends BaseController {
+
+
+    @Resource
+    IoCodeLostService codeLostService;
+
+    @AuthRuleAnnotation("")
+    @PostMapping("warehouse/inout/saveTabCode")
+    public BaseResponse saveCode(@RequestBody IoCodeTempEntity codeTempEntity) {
+
+        if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo()) && codeTempEntity.getSerialNo().length() > 20) {
+            return ResultVOUtils.error(500, "无效条码！序列号超出最大范围，不予缓存");
+        }
+
+        if (StrUtil.isNotEmpty(codeTempEntity.getBatchNo()) && codeTempEntity.getBatchNo().length() > 20) {
+            return ResultVOUtils.error(500, "无效条码！批次号超出最大范围，不予缓存");
+        }
+
+        if (StrUtil.isBlank(codeTempEntity.getSerialNo()) && StrUtil.isBlank(codeTempEntity.getBatchNo())) {
+            return ResultVOUtils.error(500, "批次号不能为空！，不予缓存");
+        }
+        if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
+            return ResultVOUtils.error(500, "有序列号不予缓存");
+        }
+
+        IoCodeLostEntity codeLostEntity = codeLostService.findByCode(codeTempEntity.getCode());
+        IoCodeLostEntity insertEntity = null;
+        if (codeLostEntity == null) {
+            insertEntity = new IoCodeLostEntity();
+            insertEntity.setCreateTime(new Date());
+        } else {
+            insertEntity = codeLostEntity;
+        }
+        insertEntity.setCode(codeTempEntity.getCode());
+        insertEntity.setBatchNo(codeTempEntity.getBatchNo());
+        insertEntity.setProduceDate(codeTempEntity.getProduceDate());
+        insertEntity.setExpireDate(codeTempEntity.getExpireDate());
+        insertEntity.setSerialNo(codeTempEntity.getSerialNo());
+        insertEntity.setSupId(codeTempEntity.getSupId());
+        insertEntity.setUpdateTime(new Date());
+
+        if (codeLostEntity != null) {
+            codeLostService.update(insertEntity);
+        } else {
+            codeLostService.insert(insertEntity);
+        }
+        return ResultVOUtils.success("修改成功！");
+    }
+
+
+    //获取验收单据业务详情
+    @AuthRuleAnnotation("")
+    @GetMapping("/warehouse/inout/getTabCode")
+    public BaseResponse getTabCode(String code) {
+        if (StrUtil.isBlank(code)) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code);
+        if (codeLostEntity == null)
+            return ResultVOUtils.error(500, "未缓存！");
+        return ResultVOUtils.success(codeLostEntity);
+
+    }
+}

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -16,10 +16,7 @@ import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.basic.BasicCorpEntity;
 import com.glxp.api.entity.basic.UdiEntity;
 import com.glxp.api.entity.basic.UdiProductEntity;
-import com.glxp.api.entity.inout.IoCodeEntity;
-import com.glxp.api.entity.inout.IoCodeTempEntity;
-import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
-import com.glxp.api.entity.inout.IoOrderEntity;
+import com.glxp.api.entity.inout.*;
 import com.glxp.api.entity.inv.InvPreinDetailEntity;
 import com.glxp.api.entity.system.SystemParamConfigEntity;
 import com.glxp.api.http.SpsDirectClient;
@@ -93,7 +90,7 @@ public class IoCodeTempController extends BaseController {
     @Resource
     InvProductDetailService invProductDetailService;
     @Resource
-    DeptService deptService;
+    IoCodeLostService codeLostService;
 
     //手持端扫码单据上传调用接口
     @AuthRuleAnnotation("")
@@ -388,14 +385,21 @@ public class IoCodeTempController extends BaseController {
 
             BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity);
             if (checkOriginCodeRes != null) {
-                if (StrUtil.isNotEmpty(orderId)) {
-                    List<IoCodeTempEntity> ioCodeEnttities = codeTempService.findByOrderId(orderId);
-                    IoCodeTempEntity ioCodeEnttity = isExitLocal(code, ioCodeEnttities);
-                    if (ioCodeEnttity == null) {
+                IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code);
+                if (codeLostEntity == null) {
+                    if (StrUtil.isNotEmpty(orderId)) {
+                        List<IoCodeTempEntity> ioCodeEnttities = codeTempService.findByOrderId(orderId);
+                        IoCodeTempEntity ioCodeEnttity = isExitLocal(code, ioCodeEnttities);
+                        if (ioCodeEnttity == null) {
+                            return checkOriginCodeRes;
+                        }
+                    } else
                         return checkOriginCodeRes;
-                    }
-                } else
-                    return checkOriginCodeRes;
+                } else {
+                    udiEntity.setBatchNo(codeLostEntity.getBatchNo());
+                    udiEntity.setExpireDate(codeLostEntity.getExpireDate());
+                    udiEntity.setProduceDate(codeLostEntity.getProduceDate());
+                }
             }
         }
 
@@ -506,7 +510,7 @@ public class IoCodeTempController extends BaseController {
                 if (StrUtil.isEmpty(exitLocalEntity.getSupId()) || exitLocalEntity.getRelId() == null) {
                     return ResultVOUtils.error(500, "当前UDI码已存在，且存在异常未处理！");
                 }
-                udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(exitLocalEntity.getNameCode());
+                udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(exitLocalEntity.getNameCode(), null);
                 BeanUtils.copyProperties(exitLocalEntity, genDetaiEntity);
                 genDetaiEntity.setCount(1);
                 genDetaiEntity.setReCount(udiCalCountUtil.getActCount(udiRelevanceResponses.get(0)));
@@ -558,7 +562,7 @@ public class IoCodeTempController extends BaseController {
                 unitFk = addOrderRequest.getFromCorp();
             }
             //产品是否可以以使用单元入库
-            udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(codeEnttity.getNameCode());
+            udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(codeEnttity.getNameCode(), false);
             if (udiRelevanceResponses.size() == 1) {
                 UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0);
                 if (udiRelevanceResponse == null) {

src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java

@@ -76,7 +76,7 @@ public interface UdiRelevanceDao extends BaseMapperPlus<UdiRelevanceDao, UdiRele
     String selectUuidById(@Param("relId") String relId);
 
 
-    List<UdiRelevanceResponse> selectGroupByNameCode(@Param("nameCode") String nameCode);
+    List<UdiRelevanceResponse> selectGroupByNameCode(@Param("nameCode") String nameCode, @Param("isDisable") Boolean isDisable);
 
     /**
      * 根据耗材字典ID查询产品名称

src/main/java/com/glxp/api/dao/inout/IoCodeLostMapper.java

@@ -0,0 +1,9 @@
+package com.glxp.api.dao.inout;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.inout.IoCodeLostEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface IoCodeLostMapper extends BaseMapper<IoCodeLostEntity> {
+}

src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java

@@ -0,0 +1,9 @@
+package com.glxp.api.dao.inout;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.inout.IoCodeRelEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface IoCodeRelMapper extends BaseMapper<IoCodeRelEntity> {
+}

src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java

@@ -0,0 +1,94 @@
+package com.glxp.api.entity.inout;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+import lombok.Data;
+
+/**
+ * 扫码缺失字段信息补齐表
+ */
+@Data
+@TableName(value = "io_code_lost")
+public class IoCodeLostEntity {
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * UDI码
+     */
+    @TableField(value = "code")
+    private String code;
+
+    /**
+     * 批次号
+     */
+    @TableField(value = "batchNo")
+    private String batchNo;
+
+    /**
+     * 生产日期
+     */
+    @TableField(value = "produceDate")
+    private String produceDate;
+
+    /**
+     * 失效日期
+     */
+    @TableField(value = "expireDate")
+    private String expireDate;
+
+    /**
+     * 序列号
+     */
+    @TableField(value = "serialNo")
+    private String serialNo;
+
+    /**
+     * 供应商
+     */
+    @TableField(value = "supId")
+    private String supId;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+    public static final String COL_ID = "id";
+
+    public static final String COL_CODE = "code";
+
+    public static final String COL_BATCHNO = "batchNo";
+
+    public static final String COL_PRODUCEDATE = "produceDate";
+
+    public static final String COL_EXPIREDATE = "expireDate";
+
+    public static final String COL_SERIALNO = "serialNo";
+
+    public static final String COL_SUPID = "supId";
+
+    public static final String COL_CREATETIME = "createTime";
+
+    public static final String COL_UPDATETIME = "updateTime";
+
+    public static final String COL_REMARK = "remark";
+}

src/main/java/com/glxp/api/entity/inout/IoCodeRelEntity.java

@@ -0,0 +1,108 @@
+package com.glxp.api.entity.inout;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.Data;
+
+/**
+    * 多级包装关联关系表
+    */
+@Data
+@TableName(value = "io_code_rel")
+public class IoCodeRelEntity {
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * UDI码
+     */
+    @TableField(value = "code")
+    private String code;
+
+    /**
+     * 父码
+     */
+    @TableField(value = "parentCode")
+    private String parentCode;
+
+    /**
+     * DI产品标识
+     */
+    @TableField(value = "nameCode")
+    private String nameCode;
+
+    /**
+     * DI类型
+     */
+    @TableField(value = "diType")
+    private Byte diType;
+
+    /**
+     * 主产品DI标识
+     */
+    @TableField(value = "mainNameCode")
+    private String mainNameCode;
+
+    /**
+     * 级别
+     */
+    @TableField(value = "`level`")
+    private String level;
+
+    /**
+     * 生产日期
+     */
+    @TableField(value = "produceDate")
+    private String produceDate;
+
+    /**
+     * 失效日期
+     */
+    @TableField(value = "expireDate")
+    private String expireDate;
+
+    /**
+     * 序列号
+     */
+    @TableField(value = "serialNo")
+    private String serialNo;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    private Date updateTime;
+
+    public static final String COL_ID = "id";
+
+    public static final String COL_CODE = "code";
+
+    public static final String COL_PARENTCODE = "parentCode";
+
+    public static final String COL_NAMECODE = "nameCode";
+
+    public static final String COL_DITYPE = "diType";
+
+    public static final String COL_MAINNAMECODE = "mainNameCode";
+
+    public static final String COL_LEVEL = "level";
+
+    public static final String COL_PRODUCEDATE = "produceDate";
+
+    public static final String COL_EXPIREDATE = "expireDate";
+
+    public static final String COL_SERIALNO = "serialNo";
+
+    public static final String COL_CREATETIME = "createTime";
+
+    public static final String COL_UPDATETIME = "updateTime";
+}

src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java

@@ -122,6 +122,7 @@ public class BasicBackUpdateProductService {
                         String time = DateUtil.getDateTime();
                         udiRelevanceEntity1.setUpdateTime(new Date());
                         udiRelevanceEntity.setModifyTime(new Date());
+                        udiRelevanceEntity.setIsDisable(false);
                         udiRelevanceEntity1.setId(gennerOrderUtils.getRelId());
                         udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1);
                     }
@@ -208,6 +209,7 @@ public class BasicBackUpdateProductService {
                         udiProductService.insertUdiInfo(udiProductEntity);
                         UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity();
                         udiRelevanceEntity1.setUuid(udiProductEntity.getUuid());
+                        udiRelevanceEntity1.setIsDisable(false);
                         udiRelevanceEntity1.setSupName(thrProductsEntity.getSupName());
 
                         if ("thirdId".equals(thirdSysId)) {

src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java

@@ -93,6 +93,7 @@ public class BasicUpdateProductService {
                         udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId4());
                     }
                     udiRelevanceEntity1.setId(gennerOrderUtils.getRelId());
+                    udiRelevanceEntity1.setIsDisable(false);
                     udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1);
                 }
             }
@@ -117,6 +118,7 @@ public class BasicUpdateProductService {
                     udiRelevanceEntity.setUpdateTime(new Date());
                     udiRelevanceEntity.setModifyTime(new Date());
                     udiRelevanceEntity.setUuid(udiProductEntity.getUuid());
+                    udiRelevanceEntity.setIsDisable(false);
                     List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceService.selectByUuid(udiProductEntity.getUuid());
                     if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 0) {
                         boolean isAdd = false;

src/main/java/com/glxp/api/service/basic/UdiContrastService.java

@@ -145,6 +145,7 @@ public class UdiContrastService {
         udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid());
         udiRelevanceEntity.setSupName(udiCombineRequest.getSupName());
         udiRelevanceEntity.setId(gennerOrderUtils.getRelId());
+        udiRelevanceEntity.setIsDisable(false);
         udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
         insertUdiInfos(udiInfoEntities);
     }
@@ -157,12 +158,12 @@ public class UdiContrastService {
         UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
         udiRelevanceEntity.setThirdId(thrProductsEntity.getCode());
         udiRelevanceEntity.setMainId(thrProductsEntity.getCode());
-        String time = DateUtil.getDateTime();
         udiRelevanceEntity.setUpdateTime(new Date());
         udiRelevanceEntity.setModifyTime(new Date());
         udiRelevanceEntity.setUuid(CustomUtil.getUUId());
         udiRelevanceEntity.setSupName(thrProductsEntity.getSupName());
         udiRelevanceEntity.setId(gennerOrderUtils.getRelId());
+        udiRelevanceEntity.setIsDisable(false);
         udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
         UdiProductEntity udiProductEntity = new UdiProductEntity();
         BeanUtils.copyProperties(thrProductsEntity, udiProductEntity);
@@ -195,6 +196,7 @@ public class UdiContrastService {
         }
         Long relId = gennerOrderUtils.getRelId();
         udiRelevanceEntity.setId(relId);
+        udiRelevanceEntity.setIsDisable(false);
         udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
         insertUdiInfos(udiInfoEntities);
         return relId;

src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java

@@ -79,5 +79,5 @@ public interface UdiRelevanceService {
     String findUuidById(String relId);
 
 
-    List<UdiRelevanceResponse> selectGroupByNameCode(String nameCode);
+    List<UdiRelevanceResponse> selectGroupByNameCode(String nameCode, Boolean isDisable);
 }

src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java

@@ -86,9 +86,10 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
             FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
             filterUdiRelRequest.setUniqueNameCode(nameCode);
             filterUdiRelRequest.setUnitFk(unitFk);
+            filterUdiRelRequest.setIsDisable(false);
             udiRelevanceResponses = filterUdiJoinSup(filterUdiRelRequest);
         } else {
-            udiRelevanceResponses = selectGroupByNameCode(nameCode);
+            udiRelevanceResponses = selectGroupByNameCode(nameCode, false);
         }
         if (udiRelevanceResponses.size() == 1) {
             UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0);
@@ -339,7 +340,7 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
     }
 
     @Override
-    public List<UdiRelevanceResponse> selectGroupByNameCode(String nameCode) {
-        return udiRelevanceDao.selectGroupByNameCode(nameCode);
+    public List<UdiRelevanceResponse> selectGroupByNameCode(String nameCode, Boolean isDisable) {
+        return udiRelevanceDao.selectGroupByNameCode(nameCode, isDisable);
     }
 }

src/main/java/com/glxp/api/service/inout/IoAddInoutService.java

@@ -424,6 +424,9 @@ public class IoAddInoutService {
                         }
                         codeTempService.insertBatch(ioCodeEnttities);
                         dealProcess(orderEntity);
+                        if (!ioCheckInoutService.checkManual(orderEntity.getBillNo())) {
+                            ioCheckInoutService.check(orderEntity.getBillNo());
+                        }
                     }
                 } else {
                     //创建新单据
@@ -475,6 +478,9 @@ public class IoAddInoutService {
                     }
                     orderService.insertOrder(orderSaveRequest);
                     dealProcess(orderSaveRequest);
+                    if (!ioCheckInoutService.checkManual(orderEntity.getBillNo())) {
+                        ioCheckInoutService.check(orderEntity.getBillNo());
+                    }
                 }
 
 

src/main/java/com/glxp/api/service/inout/IoCodeLostService.java

@@ -0,0 +1,15 @@
+package com.glxp.api.service.inout;
+
+import com.glxp.api.entity.inout.IoCodeLostEntity;
+
+public interface IoCodeLostService {
+
+    IoCodeLostEntity findByCode(String code);
+
+    int insert(IoCodeLostEntity ioCodeLostEntity);
+
+
+    int deleteByCode(String code);
+
+    int update(IoCodeLostEntity ioCodeLostEntity);
+}

src/main/java/com/glxp/api/service/inout/IoCodeRelService.java

@@ -0,0 +1,9 @@
+package com.glxp.api.service.inout;
+
+import com.glxp.api.entity.inout.IoCodeRelEntity;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface IoCodeRelService {
+
+
+}

src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java

@@ -0,0 +1,39 @@
+package com.glxp.api.service.inout.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+import com.glxp.api.dao.inout.IoCodeLostMapper;
+import com.glxp.api.entity.inout.IoCodeLostEntity;
+import com.glxp.api.service.inout.IoCodeLostService;
+
+@Service
+public class IoCodeLostServiceImpl implements IoCodeLostService {
+
+    @Resource
+    IoCodeLostMapper codeLostEntityMapper;
+
+
+    @Override
+    public IoCodeLostEntity findByCode(String code) {
+
+        return codeLostEntityMapper.selectOne(new QueryWrapper<IoCodeLostEntity>().eq("code", code));
+    }
+
+    @Override
+    public int insert(IoCodeLostEntity ioCodeLostEntity) {
+        return codeLostEntityMapper.insert(ioCodeLostEntity);
+    }
+
+    @Override
+    public int deleteByCode(String code) {
+        return codeLostEntityMapper.delete(new QueryWrapper<IoCodeLostEntity>().eq("code", code));
+    }
+
+    @Override
+    public int update(IoCodeLostEntity ioCodeLostEntity) {
+        return codeLostEntityMapper.updateById(ioCodeLostEntity);
+    }
+}

src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java

@@ -0,0 +1,9 @@
+package com.glxp.api.service.inout.impl;
+
+import com.glxp.api.service.inout.IoCodeRelService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class IoCodeRelServiceImpl implements IoCodeRelService {
+
+}

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -5,60 +5,60 @@
     <select id="filterUdiRelevance" 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.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_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.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
+                     inner JOIN basic_products
+                ON basic_products.uuid = basic_udirel.uuid
         <where>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
                 AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
@@ -124,64 +124,64 @@
     <select id="filterUdiJoinSup" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
             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.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,
-        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.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,
+               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}, '%')
@@ -251,59 +251,59 @@
     <select id="filterUdiGp" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
             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.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_products
-        inner JOIN basic_udirel
-        ON basic_products.uuid = basic_udirel.uuid
+               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.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_products
+                inner JOIN basic_udirel
+                ON basic_products.uuid = basic_udirel.uuid
         <if test="bindCode != '' and bindCode != null">
             right JOIN basic_hosp_type_rel on basic_hosp_type_rel.relId = basic_udirel.id
         </if>
@@ -328,19 +328,19 @@
             </if>
             <if test="unionCode != '' and unionCode != null">
                 and (
-                nameCode LIKE concat('%', #{unionCode}, '%')
-                or ybbm LIKE concat('%', #{unionCode}, '%')
-                or sptm LIKE concat('%', #{unionCode}, '%'))
+                        nameCode LIKE concat('%', #{unionCode}, '%')
+                                or ybbm LIKE concat('%', #{unionCode}, '%')
+                                or sptm LIKE concat('%', #{unionCode}, '%'))
             </if>
             <if test="isDisable == false">
                 AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false)
             </if>
             <if test="thrPiId != '' and thrPiId != null">
                 and (thirdId LIKE concat('%', #{thrPiId}, '%')
-                or thirdId1 LIKE concat('%', #{thrPiId}, '%')
-                or thirdId2 LIKE concat('%', #{thrPiId}, '%')
-                or thirdId3 LIKE concat('%', #{thrPiId}, '%')
-                or thirdId4 LIKE concat('%', #{thrPiId}, '%'))
+                        or thirdId1 LIKE concat('%', #{thrPiId}, '%')
+                        or thirdId2 LIKE concat('%', #{thrPiId}, '%')
+                        or thirdId3 LIKE concat('%', #{thrPiId}, '%')
+                        or thirdId4 LIKE concat('%', #{thrPiId}, '%'))
             </if>
             <if test="uuid != '' and uuid != null">
                 AND basic_udirel.uuid = #{uuid}
@@ -359,7 +359,7 @@
             </if>
             <if test="filterType != null and filterType == 1">
                 AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
-                thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
+                     thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
                 and basic_products.originUuid <![CDATA[<>]]> ''
             </if>
             <if test="filterType != null and filterType == 2">
@@ -404,58 +404,58 @@
     <select id="contrastJoinSelect" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
             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.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.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.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_udirel.uuid = basic_products.uuid
+                     INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid
         <where>
             <if test="uuid != '' and uuid != null">
                 AND basic_udirel.uuid = #{uuid}
@@ -581,66 +581,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)
+                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)
         values (#{id},
-        #{uuid},
-        #{mainId},
-        #{thirdId},
-        #{thirdId1},
-        #{thirdId2},
-        #{thirdId3},
-        #{thirdId4},
-        #{udplatCode},
-        #{isUseDy},
-        #{isDisable},
-        #{isLock},
-        #{lockStatus},
-        #{isAdavence},
-        #{useMuti},
-        #{useNum},
-        #{supName},
-        #{createTime},
-        #{updateTime},
-        #{modifyTime},
-        #{createUser},
-        #{updateUser},
-        #{remark})
+                #{uuid},
+                #{mainId},
+                #{thirdId},
+                #{thirdId1},
+                #{thirdId2},
+                #{thirdId3},
+                #{thirdId4},
+                #{udplatCode},
+                #{isUseDy},
+                #{isDisable},
+                #{isLock},
+                #{lockStatus},
+                #{isAdavence},
+                #{useMuti},
+                #{useNum},
+                #{supName},
+                #{createTime},
+                #{updateTime},
+                #{modifyTime},
+                #{createUser},
+                #{updateUser},
+                #{remark})
     </insert>
 
     <insert id="insertUdiRelevanceignore" keyProperty="id"
             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)
+                (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
+                 isLock,
+                 lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
+                 updateUser,
+                 remark)
         values (#{id},
-        #{uuid},
-        #{mainId},
-        #{thirdId},
-        #{thirdId1},
-        #{thirdId2},
-        #{thirdId3},
-        #{thirdId4},
-        #{udplatCode},
-        #{isUseDy},
-        #{isDisable},
-        #{isLock},
-        #{lockStatus},
-        #{isAdavence},
-        #{useMuti},
-        #{useNum},
-        #{supName},
-        #{createTime},
-        #{updateTime},
-        #{modifyTime},
-        #{createUser},
-        #{updateUser},
-        #{remark})
+                #{uuid},
+                #{mainId},
+                #{thirdId},
+                #{thirdId1},
+                #{thirdId2},
+                #{thirdId3},
+                #{thirdId4},
+                #{udplatCode},
+                #{isUseDy},
+                #{isDisable},
+                #{isLock},
+                #{lockStatus},
+                #{isAdavence},
+                #{useMuti},
+                #{useNum},
+                #{supName},
+                #{createTime},
+                #{updateTime},
+                #{modifyTime},
+                #{createUser},
+                #{updateUser},
+                #{remark})
     </insert>
 
     <delete id="deleteById" parameterType="Map">
@@ -754,103 +758,113 @@
 
     <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)
-        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)
+                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.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})
         </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.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.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.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_udirel.uuid = basic_products.uuid
-        WHERE nameCode = #{nameCode}
+                     INNER JOIN basic_products
+                on basic_udirel.uuid = basic_products.uuid
+        <where>
+            <if test="nameCode != null">
+                AND nameCode = #{nameCode}
+            </if>
+            <if test="isDisable != null">
+                AND isDisable = #{isDisable}
+            </if>
+        </where>
+
         group by basic_udirel.id
     </select>
 
     <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>
 </mapper>

src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml

@@ -19,7 +19,7 @@
             </if>
             <if test="lastUpdateTime != null and lastUpdateTime != ''">
                 <![CDATA[
-                and DATE_FORMAT(update_time, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
+                and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
                 ]]>
             </if>
         </where>
@@ -340,4 +340,4 @@
     <select id="selectUnitFkByRelId" resultType="java.lang.String">
         select unitFk from company_product_relevance where udiRlIdFk = #{relId}
     </select>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/inout/IoCodeLostMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.dao.inout.IoCodeLostMapper">
+</mapper>

src/main/resources/mybatis/mapper/inout/IoCodeRelMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.dao.inout.IoCodeRelMapper">
+</mapper>

src/main/resources/mybatis/mapper/inv/invProductDao.xml

@@ -79,7 +79,6 @@
                 </foreach>
             </if>
         </where>
-        group by ip.relIdFk, ip.batchNo
         order by ip.updateTime desc
     </select>