Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z

src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java

@@ -1,5 +1,7 @@
 package com.glxp.api.controller.auth;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
@@ -11,10 +13,13 @@ import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.auth.SysWorkplace;
 import com.glxp.api.entity.basic.SysWorkplaceLayer;
 import com.glxp.api.entity.basic.SysWorkplaceQueue;
+import com.glxp.api.entity.basic.UdiEntity;
+import com.glxp.api.entity.basic.UdiProductEntity;
 import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
 import com.glxp.api.entity.system.SystemPDFTemplateEntity;
 import com.glxp.api.req.basic.SysWorkplaceFreightRequest;
 import com.glxp.api.req.basic.SysWorkplaceLayerRequest;
+import com.glxp.api.req.basic.SysWorkplaceQueueBindRequest;
 import com.glxp.api.req.basic.SysWorkplaceQueueRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.SysWorkplaceFreightResponse;
@@ -22,9 +27,11 @@ import com.glxp.api.res.basic.SysWorkplaceQueueResponse;
 import com.glxp.api.res.basic.SysWorkplaceResponse;
 import com.glxp.api.service.auth.SysWorkplaceService;
 import com.glxp.api.service.basic.SysWorkplaceQueueService;
+import com.glxp.api.service.basic.UdiProductService;
 import com.glxp.api.service.system.SystemPDFModuleService;
 import com.glxp.api.service.system.SystemPDFTemplateService;
 import com.glxp.api.util.JasperUtils;
+import com.glxp.api.util.udi.FilterUdiUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -67,6 +74,15 @@ public class SysWorkplaceQueueController extends BaseController {
 
     @GetMapping("/udiwms/sysWorkplaceQueue/getQueueList")
     public BaseResponse getQueueList(SysWorkplaceQueueRequest request) {
+
+
+        String scanCode = request.getScanCode();
+        if (StrUtil.isNotEmpty(scanCode)){
+            UdiEntity udi = FilterUdiUtils.getUdi(scanCode);
+            if (udi != null ) request.setNameCode(udi.getUdi());
+        }
+        request.setScanCode(null);
+
         List<SysWorkplaceQueueResponse> page = sysWorkplaceQueueService.filterList(request);
         PageInfo<SysWorkplaceQueueResponse> pageInfo = new PageInfo<>(page);
         PageSimpleResponse<SysWorkplaceQueueResponse> pageSimpleResponse = new PageSimpleResponse<>();
@@ -75,6 +91,25 @@ public class SysWorkplaceQueueController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @GetMapping("/udiwms/sysWorkplaceQueue/getQueueBindList")
+    public BaseResponse getQueueBindList(SysWorkplaceQueueRequest request) {
+
+
+        String scanCode = request.getScanCode();
+        if (StrUtil.isNotEmpty(scanCode)){
+            UdiEntity udi = FilterUdiUtils.getUdi(scanCode);
+            if (udi != null ) request.setNameCode(udi.getUdi());
+        }
+        request.setScanCode(null);
+
+        List<SysWorkplaceQueueResponse> page = sysWorkplaceQueueService.filterBindList(request);
+        PageInfo<SysWorkplaceQueueResponse> pageInfo = new PageInfo<>(page);
+        PageSimpleResponse<SysWorkplaceQueueResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(page);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
 
     @GetMapping("/udiwms/sysWorkplaceQueue/getByCode")
     public BaseResponse getByCode(SysWorkplaceQueueRequest request) {
@@ -170,19 +205,73 @@ public class SysWorkplaceQueueController extends BaseController {
     }
 
 
-    @PostMapping("/udiwms/WorkplaceQueue/update")
-    public BaseResponse update(@RequestBody SysWorkplaceQueue sysWorkplaceQueue){
+    @PostMapping("/udiwms/WorkplaceQueue/bind")
+    public BaseResponse bind(@RequestBody SysWorkplaceQueueBindRequest sysWorkplaceQueueBindRequest){
 
-        // TODO: 2024/11/9 做一个relId重复的判断
+        String relId = sysWorkplaceQueueBindRequest.getRelId();
+        List<SysWorkplaceQueue> list = sysWorkplaceQueueService.list(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getRelId, relId));
+        if (CollUtil.isNotEmpty(list)){
+            return ResultVOUtils.error("产品已绑定到货位槽码的信息,请先解绑");
+        }
+
+        Long id = sysWorkplaceQueueBindRequest.getId();
+        SysWorkplaceQueue sysWorkplaceQueue = sysWorkplaceQueueService.getById(id);
+        sysWorkplaceQueue.setRelId(relId);
         sysWorkplaceQueue.setUpdateTime(new Date());
         sysWorkplaceQueue.setUpdateUser(getUserId() + "");
         boolean falg = sysWorkplaceQueueService.updateById(sysWorkplaceQueue);
         if (!falg) {
-            return ResultVOUtils.error(999, "更新失败");
+            return ResultVOUtils.error(999, "绑定失败");
         }
         return ResultVOUtils.success();
     }
 
 
+    /**
+     * 根据货位槽号 获取 货位槽信息
+     */
+    @PostMapping("/udiwms/sysWorkplaceQueue/getInfoByCode")
+    public BaseResponse getInfoByCode(@RequestBody SysWorkplaceQueueRequest request){
+        String code = request.getCode();
+        if (StrUtil.isEmpty(code)){
+            return ResultVOUtils.error("货位槽码不能为空");
+        }
+
+        List<SysWorkplaceQueueResponse> list = sysWorkplaceQueueService.filterBindList(request);
+        if (CollUtil.isEmpty(list)){
+            return ResultVOUtils.error("未找到该货位槽码的信息");
+        }
+        SysWorkplaceQueueResponse sysWorkplaceQueue = list.get(0);
+        return ResultVOUtils.success(sysWorkplaceQueue);
+    }
+
+
+    @Resource
+    UdiProductService udiProductService;
+
+    /**
+     * 根据货位槽号 获取 货位槽信息
+     */
+    @PostMapping("/udiwms/sysWorkplaceQueue/getProductByCode")
+    public BaseResponse getProductByCode(@RequestBody SysWorkplaceQueueRequest request){
+        String udiCode = request.getUdiCode();
+        if (StrUtil.isEmpty(udiCode)){
+            return ResultVOUtils.error("UDI码不能为空");
+        }
+
+        UdiProductEntity byNameCode = udiProductService.findByNameCode(udiCode);
+        if (byNameCode == null){
+            return ResultVOUtils.error("UDI码未能识别出对应产品");
+        }
+
+        String relId = byNameCode.getRelId();
+        List<SysWorkplaceQueue> list = sysWorkplaceQueueService.list(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getRelId, relId));
+        if (CollUtil.isNotEmpty(list)){
+            return ResultVOUtils.error("产品已绑定到货位槽码的信息,请先解绑");
+        }
+
+        return ResultVOUtils.success(byNameCode);
+    }
+
 }
 

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

@@ -12,6 +12,7 @@ import com.glxp.api.entity.basic.*;
 import com.glxp.api.entity.collect.IoCollectCode;
 import com.glxp.api.entity.collect.IoCollectOrder;
 import com.glxp.api.entity.collect.IoCollectOrderOrigin;
+import com.glxp.api.entity.collect.RelCodeDetail;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.collect.CollectOrderBizRequest;
 import com.glxp.api.req.collect.CollectOrderRequest;
@@ -1565,6 +1566,15 @@ public class IoCodeTempController extends BaseController {
             codeEnttity.setFifoSplit(addOrderRequest.getFifoSplit());
             codeEnttity.setProductType(2);
             codeEnttity.setCount(1);
+            RelCodeDetailResponse codeRelEntity = relCodeDetailService.findByCode(code);
+            if (codeRelEntity != null) {
+                codeEnttity.setParentCode(codeRelEntity.getParentCode());
+                RelCodeDetail relCodeDetail = relCodeDetailService.getOneByCode(codeRelEntity.getParentCode());
+                if (relCodeDetail != null) {
+                    codeEnttity.setGrantPaCode(relCodeDetail.getParentCode());
+                }
+            }
+
             String unitFk = null;
             if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
                 unitFk = addOrderRequest.getFromCorp();
@@ -1833,6 +1843,7 @@ public class IoCodeTempController extends BaseController {
         if (StrUtil.isNotEmpty(addOrderRequest.getSerialNo())) {
             udiEntity.setSerialNo(addOrderRequest.getSerialNo());
         }
+        RelCodeDetailResponse codeRelEntity = null;
         if (StrUtil.isEmpty(udiEntity.getBatchNo())) {
             IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code);
             if (codeLostEntity != null) {
@@ -1840,7 +1851,7 @@ public class IoCodeTempController extends BaseController {
                 udiEntity.setProduceDate(codeLostEntity.getProduceDate());
                 udiEntity.setExpireDate(codeLostEntity.getExpireDate());
             } else {
-                RelCodeDetailResponse codeRelEntity = relCodeDetailService.findByCode(code);
+                codeRelEntity = relCodeDetailService.findByCode(code);
                 if (codeRelEntity != null) {
                     udiEntity.setBatchNo(codeRelEntity.getBatchNo());
                     udiEntity.setProduceDate(MsDateUtil.formatDate(codeRelEntity.getMadeDate(), "yyMMdd"));

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

@@ -15,6 +15,7 @@ public interface SysWorkplaceQueueMapper extends BaseMapper<SysWorkplaceQueue> {
     Integer selectMaxLayer(String freightCode);
 
     List<SysWorkplaceQueueResponse> filterList(SysWorkplaceQueueRequest request);
+    List<SysWorkplaceQueueResponse> filterBindList(SysWorkplaceQueueRequest request);
 
     Integer selectMaxGrid(@Param("freightCode") String freightCode,@Param("layer") Integer layer);
 

src/main/java/com/glxp/api/entity/basic/SysWorkplaceQueue.java

@@ -117,7 +117,7 @@ public class SysWorkplaceQueue implements Serializable {
      */
     @TableField(value = "relId")
     @ApiModelProperty(value = "")
-    private Long relId;
+    private String relId;
 
 
 

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

@@ -220,4 +220,11 @@ public class IoCodeTempEntity {
      */
     @TableField(value = "parentCode")
     private String parentCode;
+
+
+    /**
+     * 爷级编码
+     */
+    @TableField(value = "grantPaCode")
+    private String grantPaCode;
 }

src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueBindRequest.java

@@ -0,0 +1,21 @@
+package com.glxp.api.req.basic;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : zhangsan
+ * @date : 2024/10/30 10:42
+ * @modyified By :
+ */
+
+@Data
+public class SysWorkplaceQueueBindRequest{
+    private Long id;
+    private String relId;
+    private String code;
+
+
+}

src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java

@@ -14,6 +14,9 @@ import java.util.List;
 @Data
 public class SysWorkplaceQueueRequest extends ListPageRequest {
     private String key;
+    private String scanCode;
+    private String udiCode;
+    private String nameCode;
     private String code;
     private String name;
     private Long workPlaceIdFk;

src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueResponse.java

@@ -80,6 +80,9 @@ public class SysWorkplaceQueueResponse {
      * 货架code
      */
     private String freightCode;
-
+    private String nameCode;
+    private String ggxh;
+    private String cpmctymc;
+    private String relId;
 
 }

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

@@ -152,6 +152,20 @@ public class SysWorkplaceQueueService extends ServiceImpl<SysWorkplaceQueueMappe
         return sysWorkplaceQueueResponses;
     }
 
+    public List<SysWorkplaceQueueResponse> filterBindList(SysWorkplaceQueueRequest request) {
+        if (null == request) {
+            return Collections.emptyList();
+        }
+        if (null != request.getPage() && null != request.getLimit()) {
+            PageHelper.offsetPage((request.getPage() - 1) * request.getLimit(), request.getLimit());
+        }
+        List<SysWorkplaceQueueResponse> sysWorkplaceQueueResponses = sysWorkplaceQueueMapper.filterBindList(request);
+//        for (SysWorkplaceQueueResponse sysWorkplaceQueueResponse : sysWorkplaceQueueResponses){
+//            sysWorkplaceQueueResponse.setCode(sysWorkplaceQueueResponse.getFreightCode() +sysWorkplaceQueueResponse.getCode());
+//        }
+        return sysWorkplaceQueueResponses;
+    }
+
     //删减卡槽
     public void deleteQueue(SysWorkplaceQueueRequest sysWorkplaceQueueRequest) {
         Integer grid = sysWorkplaceQueueRequest.getGrids();

src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java

@@ -119,12 +119,26 @@ public class RelCodeDetailService extends ServiceImpl<RelCodeDetailMapper, RelCo
     public RelCodeDetailResponse findByCode(String code) {
         RelCodeDetailRequest relCodeDetailRequest = new RelCodeDetailRequest();
         relCodeDetailRequest.setCurCode(code);
-        List<RelCodeDetailResponse> relCodeDetailResponse = filterList(relCodeDetailRequest);
-        if (CollUtil.isNotEmpty(relCodeDetailResponse)) {
-            return relCodeDetailResponse.get(0);
+        List<RelCodeDetailResponse> relCodeDetailResponses = filterList(relCodeDetailRequest);
+        if (CollUtil.isNotEmpty(relCodeDetailResponses)) {
+            return relCodeDetailResponses.get(0);
         } else {
+            relCodeDetailRequest.setCurCode(null);
+            relCodeDetailRequest.setParentCode(code);
+            relCodeDetailResponses = filterList(relCodeDetailRequest);
+            if (CollUtil.isNotEmpty(relCodeDetailResponses)) {
+                RelCodeDetailResponse relCodeDetailResponse = relCodeDetailResponses.get(0);
+                relCodeDetailResponse.setCurCode(code);
+                relCodeDetailResponse.setParentCode(null);
+                return relCodeDetailResponse;
+            }
+        }
         return null;
     }
+
+    public RelCodeDetail getOneByCode(String code) {
+        RelCodeDetail relCodeDetail = getOne(new LambdaQueryWrapper<RelCodeDetail>().eq(RelCodeDetail::getCurCode, code));
+        return relCodeDetail;
     }
 
 

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

@@ -14,6 +14,7 @@ import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.req.inout.FilterCodeRequest;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
+import com.glxp.api.res.collect.RelCodeDetailResponse;
 import com.glxp.api.res.inout.IoCodeResponse;
 import com.glxp.api.res.inout.IoCodeTempResponse;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
@@ -259,16 +260,25 @@ public class IoCodeTempService {
 
     public boolean ieExitRel(String code, String orderId) {
         boolean ret = false;
-        RelCodeDetail relCodeDetail = relCodeDetailService.getOne(new LambdaQueryWrapper<RelCodeDetail>().eq(RelCodeDetail::getCurCode, code));
+        RelCodeDetailResponse relCodeDetail = relCodeDetailService.findByCode(code);
         if (relCodeDetail != null) {
+            //判断是否存在关联关系：1.先判断当前单号是否存在父码，若存在则表示存在关联关系重复扫码
+            if (StrUtil.isNotEmpty(relCodeDetail.getParentCode())) {
                 ret = ioCodeTempDao.exists(new LambdaQueryWrapper<IoCodeTempEntity>().eq(IoCodeTempEntity::getOrderId, orderId).eq(IoCodeTempEntity::getCode, relCodeDetail.getParentCode()));
                 if (!ret) {
+                    relCodeDetail = relCodeDetailService.findByCode(relCodeDetail.getParentCode());
+                    ret = ioCodeTempDao.exists(new LambdaQueryWrapper<IoCodeTempEntity>().eq(IoCodeTempEntity::getOrderId, orderId).eq(IoCodeTempEntity::getCode, relCodeDetail.getParentCode()));
+                }
+            }
+            if (ret)
+                return true;
+            //若父码不存在，判断当前单号是否存在当前码的子码，若存在则表示存在关联关系重复扫码
             ret = ioCodeTempDao.exists(new LambdaQueryWrapper<IoCodeTempEntity>().eq(IoCodeTempEntity::getOrderId, orderId).eq(IoCodeTempEntity::getParentCode, code));
+            if (!ret) {
+                ret = ioCodeTempDao.exists(new LambdaQueryWrapper<IoCodeTempEntity>().eq(IoCodeTempEntity::getOrderId, orderId).eq(IoCodeTempEntity::getGrantPaCode, code));
             }
-
         }
         return ret;
     }
 
-
 }

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

@@ -105,7 +105,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
     public int insert(IoOrderDetailBizEntity orderDetailBizEntity) {
         if (orderDetailBizEntity.getId() == null)
             orderDetailBizEntity.setId(IdUtil.getSnowflakeNextId());
-        return ioOrderDetailBizDao.insert(orderDetailBizEntity);
+        return ioOrderDetailBizDao.insertIgnore(orderDetailBizEntity);
     }
 
     @Override
@@ -299,7 +299,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
 //                }
 //            }
 
-            if (bussinessTypeEntity != null && udiRelevanceResponse != null){
+            if (bussinessTypeEntity != null && udiRelevanceResponse != null) {
                 //是否校验耗材材质  1：高值耗材；2.普通耗材
                 if (IntUtil.value(bussinessTypeEntity.getVailHcType()) == 1) {
                     if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) {
@@ -312,11 +312,11 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
                 }
 
                 //是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品
-                if (IntUtil.value(bussinessTypeEntity.getCodeCheck() )== 1){
+                if (IntUtil.value(bussinessTypeEntity.getCodeCheck()) == 1) {
                     if (IntUtil.value(udiRelevanceResponse.getRequireScanCode()) != 1) {
                         throw new JsonException("单据只允许录入需要扫码产品" + ",请检查后重试！");
                     }
-                }else if (IntUtil.value(bussinessTypeEntity.getCodeCheck()) == 2) {
+                } else if (IntUtil.value(bussinessTypeEntity.getCodeCheck()) == 2) {
                     if (IntUtil.value(udiRelevanceResponse.getRequireScanCode()) != 0) {
                         throw new JsonException("单据只允许录入不需要扫码产品" + ",请检查后重试！");
                     }
@@ -324,7 +324,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
             }
 
 
-
             if (udiRelevanceResponse.getPurType() == 2) {
                 if (StrUtil.isEmpty(item.getZczbhhzbapzbh())) {
                     throw new JsonException("预验收产品必须填写预验收批次号");
@@ -407,7 +406,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
             IoOrderDetailBizEntity ioOrderDetailBizEntity1 = new IoOrderDetailBizEntity();
             BeanUtils.copyProperties(ioOrderDetailBizEntity, ioOrderDetailBizEntity1);
             UdiProductEntity drug = udiProductDao.findByNameCode(ioOrderDetailBizEntity1.getNameCode());
-            if (drug.getProductsType() == 2){
+            if (drug.getProductsType() == 2) {
                 //药品添加药品数据
                 ioOrderDetailBizEntity1.setBzgg(drug.getBzgg());
                 ioOrderDetailBizEntity1.setPrepnUnit(drug.getPrepnUnit());

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

@@ -80,7 +80,7 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
         if (orderDetailCodeEntity.getId() == null) {
             orderDetailCodeEntity.setId(IdUtil.getSnowflakeNextId());
         }
-        return ioOrderDetailCodeDao.insert(orderDetailCodeEntity);
+        return ioOrderDetailCodeDao.insertIgnore(orderDetailCodeEntity);
     }
 
     @Override

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

@@ -40,7 +40,7 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic
     @Override
     public int insert(IoOrderDetailResultEntity orderDetailResultEntity) {
         orderDetailResultEntity.setId(null);
-        return orderDetailResultDao.insert(orderDetailResultEntity);
+        return orderDetailResultDao.insertIgnore(orderDetailResultEntity);
     }
 
     @Override

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

@@ -27,6 +27,45 @@
         </where>
     </select>
 
+    <select id="filterBindList" resultType="com.glxp.api.res.basic.SysWorkplaceQueueResponse">
+        select swq.*,bp.nameCode,bp.ggxh,bp.cpmctymc
+        from sys_workplace_queue swq
+        left join
+        (select bu.id,bp.nameCode,bp.ggxh,bp.cpmctymc
+        from basic_udirel bu
+        left join basic_products bp ON bu.uuid = bp.uuid
+        group by bu.id,bp.nameCode,bp.ggxh,bp.cpmctymc) as bp ON bp.id = swq.relId
+        <where>
+            <if test="key != null and key != ''">
+                AND (
+                swq.code like concat('%', #{key}, '%')
+                or swq.name like concat('%', #{key}, '%')
+                )
+            </if>
+            <if test="scanCode != null and scanCode != ''">
+                AND (
+                swq.code like concat('%', #{scanCode}, '%')
+                or swq.freightCode like concat('%', #{scanCode}, '%')
+                or swq.layerCode like concat('%', #{scanCode}, '%')
+                )
+            </if>
+            <if test="nameCode != null and nameCode != ''">
+                AND (
+                bp.nameCode like concat('%', #{nameCode}, '%')
+                )
+            </if>
+            <if test=" layerCode != null and layerCode != ''">
+                AND layerCode = #{layerCode}
+            </if>
+            <if test="layerCodes != null and layerCodes.size() > 0">
+                and swq.layerCode in
+                <foreach collection="layerCodes" item="item" index="index" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
     <select id="filterList" resultType="com.glxp.api.res.basic.SysWorkplaceQueueResponse">
         select swq.*
         from sys_workplace_queue swq

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

@@ -167,7 +167,7 @@
 
     <select id="findByNameCode" parameterType="java.lang.String"
             resultType="com.glxp.api.entity.basic.UdiProductEntity">
-        SELECT basic_products.*,basic_udirel.purType,basic_udirel.hcType
+        SELECT basic_products.*,basic_udirel.purType,basic_udirel.hcType,basic_udirel.id as relId
         FROM basic_products
         LEFT JOIN basic_udirel ON basic_udirel.uuid = basic_products.uuid
         WHERE (basic_products.nameCode = #{nameCode})

src/main/resources/mybatis/mapper/collect/RelCodeDetailMapper.xml

@@ -4,21 +4,25 @@
     <resultMap id="BaseResultMap" type="com.glxp.api.entity.collect.RelCodeDetail">
         <!--@mbg.generated-->
         <!--@Table udi_wms_ywj.rel_code_detail-->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="curCode" jdbcType="VARCHAR" property="curCode" />
-    <result column="packLayer" jdbcType="TINYINT" property="packLayer" />
-    <result column="parentCode" jdbcType="VARCHAR" property="parentCode" />
-    <result column="flag" jdbcType="TINYINT" property="flag" />
-    <result column="batchIdFk" jdbcType="INTEGER" property="batchIdFk" />
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="curCode" jdbcType="VARCHAR" property="curCode"/>
+        <result column="packLayer" jdbcType="TINYINT" property="packLayer"/>
+        <result column="parentCode" jdbcType="VARCHAR" property="parentCode"/>
+        <result column="flag" jdbcType="TINYINT" property="flag"/>
+        <result column="batchIdFk" jdbcType="INTEGER" property="batchIdFk"/>
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
-    id, curCode, packLayer, parentCode, flag, batchIdFk
+        id,
+        curCode,
+        packLayer,
+        parentCode,
+        flag,
+        batchIdFk
     </sql>
-
-  <select id="filterList" parameterType="com.glxp.api.req.collect.RelCodeDetailRequest" resultType="com.glxp.api.res.collect.RelCodeDetailResponse">
-    select
-      rcd.id,
+    <select id="filterList" parameterType="com.glxp.api.req.collect.RelCodeDetailRequest"
+            resultType="com.glxp.api.res.collect.RelCodeDetailResponse">
+        select rcd.id,
                rcd.curCode,
                rcd.packLayer,
                rcd.parentCode,
@@ -45,9 +49,15 @@
             <if test="productCode != '' and productCode != null">
                 AND rcb.productCode LIKE concat('%', #{productCode}, '%')
             </if>
-      <if test=" batchIdFk != null">
+            <if test="batchIdFk != null">
                 AND rcb.id = #{batchIdFk}
             </if>
+            <if test="curCode != null">
+                AND rcd.curCode = #{curCode}
+            </if>
+            <if test="parentCode != null">
+                AND rcd.parentCode = #{parentCode}
+            </if>
             <if test="batchNo != null and batchNo != ''">
                 AND rcb.batchNo = #{batchNo}
             </if>

src/main/resources/schemas/schema_v2.4.sql

@@ -4721,3 +4721,14 @@ CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'relId',
 CALL Pro_Temp_ColumnWork('thr_yb_setup', 'signData',
                          'char(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''签到时间''',
                          1);
+CALL Pro_Temp_ColumnWork('io_code_temp', 'grantPaCode',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''爷级编码''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('io_code', 'parentCode',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''父级编码''',
+                         1);
+CALL Pro_Temp_ColumnWork('io_code', 'grantPaCode',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''爷级编码''',
+                         1);
+