手持终端下载供应商问题

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

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.basic;
 
+import com.glxp.api.dao.basic.UdiRelevanceDao;
 import org.springframework.beans.BeanUtils;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
@@ -70,6 +71,9 @@ public class UdiRelevanceController extends BaseController {
     UdiRlSupService udiRlSupService;
     @Resource
     ProductInfoService productInfoService;
+    @Resource
+    UdiRelevanceDao udiRelevanceDao;
+
 
     //手持终端下载UDI产品信息
     @AuthRuleAnnotation("")
@@ -81,8 +85,7 @@ public class UdiRelevanceController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<UdiRelevanceResponse> udiRelevanceResponses = null;
-        udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiRelRequest);
+        udiRelevanceResponses = udiRelevanceDao.pdaDlUdiRel(filterUdiRelRequest);
-
         PageInfo<UdiRelevanceResponse> pageInfo;
         pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
@@ -246,7 +249,6 @@ public class UdiRelevanceController extends BaseController {
     }
 
 
-
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/udiinfo/selectProduct")
     public BaseResponse selectProduct(@RequestBody FilterUdiRelRequest filterUdiRelRequest) {
@@ -262,7 +264,6 @@ public class UdiRelevanceController extends BaseController {
     }
 
 
-
     //多选删除
     @AuthRuleAnnotation("")
     @PostMapping("/udi/udirel/deleteAll")

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

@@ -1033,14 +1033,9 @@ public class IoCodeTempController extends BaseController {
     //校验供应商唯一性
     public BaseResponse checkSupId(BasicBussinessTypeEntity bussinessTypeEntity, IoCodeTempEntity codeEnttity, String unitFk) {
         String originSupId = unitFk;
-//        if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
-//            if (unitFk != null)
-//                originSupId = unitFk;
-//        }
         if (originSupId != null) {
             codeEnttity.setSupId(originSupId);
         } else {
-
             IoCodeEntity ioCodeEntity = new IoCodeEntity();
             BeanUtils.copyProperties(codeEnttity, ioCodeEntity);
             String supId = transInoutService.checkInvExitSup(ioCodeEntity);

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

@@ -13,6 +13,10 @@ import java.util.List;
 public interface UdiRelevanceDao extends BaseMapperPlus<UdiRelevanceDao, UdiRelevanceEntity, UdiRelevanceEntity> {
 
     List<UdiRelevanceResponse> filterUdiRelevance(FilterUdiRelRequest filterUdiRelRequest);
+
+    List<UdiRelevanceResponse> pdaDlUdiRel(FilterUdiRelRequest filterUdiRelRequest);
+
+
     String selectPackLevel(@Param("nameCode") String nameCode);
 
 
@@ -123,7 +127,6 @@ public interface UdiRelevanceDao extends BaseMapperPlus<UdiRelevanceDao, UdiRele
     UdiRelevanceResponse selectOneUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest);
 
     /**
-     *
      * @param productName
      * @return
      */

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

@@ -622,7 +622,6 @@ public class IoAddInoutService {
     }
 
     public String checkInvExitSup(IoCodeEntity codeEnttity) {
-
         String supId = checkNorInv(codeEnttity);
         if (supId == null) {
             return checkPreInv(codeEnttity);

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

@@ -131,6 +131,130 @@
         </choose>
         ORDER BY modifyTime DESC
     </select>
+
+
+    <select id="pdaDlUdiRel" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
+            resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
+        select basic_udirel.*,
+               basic_udirel.id relId,
+               basic_products.originUuid,
+               basic_products.nameCode,
+               basic_products.deviceRecordKey,
+               basic_products.packRatio,
+               basic_products.packUnit,
+               basic_products.packLevel,
+               basic_products.bhxjsl,
+               basic_products.bhzxxsbzsl,
+               basic_products.zxxsbzbhsydysl,
+               basic_products.bhxjcpbm,
+               basic_products.bzcj,
+               basic_products.cpmctymc,
+               basic_products.cplb,
+               basic_products.flbm,
+               basic_products.ggxh,
+               basic_products.qxlb,
+               basic_products.tyshxydm,
+               basic_products.ylqxzcrbarmc,
+               basic_products.zczbhhzbapzbh,
+               basic_products.ylqxzcrbarywmc,
+               basic_products.sydycpbs,
+               basic_products.sjcpbm,
+               basic_products.versionNumber,
+               basic_products.diType,
+               basic_products.ybbm,
+               basic_products.sptm,
+               basic_products.manufactory,
+               basic_products.measname,
+               basic_products.productType,
+               basic_products.scbssfbhph,
+               basic_products.scbssfbhxlh,
+               basic_products.scbssfbhscrq,
+               basic_products.scbssfbhsxrq,
+               basic_products.cpms,
+               basic_products.allowNoBatch,
+               basic_products.allowNoExpire,
+               basic_products.allowNoProduct,
+               basic_products.allowNoSerial,
+
+               basic_products.spmc,
+               basic_products.cplx,
+               basic_products.hchzsb,
+               basic_products.cpdls,
+               basic_products.price,
+               basic_products.basicPrductRemak1,
+               basic_products.basicPrductRemak2,
+               basic_products.basicPrductRemak3,
+               basic_products.basicPrductRemak4,
+               basic_products.basicPrductRemak5,
+               basic_products.basicPrductRemak6,
+               basic_products.basicPrductRemak7,
+               basic_products.basicPrductRemak8
+        FROM basic_udirel
+                     inner JOIN basic_products ON basic_products.uuid = basic_udirel.uuid
+        <where>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
+            </if>
+            <if test="manufactory != '' and manufactory != null">
+                AND basic_products.manufactory LIKE concat('%', #{manufactory}, '%')
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode}, '%')
+            </if>
+            <if test="thirdId != '' and thirdId != null">
+                AND thirdId LIKE concat(#{thirdId}, '%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND basic_udirel.uuid = #{uuid}
+            </if>
+            <if test="id != '' and id != null">
+                AND basic_udirel.id = #{id}
+            </if>
+            <if test="udplatCode != '' and udplatCode != null">
+                AND basic_udirel.udplatCode = #{udplatCode}
+            </if>
+            <if test="diType != null">
+                AND basic_products.diType = #{diType}
+            </if>
+
+            <if test="lockStatus != '' and lockStatus != null">
+                AND basic_udirel.lockStatus = #{lockStatus}
+            </if>
+
+            <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
+                AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
+            </if>
+            <if test="lastUpdateTime != null and lastUpdateTime != ''">
+                <![CDATA[
+                and DATE_FORMAT(basic_udirel.updateTime, '%Y-%m-%d %H:%i:%S') >=
+                    DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
+            </if>
+            <if test="mainId != '' and mainId != null">
+                AND mainId = #{mainId}
+            </if>
+            <if test="unionFilterStr != '' and unionFilterStr != null">
+                or basic_products.cpmctymc LIKE concat('%', #{unionFilterStr}, '%')
+                or basic_products.ylqxzcrbarmc LIKE concat('%', #{unionFilterStr}, '%')
+                or basic_products.ggxh LIKE concat('%', #{unionFilterStr}, '%')
+                or basic_products.zczbhhzbapzbh LIKE concat('%', #{unionFilterStr}, '%')
+            </if>
+            <if test="isAdavence != '' and isAdavence != null">
+                AND isAdavence = #{isAdavence}
+            </if>
+            <if test="uniqueNameCode != '' and uniqueNameCode != null">
+                AND nameCode = #{uniqueNameCode}
+            </if>
+        </where>
+        <choose>
+            <when test="key != null and key != ''">
+                GROUP BY basic_udirel.id
+            </when>
+        </choose>
+    </select>
     <select id="selectPackLevel" parameterType="java.lang.String"
             resultType="java.lang.String">
         select basic_products.packLevel