关联关系校验

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

@@ -21,6 +21,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.collect.RelCodeDetail;
 import com.glxp.api.entity.inout.*;
 import com.glxp.api.entity.inv.InvPreInProductDetailEntity;
 import com.glxp.api.entity.inv.InvPreProductDetailEntity;
@@ -959,6 +960,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) {
@@ -966,7 +968,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(DateUtil.formatDate(codeRelEntity.getMadeDate(), "yyMMdd"));
@@ -1123,6 +1125,14 @@ public class IoCodeTempController extends BaseController {
             codeEnttity.setSerialNo(udiEntity.getSerialNo());
             codeEnttity.setDeptCode(invWarehouseEntity.getParentId());
             codeEnttity.setInvCode(addOrderRequest.getInvCode());
+            if (codeRelEntity != null) {
+                codeEnttity.setParentCode(codeRelEntity.getParentCode());
+                RelCodeDetail relCodeDetail = relCodeDetailService.getOneByCode(codeRelEntity.getParentCode());
+                if (relCodeDetail != null) {
+                    codeEnttity.setGrantPaCode(relCodeDetail.getParentCode());
+                }
+            }
+
             codeEnttity.setCount(1);
             codeEnttity.setProductType(2);
             String unitFk = null;

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

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

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

@@ -118,12 +118,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);
+        List<RelCodeDetailResponse> relCodeDetailResponses = filterList(relCodeDetailRequest);
-        if (CollUtil.isNotEmpty(relCodeDetailResponse)) {
+        if (CollUtil.isNotEmpty(relCodeDetailResponses)) {
-            return relCodeDetailResponse.get(0);
+            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/impl/IoCodeTempService.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.inout.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,6 +12,7 @@ import com.glxp.api.entity.collect.RelCodeDetail;
 import com.glxp.api.entity.inout.IoCodeEntity;
 import com.glxp.api.entity.inout.IoCodeTempEntity;
 import com.glxp.api.req.inout.FilterCodeRequest;
+import com.glxp.api.res.collect.RelCodeDetailResponse;
 import com.glxp.api.res.inout.IoCodeTempResponse;
 import com.glxp.api.service.collect.RelCodeDetailService;
 import com.glxp.api.util.BeanCopyUtils;
@@ -124,13 +126,23 @@ 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/resources/mybatis/mapper/collect/RelCodeDetailMapper.xml

@@ -4,21 +4,26 @@
     <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" />
+        <id column="id" jdbcType="INTEGER" property="id"/>
-    <result column="curCode" jdbcType="VARCHAR" property="curCode" />
+        <result column="curCode" jdbcType="VARCHAR" property="curCode"/>
-    <result column="packLayer" jdbcType="TINYINT" property="packLayer" />
+        <result column="packLayer" jdbcType="TINYINT" property="packLayer"/>
-    <result column="parentCode" jdbcType="VARCHAR" property="parentCode" />
+        <result column="parentCode" jdbcType="VARCHAR" property="parentCode"/>
-    <result column="flag" jdbcType="TINYINT" property="flag" />
+        <result column="flag" jdbcType="TINYINT" property="flag"/>
-    <result column="batchIdFk" jdbcType="INTEGER" property="batchIdFk" />
+        <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 id="filterList" parameterType="com.glxp.api.req.collect.RelCodeDetailRequest"
-    select
+            resultType="com.glxp.api.res.collect.RelCodeDetailResponse">
-      rcd.id,
+        select rcd.id,
                rcd.curCode,
                rcd.packLayer,
                rcd.parentCode,
@@ -45,9 +50,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

@@ -1095,6 +1095,16 @@ CALL Pro_Temp_ColumnWork('thr_products_add_di', 'majorStatus',
 CALL Pro_Temp_ColumnWork('io_code_temp', 'parentCode',
                          ' varchar(255) 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);
 
 
 CALL Pro_Temp_ColumnWork('rel_code_batch', 'erpId',