箱码合一bug修改

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/QrBoxMappingVO.java

@@ -20,6 +20,12 @@ public class QrBoxMappingVO implements Serializable {
     @ApiModelProperty(value = "id")
     private Long id;
 
+    @ApiModelProperty(value = "起始二维码")
+    private String beginQrCode;
+
+    @ApiModelProperty(value = "结束二维码")
+    private String endQrCode;
+
     @ApiModelProperty(value = "条码序号")
     private String boxCode;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListQrBoxCodeMappingRes.java

@@ -43,6 +43,12 @@ public class ListQrBoxCodeMappingRes extends PageResp implements Serializable {
         @ApiModelProperty(value = "条码序号")
         private String boxCode;
 
+        @ApiModelProperty(value = "起始二维码")
+        private String beginQrCode;
+
+        @ApiModelProperty(value = "结束二维码")
+        private String endQrCode;
+
         @ApiModelProperty(value = "起始序号")
         private Long indexBegin;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrBoxMappingServiceImpl.java

@@ -91,7 +91,17 @@ public class QrBoxMappingServiceImpl implements QrBoxMappingService {
         if (qrCodeCount < 0) {
             throw new BusinessException("起始序号大于结束序号,无法生成条形码");
         }
+        //判断至少开始结束序号相同的箱码合一不能存在
+        QueryWrapper<QrBoxMapping> boxMappingQw = new QueryWrapper<>();
+        boxMappingQw.eq("begin_qr_code",req.getBeginQrCode());
+        boxMappingQw.eq("end_qr_code",req.getEndQrCode());
+        boxMappingQw.eq("is_delete",0);
+        List<QrBoxMapping> qrBoxMappingList = qrBoxMappingMapper.selectList(boxMappingQw);
+        if(CollectionUtils.isNotEmpty(qrBoxMappingList)){
+            throw new BusinessException("不能重复创建箱码合一数据");
+        }
 
+        //构造持久化对象
         QrBoxMapping qbm = new QrBoxMapping();
         qbm.setBoxCode(String.valueOf(IdWorker.getId()));
         qbm.setIndexBegin(indexBegin);

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

@@ -39,9 +39,9 @@
 
     <select id="listQrBoxCodeMapping" resultType="com.abi.qms.platform.dao.vo.result.QrBoxMappingVO">
         select
-        qbm.id,qbm.box_code,qbm.index_begin,qbm.index_end,qbm.qr_code_count,qbm.project_no,qbm.board_no,qbm.remark,
-        qbm.create_user_name,qbm.create_time,qbm.active_time,qbm.active_user_name,qbm.active_status,qbm.package_id,
-        qbm.invalid,bf.factory_name
+            qbm.id,qbm.box_code,qbm.index_begin,qbm.index_end,qbm.qr_code_count,qbm.project_no,qbm.board_no,qbm.remark,
+            qbm.create_user_name,qbm.create_time,qbm.active_time,qbm.active_user_name,qbm.active_status,qbm.package_id,
+            qbm.invalid,bf.factory_name,qbm.begin_qr_code,qbm.end_qr_code
         from qr_box_mapping qbm
         inner join qr_package qp on qp.id=qbm.package_id
         left join base_factory bf on bf.id=qp.factory_beer_id
@@ -56,11 +56,13 @@
 
     <select id="getPrintingDetail" resultType="com.abi.qms.platform.dao.vo.result.PrintingDetailVO">
         select
-        qbm.begin_qr_code,qbm.end_qr_code,qbm.create_time,qbm.box_code,qbm.qr_code_count,
-        qp.factory_cover_level_two_id,qp.factory_beer_id,bm.material_name
+            qbm.begin_qr_code,qbm.end_qr_code,qbm.create_time,qbm.box_code,qbm.qr_code_count,
+            qp.factory_cover_level_two_id,qp.factory_beer_id,
+            ifnull(book.material_name,bm.material_name) as material_name
         from qr_box_mapping qbm
-        inner join qr_package qp on qp.id=qbm.package_id
-        inner join base_material bm on bm.id=qp.material_id
+            inner join qr_package qp on qp.id=qbm.package_id
+            left join base_material bm on bm.id=qp.material_id
+            left join qr_package_booking_order book on book.booking_order=qp.booking_order
         <where>
             <if test="boxCode != null and boxCode!='' ">
                 qbm.box_code = #{boxCode}