Merge remote-tracking branch 'origin/dev' into test

src/main/java/com/glxp/api/constant/ConstantStatus.java

@@ -217,7 +217,7 @@ public class ConstantStatus {
     public static final int FROM_PLAN = 12;          //申购计划转单
     public static final int FROM_RECEIVE = 13;          //领用单据转单
     public static final int FROM_THRORDER = 14;         //第三方单据转单
-    public static final int FROM_Order = 15;          //采购计划转单
+    public static final int FROM_Order = 15;          //采购订单转单
     public static final int FROM_BACK = 17;           //出库转退货单;
 
 

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

@@ -127,11 +127,20 @@ public class UdiRelevanceController extends BaseController {
             if (StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())) {
                 UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiRelRequest.getUdiCode());
                 filterUdiRelRequest.setNameCode(udiEntity.getUdi());
+                List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiRelRequest);
+                if (temps != null && temps.size() > 0) {
+                    filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid());
+                }
             }
-            List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiRelRequest);
+
-            if (temps != null && temps.size() > 0) {
+        } else if (StrUtil.isNotEmpty(filterUdiRelRequest.getUnionCode()) && StrUtil.isEmpty(filterUdiRelRequest.getUdiCode())) {
-                filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid());
+            if (StrUtil.isNotEmpty(filterUdiRelRequest.getUnionCode())) {
-                filterUdiRelRequest.setNameCode(null);
+                filterUdiRelRequest.setNameCode(filterUdiRelRequest.getUnionCode());
+                List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiRelRequest);
+                if (temps != null && temps.size() > 0) {
+                    filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid());
+                    filterUdiRelRequest.setNameCode(null);
+                }
             }
         } else {
             filterUdiRelRequest.setDiType(1);

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

@@ -37,6 +37,7 @@ import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
+import com.glxp.api.res.inout.IoOrderDetailResultResponse;
 import com.glxp.api.res.inout.IoOrderInvoiceResponse;
 import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.basic.*;
@@ -711,9 +712,9 @@ public class IoOrderDetailBizController extends BaseController {
      */
     @GetMapping("/udiwms/inout/bizDetail/filterBizOrderList")
     public BaseResponse filterBizOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest) {
-        List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(orderDetailBizRequest);
+        List<IoOrderDetailResultResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(orderDetailBizRequest);
         List<IoOrderInvoiceEntity> orderInvoiceEntities = ioOrderInvoiceService.findByBillNo(orderDetailBizRequest.getOrderIdFk());
-        for (IoOrderDetailCodeResponse orderDetailCodeEntity : ioOrderDetailCodeResponses) {
+        for (IoOrderDetailResultResponse orderDetailCodeEntity : ioOrderDetailCodeResponses) {
             if (orderDetailCodeEntity.getReCount() != 0 && orderDetailCodeEntity.getPrice() != null) {
                 orderDetailCodeEntity.setAmount(new BigDecimal(orderDetailCodeEntity.getReCount()).multiply(orderDetailCodeEntity.getPrice()));
             }
@@ -732,7 +733,7 @@ public class IoOrderDetailBizController extends BaseController {
             }
             orderDetailCodeEntity.setInvoiceCodes(msg);
         }
-        PageInfo<IoOrderDetailCodeResponse> pageInfo = new PageInfo<>(ioOrderDetailCodeResponses);
+        PageInfo<IoOrderDetailResultResponse> pageInfo = new PageInfo<>(ioOrderDetailCodeResponses);
         return ResultVOUtils.page(pageInfo);
     }
 

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

@@ -240,18 +240,18 @@ public class IoOrderDetailResultController extends BaseController {
             //查询第三方产品产品类别
             ThrProductsEntity thrProductsEntity = thrProductsService.filterThrProductsByMainId(ioOrderDetailResultResponse.getBindRlFk() + "");
             //查询发票信息
-            String dateStr="";
+            String dateStr = "";
-            List<String> encodeList=new ArrayList<>();
+            List<String> encodeList = new ArrayList<>();
-            IoOrderInvoiceRequest ioOrderInvoiceRequest=new IoOrderInvoiceRequest();
+            IoOrderInvoiceRequest ioOrderInvoiceRequest = new IoOrderInvoiceRequest();
             ioOrderInvoiceRequest.setBindRlFk(ioOrderDetailResultResponse.getBindRlFk() + "");
             ioOrderInvoiceRequest.setOrderIdFk(ioOrderDetailResultResponse.getOrderIdFk());
             ioOrderInvoiceRequest.setBatchNo(ioOrderDetailResultResponse.getBatchNo());
-            List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList=ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceRequest);
+            List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList = ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceRequest);
             for (IoOrderInvoiceEntity ioOrderInvoiceEntity : ioOrderInvoiceEntityList) {
                 encodeList.add(ioOrderInvoiceEntity.getInvoiceEncode());
             }
-            String encode=String.join(",", encodeList);
+            String encode = String.join(",", encodeList);
-            if(CollectionUtils.isNotEmpty(ioOrderInvoiceEntityList)){
+            if (CollectionUtils.isNotEmpty(ioOrderInvoiceEntityList)) {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 dateStr = sdf.format(ioOrderInvoiceEntityList.get(0).getCreateTime());
             }
@@ -278,7 +278,7 @@ public class IoOrderDetailResultController extends BaseController {
             ioOrderDetailResultData.put("billTypeName", ioOrderDetailResultResponse.getBillTypeName() == null ? ' ' : ioOrderDetailResultResponse.getBillTypeName());
             ioOrderDetailResultData.put("mainAction", ioOrderDetailResultResponse.getMainAction() == null ? ' ' : ioOrderDetailResultResponse.getMainAction());
             ioOrderDetailResultData.put("auditTime", ioOrderDetailResultResponse.getAuditTime() == null ? ' ' : formatter.format(ioOrderDetailResultResponse.getAuditTime()));
-            if(thrProductsEntity!=null){
+            if (thrProductsEntity != null) {
                 ioOrderDetailResultData.put("cplb", thrProductsEntity.getCplb() == null ? ' ' : thrProductsEntity.getCplb());
             }
             ioOrderDetailResultData.put("invoiceEncode", encode);
@@ -294,7 +294,6 @@ public class IoOrderDetailResultController extends BaseController {
     }
 
 
-
     /**
      * 提供UDI协调调用单据明细
      */
@@ -311,7 +310,7 @@ public class IoOrderDetailResultController extends BaseController {
                 if (cptTraceOrderResponse.getCorpType() == 1 || cptTraceOrderResponse.getCorpType() == 2) {
                     CptTraceResultResponse cptTraceResultResponse = new CptTraceResultResponse();
                     cptTraceResultResponse.setBillNo(cptTraceOrderResponse.getBillNo());
-                    cptTraceResultResponse.setBillDate(DateUtil.formatDate(cptTraceOrderResponse.getCreateTime()));
+                    cptTraceResultResponse.setBillDate(DateUtil.formatDate(cptTraceOrderResponse.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
                     cptTraceResultResponse.setBillType(cptTraceOrderResponse.getBillType());
                     if (cptTraceOrderResponse.getMainAction().equals(ConstantType.TYPE_OUT)) {
                         if (StrUtil.isNotEmpty(cptTraceOrderResponse.getFromInvCode()))

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

@@ -19,10 +19,7 @@ import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
 import com.glxp.api.req.inout.IoOrderInvoiceRequest;
 import com.glxp.api.req.inout.RefreshInoiceRequest;
 import com.glxp.api.req.system.DeleteRequest;
-import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
+import com.glxp.api.res.inout.*;
-import com.glxp.api.res.inout.IoOrderInvoiceResponse;
-import com.glxp.api.res.inout.IoOrderResponse;
-import com.glxp.api.res.inout.RefreshInoiceResponse;
 import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
 import com.glxp.api.service.inout.IoOrderDetailCodeService;
@@ -135,8 +132,8 @@ public class IoOrderInvoiceController {
             //查询单据详情
             FilterOrderDetailCodeRequest orderDetailBizRequest = new FilterOrderDetailCodeRequest();
             orderDetailBizRequest.setOrderIdFk(orderFk);
-            List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(orderDetailBizRequest);
+            List<IoOrderDetailResultResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(orderDetailBizRequest);
-            for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
+            for (IoOrderDetailResultResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
                 IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity();
                 BeanUtils.copyProperties(ioOrderInvoiceRequest, ioOrderInvoiceEntity);
                 ioOrderInvoiceEntity.setId(IdUtil.getSnowflakeNextId());

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

@@ -6,6 +6,7 @@ import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
 import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
+import com.glxp.api.res.inout.IoOrderDetailResultResponse;
 import com.glxp.api.res.inout.IoOrderInvoiceResponse;
 import org.apache.ibatis.annotations.Param;
 
@@ -23,11 +24,11 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus<IoOrderDetailBizDao,
 
     List<IoOrderDetailCodeResponse> getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest);
 
-    List<IoOrderDetailCodeResponse> getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest);
+    List<IoOrderDetailResultResponse> getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest);
 
     List<IoOrderInvoiceResponse> filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest);
 
-    List<IoOrderInvoiceResponse> selectByorderIdFk(String  orderIdFk);
+    List<IoOrderInvoiceResponse> selectByorderIdFk(String orderIdFk);
 
     IoOrderInvoiceResponse selectByinvoiceId(Long id);
 

src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java

@@ -163,4 +163,17 @@ public class IoOrderDetailResultResponse {
     private Date auditTime;
 
 
+
+    private int orderCount;
+
+    private String invoiceCodes;
+
+    private Integer sucCount;
+
+    private boolean regStatus;
+
+    //金额
+    private BigDecimal amount;
+
+
 }

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

@@ -5,6 +5,7 @@ import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
 import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
+import com.glxp.api.res.inout.IoOrderDetailResultResponse;
 import com.glxp.api.res.inout.IoOrderInvoiceResponse;
 
 import java.util.List;
@@ -38,7 +39,7 @@ public interface IoOrderDetailBizService {
 
     List<IoOrderDetailCodeResponse> getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest);
 
-    List<IoOrderDetailCodeResponse> getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest);
+    List<IoOrderDetailResultResponse> getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest);
 
     IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk);
 

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

@@ -96,7 +96,7 @@ public class IoOrderUtilsService {
                 ioCodeTempEntity1.setExpireDate(ioCodeEntity.getExpireDate());
                 ioCodeTempEntity1.setSerialNo(ioCodeEntity.getSerialNo());
                 ioCodeTempEntity1.setPackageLevel(ioCodeEntity.getPackageLevel());
-                ioCodeTempEntity1.setSupId(ioCodeEntity.getSupId());
+                ioCodeTempEntity1.setSupId(platformLinkRespons.getCustomerId());
                 ioCodeTempEntity1.setCount(ioCodeEntity.getCount());
                 ioCodeTempEntity1.setReCount(ioCodeEntity.getReCount());
                 ioCodeTempEntity1.setDeptCode(platformLinkRespons.getInvCode());
@@ -135,7 +135,7 @@ public class IoOrderUtilsService {
                 ioOrderDetailCodeEntity1.setPrice(ioOrderDetailCodeEntity.getPrice());
                 ioOrderDetailCodeEntity1.setSpec(ioOrderDetailCodeEntity.getSpec());
                 ioOrderDetailCodeEntity1.setCertCode(ioOrderDetailCodeEntity.getCertCode());
-                ioOrderDetailCodeEntity1.setSupId(ioOrderDetailCodeEntity.getSupId());
+                ioOrderDetailCodeEntity1.setSupId(platformLinkRespons.getCustomerId());
                 ioOrderDetailCodeEntity1.setBindSupStatus(ioOrderDetailCodeEntity.getBindSupStatus());
                 ioOrderDetailCodeEntity1.setCount(ioOrderDetailCodeEntity.getCount());
                 ioOrderDetailCodeEntity1.setReCount(ioOrderDetailCodeEntity.getReCount());
@@ -175,7 +175,7 @@ public class IoOrderUtilsService {
                 ioOrderDetailBizEntity1.setPrice(ioOrderDetailBizEntity.getPrice());
                 ioOrderDetailBizEntity1.setSpec(ioOrderDetailBizEntity.getSpec());
                 ioOrderDetailBizEntity1.setCertCode(ioOrderDetailBizEntity.getCertCode());
-                ioOrderDetailBizEntity1.setSupId(ioOrderDetailBizEntity.getSupId());
+                ioOrderDetailBizEntity1.setSupId(platformLinkRespons.getCustomerId());
                 ioOrderDetailBizEntity1.setBindSupStatus(ioOrderDetailBizEntity.getBindSupStatus());
                 ioOrderDetailBizEntity1.setCount(ioOrderDetailBizEntity.getCount());
                 ioOrderDetailBizEntity1.setFilePath(ioOrderDetailBizEntity.getFilePath());
@@ -215,7 +215,7 @@ public class IoOrderUtilsService {
                 ioOrderDetailResultEntity1.setPrice(ioOrderDetailResultEntity.getPrice());
                 ioOrderDetailResultEntity1.setSpec(ioOrderDetailResultEntity.getSpec());
                 ioOrderDetailResultEntity1.setCertCode(ioOrderDetailResultEntity.getCertCode());
-                ioOrderDetailResultEntity1.setSupId(ioOrderDetailResultEntity.getSupId());
+                ioOrderDetailResultEntity1.setSupId(platformLinkRespons.getCustomerId());
                 ioOrderDetailResultEntity1.setBindSupStatus(ioOrderDetailResultEntity.getBindSupStatus());
                 ioOrderDetailResultEntity1.setCount(ioOrderDetailResultEntity.getCount());
                 ioOrderDetailResultEntities.add(ioOrderDetailResultEntity1);
@@ -258,9 +258,7 @@ public class IoOrderUtilsService {
         ioOrderEntity1.setBillNo(billNO);
         ioOrderEntity1.setMainAction(ioOrderEntity.getMainAction());
         ioOrderEntity1.setAction(platformLinkRespons.getTargetAction());
-        ioOrderEntity1.setFromCorp(ioOrderEntity.getFromCorp());
+        ioOrderEntity1.setFromCorp(platformLinkRespons.getCustomerId());
-        ioOrderEntity1.setFromDeptCode(ioOrderEntity.getFromDeptCode());
-        ioOrderEntity1.setFromInvCode(ioOrderEntity.getFromInvCode());
         ioOrderEntity1.setOrderType(3);
         ioOrderEntity1.setFromType(1);
         if (!checkUdi) {
@@ -275,7 +273,7 @@ public class IoOrderUtilsService {
         ioOrderEntity1.setCreateUser(authAdmins.getId() + "");
         ioOrderEntity1.setUpdateUser(authAdmins.getId() + "");
         ioOrderEntity1.setUpdateTime(new Date());
-        ioOrderEntity1.setCustomerId(platformLinkRespons.getUnitId());
+        ioOrderEntity1.setCustomerId(platformLinkRespons.getCustomerId());
         ioOrderEntity1.setDeptCode(platformLinkRespons.getInvCode());
         ioOrderEntity1.setInvCode(platformLinkRespons.getInvSubCode());
 

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

@@ -14,6 +14,7 @@ import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
 import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
+import com.glxp.api.res.inout.IoOrderDetailResultResponse;
 import com.glxp.api.res.inout.IoOrderInvoiceResponse;
 import com.glxp.api.service.inout.IoCheckInoutService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
@@ -133,7 +134,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
     }
 
     @Override
-    public List<IoOrderDetailCodeResponse> getfilterOrderList(FilterOrderDetailCodeRequest OrderDetailCodeRequest) {
+    public List<IoOrderDetailResultResponse> getfilterOrderList(FilterOrderDetailCodeRequest OrderDetailCodeRequest) {
         if (null == OrderDetailCodeRequest) {
             return Collections.emptyList();
         }

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

@@ -301,13 +301,20 @@ public class IoOrderServiceImpl implements IoOrderService {
 
                 //更新扫码单据详情
                 IoOrderDetailCodeEntity ioOrderDetailCodeEntity = ioOrderDetailCodeService.findByUnique(ioCodeEntity.getOrderId(), ioCodeEntity.getRelId(), ioCodeEntity.getBatchNo());
-                ioOrderDetailCodeEntity.setReCount(ioOrderDetailCodeEntity.getReCount() - reCount);
+
-                ioOrderDetailCodeService.update(ioOrderDetailCodeEntity);
+                if (ioOrderDetailCodeEntity != null) {
+                    ioOrderDetailCodeEntity.setReCount(ioOrderDetailCodeEntity.getReCount() - reCount);
+                    ioOrderDetailCodeService.update(ioOrderDetailCodeEntity);
+                }
+
 
                 //更新结果详情
                 IoOrderDetailResultEntity ioOrderDetailResultEntity = ioOrderDetailResultService.findByUnique(ioCodeEntity.getOrderId(), ioCodeEntity.getRelId(), ioCodeEntity.getBatchNo());
-                ioOrderDetailResultEntity.setReCount(ioOrderDetailResultEntity.getReCount() - reCount);
+                if (ioOrderDetailResultEntity != null) {
-                ioOrderDetailResultService.update(ioOrderDetailResultEntity);
+                    ioOrderDetailResultEntity.setReCount(ioOrderDetailResultEntity.getReCount() - reCount);
+                    ioOrderDetailResultService.update(ioOrderDetailResultEntity);
+                }
+
             } else {
                 //如果数量扣减之后为0，直接删除此条码
                 codeService.deleteById(ioCodeEntity.getId());
@@ -371,15 +378,17 @@ public class IoOrderServiceImpl implements IoOrderService {
                     invPreProductService.update(invProductEntity);
                 } else {   //普通库存
                     InvProductDetailEntity invProductDetailEntity = invProductDetailService.selectByCode(billNo, code);
-                    int count = invProductDetailEntity.getCount() - 1;
+                    if (invProductDetailEntity != null) {
-                    if (count == 0) {
+                        int count = invProductDetailEntity.getCount() - 1;
-                        invProductDetailService.deleteById(invProductDetailEntity.getId());
+                        if (count == 0) {
-                    } else {
+                            invProductDetailService.deleteById(invProductDetailEntity.getId());
-                        //更新详情表
+                        } else {
-                        invProductDetailEntity.setCount(count);
+                            //更新详情表
-                        int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getNameCode());
+                            invProductDetailEntity.setCount(count);
-                        invProductDetailEntity.setReCount(invProductDetailEntity.getReCount() - reCount);
+                            int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getNameCode());
-                        invProductDetailService.update(invProductDetailEntity);
+                            invProductDetailEntity.setReCount(invProductDetailEntity.getReCount() - reCount);
+                            invProductDetailService.update(invProductDetailEntity);
+                        }
                     }
                     //更新产品表
                     InvProductEntity invProductEntity = invProductService.selectByUnique(invProductDetailEntity.getRelId(), invProductDetailEntity.getBatchNo(), invProductDetailEntity.getSupId(), invProductDetailEntity.getDeptCode(), invProductDetailEntity.getInvCode());

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

@@ -119,9 +119,9 @@
         </where>
     </select>
 
-    <select id="getfilterOrderList" resultType="com.glxp.api.res.inout.IoOrderDetailCodeResponse">
+    <select id="getfilterOrderList" resultType="com.glxp.api.res.inout.IoOrderDetailResultResponse">
         select *
-        from io_order_detail_code
+        from io_order_detail_result
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND orderIdFk = #{orderIdFk}
@@ -133,6 +133,6 @@
                 AND batchNo = #{batchNo}
             </if>
         </where>
-        group by io_order_detail_code.id
+        group by io_order_detail_result.id
     </select>
 </mapper>

src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml

@@ -67,7 +67,7 @@
     <select id="selectProductRemindMsgList" resultType="com.glxp.api.res.purchase.SupCertRemindMsgResponse">
         select m.*,
                c.recordProductName                                                              `name`,
-               (select `name` from sup_cert s where s.code = m.code and s.productIdFk = m.idFk) certName
+               (select `name` from sup_cert s where s.code = m.code and s.productIdFk = m.idFk limit 1) certName
         from sup_cert_remind_msg m
                  left join sup_product c on m.idFk = c.productId
         left join sup_cert bc on bc.code = m.code