Bladeren bron

单码查询规整

v_KaixiangGuo 4 jaren geleden
bovenliggende
commit
3b643397a1

+ 3 - 3
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/QrSingleCheckController.java

@@ -1,7 +1,7 @@
 package com.abi.qms.platform.controller.console;
 import com.abi.qms.platform.dto.req.GetQrSingleCheckDetailCodeReq;
 import com.abi.qms.platform.dto.res.GetQrSingleCheckDetailRes;
-import com.abi.qms.platform.service.QrSingleCheckService;
+import com.abi.qms.platform.service.QrPackageService;
 import com.abi.task.common.api.base.BaseResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,13 +25,13 @@ import org.springframework.web.bind.annotation.RestController;
 public class QrSingleCheckController {
 
     @Autowired
-    private QrSingleCheckService qrSingleCheckService;
+    private QrPackageService qrPackageService;
 
 
     @ApiOperation("单码查询详情")
     @GetMapping("/getQrSingleCheckDetail")
     public BaseResponse<GetQrSingleCheckDetailRes> getQrSelectDetail(@Validated GetQrSingleCheckDetailCodeReq getQrSingleCheckDetailCodeReq) {
-        GetQrSingleCheckDetailRes result = qrSingleCheckService.getQrSingleCheckDetail(getQrSingleCheckDetailCodeReq);
+        GetQrSingleCheckDetailRes result = qrPackageService.getQrSingleCheckDetail(getQrSingleCheckDetailCodeReq);
         return BaseResponse.create(result);
     }
 }

+ 6 - 0
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/QrPackageMapper.java

@@ -4,6 +4,7 @@ import com.abi.qms.platform.dao.entity.QrPackage;
 import com.abi.qms.platform.dao.vo.result.ActivePackageVO;
 import com.abi.qms.platform.dao.vo.result.PackageActiveSearchVO;
 import com.abi.qms.platform.dao.vo.result.QrPackageVO;
+import com.abi.qms.platform.dao.vo.result.QrSingleCheckVO;
 import com.abi.qms.platform.dto.req.ListActivePackageAddReq;
 import com.abi.qms.platform.dto.req.ListQrPackageReq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -43,4 +44,9 @@ public interface QrPackageMapper extends BaseMapper<QrPackage> {
 	 * @return
 	 */
 	IPage<PackageActiveSearchVO> listPackageByBrandCode(IPage page, @Param("param") ListActivePackageAddReq req);
+
+	/**
+	 * 单码查询详细信息
+	 */
+	QrSingleCheckVO getQrSingleCheckDetailById(Long id);
 }

+ 0 - 17
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/QrSingleCheckMapper.java

@@ -1,17 +0,0 @@
-package com.abi.qms.platform.dao.mapper;
-
-import com.abi.qms.platform.dao.vo.result.QrSingleCheckVO;
-
-/**
- * 单码查询 Mapper接口
- *
- * @author KaiXiangGuo
- * @date 2021-05-27
- */
-public interface QrSingleCheckMapper{
-
-	/**
-	 * 单码查询详细信息
-	 */
-	QrSingleCheckVO getQrSingleCheckDetailById(Long id);
-}

+ 6 - 4
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/QrPackageService.java

@@ -3,10 +3,7 @@ package com.abi.qms.platform.service;
 
 import com.abi.qms.platform.dao.entity.QrPackage;
 import com.abi.qms.platform.dto.req.*;
-import com.abi.qms.platform.dto.res.CheckQrPackageRepetitiveRes;
-import com.abi.qms.platform.dto.res.GetQrPackageDetailRes;
-import com.abi.qms.platform.dto.res.ListQrPackageRes;
-import com.abi.qms.platform.dto.res.ValidSAPOrderNoAndMaterialRes;
+import com.abi.qms.platform.dto.res.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
@@ -82,6 +79,11 @@ public interface QrPackageService {
 	 */
 	void sendMobileMsg(SendMobileMsgReq req);
 
+	/**
+	 * 单码查询详情
+	 */
+	GetQrSingleCheckDetailRes getQrSingleCheckDetail(GetQrSingleCheckDetailCodeReq getQrSingleCheckDetailCodeReq);
+
 
 
 }

+ 0 - 22
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/QrSingleCheckService.java

@@ -1,22 +0,0 @@
-package com.abi.qms.platform.service;
-
-
-import com.abi.qms.platform.dto.req.GetQrSingleCheckDetailCodeReq;
-import com.abi.qms.platform.dto.res.GetQrSingleCheckDetailRes;
-
-/**
- *  单码查询 Service接口
- *
- * @author KaixiangGuo
- * @date 2021-05-27
- */
-public interface QrSingleCheckService {
-
-
-    /**
-     * 单码查询详情
-     */
-    GetQrSingleCheckDetailRes getQrSingleCheckDetail(GetQrSingleCheckDetailCodeReq getQrSingleCheckDetailCodeReq);
-
-
-}

+ 76 - 9
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrPackageServiceImpl.java

@@ -6,27 +6,24 @@ import com.abi.base.foundation.util.RedisClient;
 import com.abi.qms.platform.constant.RedisKeysConstant;
 import com.abi.qms.platform.dao.entity.*;
 import com.abi.qms.platform.dao.enums.*;
-import com.abi.qms.platform.dao.mapper.BaseFactoryMapper;
-import com.abi.qms.platform.dao.mapper.QrPackageBatchMapper;
-import com.abi.qms.platform.dao.mapper.QrPackageDownloadRecordMapper;
-import com.abi.qms.platform.dao.mapper.QrPackageMapper;
-import com.abi.qms.platform.dao.vo.result.QrPackageVO;
+import com.abi.qms.platform.dao.mapper.*;
+import com.abi.qms.platform.dao.tablestore.entity.QrCode;
+import com.abi.qms.platform.dao.vo.result.*;
 import com.abi.qms.platform.dto.req.*;
-import com.abi.qms.platform.dto.res.CheckQrPackageRepetitiveRes;
-import com.abi.qms.platform.dto.res.GetQrPackageDetailRes;
-import com.abi.qms.platform.dto.res.ListQrPackageRes;
-import com.abi.qms.platform.dto.res.ValidSAPOrderNoAndMaterialRes;
+import com.abi.qms.platform.dto.res.*;
 import com.abi.qms.platform.infrastructure.mq.GenerateCodeConsumer;
 import com.abi.qms.platform.infrastructure.util.*;
 import com.abi.qms.platform.service.QrPackageService;
 import com.abi.task.common.api.exception.BusinessException;
 import com.abi.task.common.api.exception.ErrorCodeEnum;
+import com.abi.task.common.tablestore.TableStorePlusUtils;
 import com.abi.task.common.utils.PojoConverterUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import freemarker.template.Template;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -77,6 +74,18 @@ public class QrPackageServiceImpl implements QrPackageService {
     @Autowired
     private UserUtil userUtil;
 
+    @Autowired
+    private TableStorePlusUtils tableStorePlusUtils;
+
+    @Autowired
+    private QrRepertoryColumnMapper repertoryColumnMapper;
+
+    @Autowired
+    private BaseActiveMapper baseActiveMapper;
+
+    @Autowired
+    private QrBoxMappingMapper qrBoxMappingMapper;
+
     /**
      * 保存码包
      */
@@ -593,5 +602,63 @@ public class QrPackageServiceImpl implements QrPackageService {
         return true;
     }
 
+    @Override
+    public GetQrSingleCheckDetailRes getQrSingleCheckDetail(GetQrSingleCheckDetailCodeReq req) {
+
+        //调用tablestore查询码信息
+        QrCode qrCode = tableStorePlusUtils.selectOne(QrCode.class, req.getQrCode());
+        AssertUtil.isNull(qrCode.getPackageId(), "码数据不存在");
+
+        //1-查询码关联信息
+        QrSingleCheckVO qrSingleCheckVO = qrPackageMapper.getQrSingleCheckDetailById(Long.valueOf(qrCode.getPackageId()));
+        AssertUtil.isNull(qrSingleCheckVO, "码数据不存在");
+
+        //查询是否存在隐形码
+        QrRepertoryColumn qrRepertoryColumn = repertoryColumnMapper.selectById(qrCode.getQrRepertoryColumnId());
+
+        //存在别名(隐形码)
+        if (ObjectUtils.isNotEmpty(qrRepertoryColumn)){
+            qrSingleCheckVO.setAlias(qrRepertoryColumn.getAlias());//隐形码
+        }
+
+        //查询码包对应活动单条数据
+        PackageActiveVO packageActive = baseActiveMapper.getPackageActive(qrCode.getPackageId());
+
+        //存在活动数据
+        if (ObjectUtils.isNotEmpty(packageActive)){
+            qrSingleCheckVO.setActiveName(packageActive.getActiveName());
+            qrSingleCheckVO.setActiveUrl(packageActive.getActiveUrl());
+        }
+
+        //查询批次号id
+        QrOnePackageBatchReq qrOnePackageBatchReq = new QrOnePackageBatchReq();
+        qrOnePackageBatchReq.setPackageId(qrCode.getPackageId());
+        qrOnePackageBatchReq.setBatchNumber(qrCode.getBatchNumberId());
+        QrPackageBatchVO qrPackageBatchOne = qrPackageBatchMapper.getQrPackageBatchOne(qrOnePackageBatchReq);
+
+        //存批次号
+        if (ObjectUtils.isNotEmpty(qrPackageBatchOne)){
+            qrSingleCheckVO.setBatchNumber(qrPackageBatchOne.getBatchNumber());
+        }
+
+        //1-查询码关联激活信息单条数据
+        QrOneBoxCodeMappingReq qrOneBoxCodeMappingReq = new QrOneBoxCodeMappingReq();
+        qrOneBoxCodeMappingReq.setPackageId(qrCode.getPackageId());
+        qrOneBoxCodeMappingReq.setQrIndex(qrCode.getCodeIndex());
+        QrBoxMappingVO qrBoxMappingVO = qrBoxMappingMapper.getIndexQrBoxCodeMappingOne(qrOneBoxCodeMappingReq);
+
+        //存在激活关联信息
+        if (ObjectUtils.isNotEmpty(qrBoxMappingVO)){
+            qrSingleCheckVO.setBoxCode(qrBoxMappingVO.getBoxCode());//条码序号
+            qrSingleCheckVO.setActiveTime(qrBoxMappingVO.getActiveTime());//激活时间
+            qrSingleCheckVO.setActiveUserName(qrBoxMappingVO.getActiveUserName());//激活时间
+            qrSingleCheckVO.setActiveStatus(qrBoxMappingVO.getActiveStatus());//激活状态
+        }
+
+        //转化出参
+        GetQrSingleCheckDetailRes res = PojoConverterUtils.copy(qrSingleCheckVO, GetQrSingleCheckDetailRes.class);
+        return res;
+    }
+
 
 }

+ 0 - 107
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrSingleCheckServiceImpl.java

@@ -1,107 +0,0 @@
-package com.abi.qms.platform.service.impl;
-
-import com.abi.qms.platform.dao.entity.*;
-import com.abi.qms.platform.dao.mapper.*;
-import com.abi.qms.platform.dao.tablestore.entity.QrCode;
-import com.abi.qms.platform.dao.vo.result.PackageActiveVO;
-import com.abi.qms.platform.dao.vo.result.QrBoxMappingVO;
-import com.abi.qms.platform.dao.vo.result.QrPackageBatchVO;
-import com.abi.qms.platform.dao.vo.result.QrSingleCheckVO;
-import com.abi.qms.platform.dto.req.*;
-import com.abi.qms.platform.dto.res.GetQrSingleCheckDetailRes;
-import com.abi.qms.platform.infrastructure.util.*;
-import com.abi.qms.platform.service.QrSingleCheckService;
-import com.abi.task.common.tablestore.TableStorePlusUtils;
-import com.abi.task.common.utils.PojoConverterUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 单码查询 Service业务层处理
- *
- * @author KaixiangGuo
- * @date 2021-05-27
- */
-@Service
-@Slf4j
-public class QrSingleCheckServiceImpl implements QrSingleCheckService {
-
-    @Autowired
-    private QrSingleCheckMapper qrSingleCheckMapper;
-    
-    @Autowired
-    private TableStorePlusUtils tableStorePlusUtils;
-
-    @Autowired
-    private QrRepertoryColumnMapper repertoryColumnMapper;
-
-    @Autowired
-    private BaseActiveMapper baseActiveMapper;
-
-    @Autowired
-    private QrBoxMappingMapper qrBoxMappingMapper;
-
-    @Autowired
-    private QrPackageBatchMapper qrPackageBatchMapper;
-
-    @Override
-    public GetQrSingleCheckDetailRes getQrSingleCheckDetail(GetQrSingleCheckDetailCodeReq req) {
-
-        //调用tablestore查询码信息
-        QrCode qrCode = tableStorePlusUtils.selectOne(QrCode.class, req.getQrCode());
-        AssertUtil.isNull(qrCode.getPackageId(), "码数据不存在");
-
-        //1-查询码关联信息
-        QrSingleCheckVO qrSingleCheckVO = qrSingleCheckMapper.getQrSingleCheckDetailById(Long.valueOf(qrCode.getPackageId()));
-        AssertUtil.isNull(qrSingleCheckVO, "码数据不存在");
-
-        //查询是否存在隐形码
-        QrRepertoryColumn qrRepertoryColumn = repertoryColumnMapper.selectById(qrCode.getQrRepertoryColumnId());
-
-        //存在别名(隐形码)
-        if (ObjectUtils.isNotEmpty(qrRepertoryColumn)){
-            qrSingleCheckVO.setAlias(qrRepertoryColumn.getAlias());//隐形码
-        }
-
-        //查询码包对应活动单条数据
-        PackageActiveVO packageActive = baseActiveMapper.getPackageActive(qrCode.getPackageId());
-
-        //存在活动数据
-        if (ObjectUtils.isNotEmpty(packageActive)){
-            qrSingleCheckVO.setActiveName(packageActive.getActiveName());
-            qrSingleCheckVO.setActiveUrl(packageActive.getActiveUrl());
-        }
-
-        //查询批次号id
-        QrOnePackageBatchReq qrOnePackageBatchReq = new QrOnePackageBatchReq();
-        qrOnePackageBatchReq.setPackageId(qrCode.getPackageId());
-        qrOnePackageBatchReq.setBatchNumber(qrCode.getBatchNumberId());
-        QrPackageBatchVO qrPackageBatchOne = qrPackageBatchMapper.getQrPackageBatchOne(qrOnePackageBatchReq);
-
-        //存批次号
-        if (ObjectUtils.isNotEmpty(qrPackageBatchOne)){
-            qrSingleCheckVO.setBatchNumber(qrPackageBatchOne.getBatchNumber());
-        }
-
-        //1-查询码关联激活信息单条数据
-        QrOneBoxCodeMappingReq qrOneBoxCodeMappingReq = new QrOneBoxCodeMappingReq();
-        qrOneBoxCodeMappingReq.setPackageId(qrCode.getPackageId());
-        qrOneBoxCodeMappingReq.setQrIndex(qrCode.getCodeIndex());
-        QrBoxMappingVO qrBoxMappingVO = qrBoxMappingMapper.getIndexQrBoxCodeMappingOne(qrOneBoxCodeMappingReq);
-
-        //存在激活关联信息
-        if (ObjectUtils.isNotEmpty(qrBoxMappingVO)){
-            qrSingleCheckVO.setBoxCode(qrBoxMappingVO.getBoxCode());//条码序号
-            qrSingleCheckVO.setActiveTime(qrBoxMappingVO.getActiveTime());//激活时间
-            qrSingleCheckVO.setActiveUserName(qrBoxMappingVO.getActiveUserName());//激活时间
-            qrSingleCheckVO.setActiveStatus(qrBoxMappingVO.getActiveStatus());//激活状态
-        }
-
-        //转化出参
-        GetQrSingleCheckDetailRes res = PojoConverterUtils.copy(qrSingleCheckVO, GetQrSingleCheckDetailRes.class);
-        return res;
-    }
-}

+ 9 - 2
abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrBoxMappingMapper.xml

@@ -65,8 +65,15 @@
         <include refid = "Base_Column_List" />
         FROM
         qr_box_mapping
-        WHERE
-        package_id = #{req.packageId} and index_begin &lt;= #{req.qrIndex} and index_end >= #{req.qrIndex}
+        <where>
+            <if test="req.packageId != null and req.packageId !=''  ">
+                AND package_id = #{req.packageId}
+            </if>
+            <if test="req.qrIndex != null and req.qrIndex != '' ">
+                AND index_begin &lt;= #{req.qrIndex} AND index_end >= #{req.qrIndex}
+            </if>
+        </where>
+        AND is_delete = 0
         LIMIT 1
     </select>
 

+ 9 - 2
abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrPackageBatchMapper.xml

@@ -25,8 +25,15 @@
             qpb.batch_number
         FROM
             qr_package_batch qpb
-        WHERE
-            qpb.package_id = #{req.packageId} and qpb.batch_number = #{req.batchNumber}
+        <where>
+            <if test="req.batchNumber != null and req.batchNumber != ''">
+                AND qpb.batch_number = #{req.batchNumber}
+            </if>
+            <if test="req.packageId != null and req.packageId != ''">
+                AND qpb.package_id = #{req.packageId}
+            </if>
+        </where>
+        AND qpb.is_delete = 0
     </select>
 
 </mapper>

+ 20 - 0
abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrPackageMapper.xml

@@ -217,4 +217,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and bb.is_delete = 0
         order by qp.generate_time
     </select>
+
+    <select id="getQrSingleCheckDetailById" resultType="com.abi.qms.platform.dao.vo.result.QrSingleCheckVO">
+        SELECT
+        qp.id,
+        qp.sap_order_no,
+        qp.qr_type,
+        qp.generate_time,
+        bm.material_name,
+        bs.sku_name,
+        bfa.factory_name AS factory_cover_name,
+        bfb.factory_name AS factory_beer_name
+        FROM
+        qr_package qp
+        LEFT JOIN base_material bm ON qp.material_id = bm.id
+        LEFT JOIN base_sku bs ON bm.sku_id = bs.id
+        LEFT JOIN base_factory bfa ON qp.factory_cover_id = bfa.id
+        LEFT JOIN base_factory bfb ON qp.factory_beer_id = bfb.id
+        WHERE
+        qp.id = #{id}
+    </select>
 </mapper>

+ 0 - 28
abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrSingleCheckMapper.xml

@@ -1,28 +0,0 @@
-<?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.abi.qms.platform.dao.mapper.QrSingleCheckMapper">
-
-    <select id="getQrSingleCheckDetailById" resultType="com.abi.qms.platform.dao.vo.result.QrSingleCheckVO">
-        SELECT
-            qp.id,
-            qp.sap_order_no,
-            qp.qr_type,
-            qp.generate_time,
-            bm.material_name,
-            bs.sku_name,
-            bfa.factory_name AS factory_cover_name,
-            bfb.factory_name AS factory_beer_name
-        FROM
-            `qr_package` qp
-            LEFT JOIN base_material bm ON qp.material_id = bm.id
-            LEFT JOIN base_sku bs ON bm.sku_id = bs.id
-            LEFT JOIN base_factory bfa ON qp.factory_cover_id = bfa.id
-            LEFT JOIN base_factory bfb ON qp.factory_beer_id = bfb.id
-        WHERE
-            qp.id = #{id}
-    </select>
-
-
-</mapper>