diff --git a/src/main/java/com/glxp/api/req/thrsys/PostRelProductRequest.java b/src/main/java/com/glxp/api/req/thrsys/PostRelProductRequest.java
index 8affbbace..032722529 100644
--- a/src/main/java/com/glxp/api/req/thrsys/PostRelProductRequest.java
+++ b/src/main/java/com/glxp/api/req/thrsys/PostRelProductRequest.java
@@ -11,5 +11,6 @@ public class PostRelProductRequest {
     private String uploadType;
     private String thirdSys;
     List<UdiRelevanceResponse> datas;
+    UdiRelevanceResponse udiRelevanceResponse;
 
 }
diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
index 46b1eb11d..9c099a957 100644
--- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
@@ -499,10 +499,10 @@ public class IoAddInoutService {
         BaseResponse baseResponse = checkInv(bussinessTypeEntity, pdaPostOrderRequest.getOrderDetailBizEntities(), orderEntity, pdaPostOrderRequest.getCodeTempEntities());
         if (baseResponse != null)
             return baseResponse;
-
+        List<IoCodeTempEntity> codeTempEntities = BeanUtil.copyToList(pdaPostOrderRequest.getCodeTempEntities(), IoCodeTempEntity.class);
         String priceFifo = systemParamConfigService.selectValueByParamKey("price_fifo");
         if (IntUtil.value(priceFifo) > 0 && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
-            List<IoCodeTempEntity> codeTempEntities = BeanUtil.copyToList(pdaPostOrderRequest.getCodeTempEntities(), IoCodeTempEntity.class);
+
             List<IoCodeTempEntity> resultList = new ArrayList<>();
             for (IoCodeTempEntity codeTempEntity : codeTempEntities) {
                 resultList = checkPrice(codeTempEntity, bussinessTypeEntity, resultList);
@@ -520,10 +520,10 @@ public class IoAddInoutService {
         orderService.insertOrder(orderEntity);
 
         if (CollUtil.isNotEmpty(pdaPostOrderRequest.getCodeTempEntities())) {
-            for (IoCodeTempEntity codeTempEntity : pdaPostOrderRequest.getCodeTempEntities()) {
+            for (IoCodeTempEntity codeTempEntity : codeTempEntities) {
                 codeTempEntity.setOrderId(orderNo);
             }
-            codeTempService.insertBatch(pdaPostOrderRequest.getCodeTempEntities());
+            codeTempService.insertBatch(codeTempEntities);
         }
 
         dealProcess(orderEntity);
diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
index aa11d6d6f..439f57692 100644
--- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
@@ -4,8 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.req.thrsys.PostRelProductRequest;
 import com.glxp.api.service.basic.UdiRelevanceService;
-import com.glxp.api.util.BeanCopyUtils;
-import com.glxp.api.util.CustomUtil;
+import com.glxp.api.util.*;
 import org.apache.regexp.RE;
 import org.springframework.beans.BeanUtils;
 import cn.hutool.core.bean.copier.CopyOptions;
@@ -32,8 +31,6 @@ import com.glxp.api.res.thrsys.ThrProductsResponse;
 import com.glxp.api.service.basic.UdiContrastService;
 import com.glxp.api.service.system.SystemParamConfigService;
 import com.glxp.api.service.thrsys.ThrProductsService;
-import com.glxp.api.util.IntUtil;
-import com.glxp.api.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
@@ -327,8 +324,8 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
     public BaseResponse uploadThrProduct(ThrSystemDetailEntity thrSystemDetailEntity) {
         //上次修改时间
         String lastUploadTime = (String) redisUtil.get("THR_PI_UPLOAD_TIME");
-        String currentTime = DateUtil.formatTime(new Date());
-        if (StrUtil.isEmpty(lastUploadTime)) {
+        String currentTime = MsDateUtil.formatDateTime(new Date());
+        if (StrUtil.isNotEmpty(lastUploadTime)) {
             //获取耗材字典最新维护数据
             FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
             filterUdiRelRequest.setLastUpdateTime(lastUploadTime);
@@ -337,23 +334,31 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
                 List<UdiRelevanceResponse> filteredList = udiRelevanceResponses.stream()
                         .filter(item ->
                                 {
-                                    if (StrUtil.isNotEmpty(item.getNameCode()) || StrUtil.isNotEmpty(item.getBasicPrductRemak8())) {
+                                    if ((StrUtil.isNotEmpty(item.getNameCode()) && StrUtil.isEmpty(item.getMainId())
+                                            || (StrUtil.isNotEmpty(item.getNameCode()) && StrUtil.isNotEmpty(item.getMainId()) && StrUtil.isNotEmpty(item.getBasicPrductRemak8()))
+                                    )) {
                                         return true;
                                     } else return false;
                                 }
                         )
                         .collect(Collectors.toList());
 
-                List<List<UdiRelevanceResponse>> splitList = CustomUtil.splitList(filteredList, 10);
-                for (List<UdiRelevanceResponse> temps : splitList) {
+//                List<List<UdiRelevanceResponse>> splitList = CustomUtil.splitList(filteredList, 10);
+                for (UdiRelevanceResponse udiRelevanceResponse : filteredList) {
                     PostRelProductRequest postRelProductRequest = new PostRelProductRequest();
                     postRelProductRequest.setUploadType("1");
                     postRelProductRequest.setThirdSys(thrSystemDetailEntity.getThirdSysFk());
-                    postRelProductRequest.setDatas(temps);
+                    postRelProductRequest.setUdiRelevanceResponse(udiRelevanceResponse);
                     //上传第三方产品信息
                     BaseResponse baseResponse = erpBasicClient.postRelProduct(postRelProductRequest);
                     if (baseResponse.getCode() != 20000) {
                         return ResultVOUtils.error(500, "上传失败！" + baseResponse.getMessage());
+                    } else {
+                        String thirdCode = (String) baseResponse.getData();
+                        UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectById(udiRelevanceResponse.getId());
+                        udiRelevanceEntity.setThirdId(thirdCode);
+                        udiRelevanceEntity.setMainId(thirdCode);
+                        udiRelevanceDao.updateById(udiRelevanceEntity);
                     }
                 }
                 redisUtil.set("THR_PI_UPLOAD_TIME", currentTime);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index eff144325..e7acbb9df 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ph?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 993cf15d1..87f4990a3 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -412,7 +412,8 @@
             </if>
             <if test="lastUpdateTime != null and lastUpdateTime != ''">
                 <![CDATA[
-                and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
+                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">
@@ -1218,70 +1219,70 @@
 
     <insert id="insertUdiRelevance" keyProperty="id" parameterType="com.glxp.api.entity.basic.UdiRelevanceEntity">
         replace
-                INTO basic_udirel
-                (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
-                 isLock,
-                 lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
-                 updateUser,
-                 remark, useExpireTime, dispatch, groupBuy, needCert)
+        INTO basic_udirel
+        (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
+        isLock,
+        lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
+        updateUser,
+        remark, useExpireTime, dispatch, groupBuy, needCert)
         values (#{id},
-                #{uuid},
-                #{mainId},
-                #{thirdId},
-                #{thirdId1},
-                #{thirdId2},
-                #{thirdId3},
-                #{thirdId4},
-                #{udplatCode},
-                #{isUseDy},
-                #{isDisable},
-                #{isLock},
-                #{lockStatus},
-                #{isAdavence},
-                #{useMuti},
-                #{useNum},
-                #{supName},
-                #{createTime},
-                #{updateTime},
-                #{modifyTime},
-                #{createUser},
-                #{updateUser},
-                #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert})
+        #{uuid},
+        #{mainId},
+        #{thirdId},
+        #{thirdId1},
+        #{thirdId2},
+        #{thirdId3},
+        #{thirdId4},
+        #{udplatCode},
+        #{isUseDy},
+        #{isDisable},
+        #{isLock},
+        #{lockStatus},
+        #{isAdavence},
+        #{useMuti},
+        #{useNum},
+        #{supName},
+        #{createTime},
+        #{updateTime},
+        #{modifyTime},
+        #{createUser},
+        #{updateUser},
+        #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert})
     </insert>
 
     <insert id="insertUdiRelevanceignore"
             parameterType="com.glxp.api.entity.basic.UdiRelevanceEntity">
         insert
-                ignore
+        ignore
         INTO basic_udirel
-                (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
-                 isLock,
-                 lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
-                 updateUser,
-                 remark, useExpireTime, dispatch, groupBuy, needCert)
+        (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
+        isLock,
+        lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
+        updateUser,
+        remark, useExpireTime, dispatch, groupBuy, needCert)
         values (#{id},
-                #{uuid},
-                #{mainId},
-                #{thirdId},
-                #{thirdId1},
-                #{thirdId2},
-                #{thirdId3},
-                #{thirdId4},
-                #{udplatCode},
-                #{isUseDy},
-                #{isDisable},
-                #{isLock},
-                #{lockStatus},
-                #{isAdavence},
-                #{useMuti},
-                #{useNum},
-                #{supName},
-                #{createTime},
-                #{updateTime},
-                #{modifyTime},
-                #{createUser},
-                #{updateUser},
-                #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert})
+        #{uuid},
+        #{mainId},
+        #{thirdId},
+        #{thirdId1},
+        #{thirdId2},
+        #{thirdId3},
+        #{thirdId4},
+        #{udplatCode},
+        #{isUseDy},
+        #{isDisable},
+        #{isLock},
+        #{lockStatus},
+        #{isAdavence},
+        #{useMuti},
+        #{useNum},
+        #{supName},
+        #{createTime},
+        #{updateTime},
+        #{modifyTime},
+        #{createUser},
+        #{updateUser},
+        #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert})
     </insert>
 
     <delete id="deleteById" parameterType="Map">
@@ -1422,106 +1423,106 @@
 
     <insert id="importUdiRelevance" parameterType="java.util.List">
         replace
-                into basic_udirel
-                (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
-                 isLock,
-                 lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
-                 updateUser,
-                 remark, useExpireTime, dispatch, groupBuy, needCert)
-                values
+        into basic_udirel
+        (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
+        isLock,
+        lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
+        updateUser,
+        remark, useExpireTime, dispatch, groupBuy, needCert)
+        values
 
         <foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
             (#{item.id},
-             #{item.uuid},
-             #{item.mainId},
-             #{item.thirdId},
-             #{item.thirdId1},
-             #{item.thirdId2},
-             #{item.thirdId3},
-             #{item.thirdId4},
-             #{item.udplatCode},
-             #{item.isUseDy},
-             #{item.isDisable},
-             #{item.isLock},
-             #{item.lockStatus},
-             #{item.isAdavence},
-             #{item.useMuti},
-             #{item.useNum},
-             #{item.supName},
-             #{item.createTime},
-             #{item.updateTime},
-             #{item.modifyTime},
-             #{item.createUser},
-             #{item.updateUser},
-             #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}, #{item.needCert})
+            #{item.uuid},
+            #{item.mainId},
+            #{item.thirdId},
+            #{item.thirdId1},
+            #{item.thirdId2},
+            #{item.thirdId3},
+            #{item.thirdId4},
+            #{item.udplatCode},
+            #{item.isUseDy},
+            #{item.isDisable},
+            #{item.isLock},
+            #{item.lockStatus},
+            #{item.isAdavence},
+            #{item.useMuti},
+            #{item.useNum},
+            #{item.supName},
+            #{item.createTime},
+            #{item.updateTime},
+            #{item.modifyTime},
+            #{item.createUser},
+            #{item.updateUser},
+            #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}, #{item.needCert})
         </foreach>
     </insert>
 
     <select id="selectGroupByNameCode" parameterType="java.lang.String"
             resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
         select basic_udirel.*,
-               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,
-               basic_products.sfwblztlcp,
-               basic_products.cgzmraqxgxx,
-               basic_products.sfbjwycxsy,
-               basic_products.zdcfsycs,
-               basic_products.sfwwjbz,
-               basic_products.syqsfxyjxmj,
-               basic_products.mjfs,
-               basic_products.categoryName
+        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,
+        basic_products.sfwblztlcp,
+        basic_products.cgzmraqxgxx,
+        basic_products.sfbjwycxsy,
+        basic_products.zdcfsycs,
+        basic_products.sfwwjbz,
+        basic_products.syqsfxyjxmj,
+        basic_products.mjfs,
+        basic_products.categoryName
         FROM basic_udirel
-                     INNER JOIN basic_products
-                on basic_udirel.uuid = basic_products.uuid
+        INNER JOIN basic_products
+        on basic_udirel.uuid = basic_products.uuid
         <where>
             <if test="nameCode != null">
                 AND nameCode = #{nameCode}
@@ -1543,14 +1544,14 @@
     <select id="selectProductNameByRelId" resultType="java.lang.String">
         select basic_products.cpmctymc
         from basic_udirel
-                     left join basic_products on basic_udirel.uuid = basic_products.uuid
+        left join basic_products on basic_udirel.uuid = basic_products.uuid
         where basic_udirel.id = #{relId}
     </select>
 
     <update id="updateBatchById" parameterType="java.util.List">
         <foreach collection="list" item="item" separator=";">
             update
-                    basic_udirel
+            basic_udirel
             set `relCode` = #{item.relCode}
             where id = #{item.id}
         </foreach>
@@ -1572,79 +1573,79 @@
     <select id="selectRelIdByNameCode" resultType="java.lang.String">
         select basic_udirel.id
         from basic_udirel
-                     inner join basic_products on basic_udirel.uuid = basic_products.uuid
+        inner join basic_products on basic_udirel.uuid = basic_products.uuid
         where basic_products.nameCode = #{nameCode}
     </select>
 
     <select id="selectOneUdiJoinSup" resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
         select basic_udirel.*,
-               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,
-               company_product_relevance.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,
-               basic_products.sfwblztlcp,
-               basic_products.cgzmraqxgxx,
-               basic_products.sfbjwycxsy,
-               basic_products.zdcfsycs,
-               basic_products.sfwwjbz,
-               basic_products.syqsfxyjxmj,
-               basic_products.mjfs,
-               basic_products.categoryName,
-               company_product_relevance.unitFk,
-               basic_corp.name companyName
+        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,
+        company_product_relevance.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,
+        basic_products.sfwblztlcp,
+        basic_products.cgzmraqxgxx,
+        basic_products.sfbjwycxsy,
+        basic_products.zdcfsycs,
+        basic_products.sfwwjbz,
+        basic_products.syqsfxyjxmj,
+        basic_products.mjfs,
+        basic_products.categoryName,
+        company_product_relevance.unitFk,
+        basic_corp.name companyName
         FROM basic_udirel
-                     inner JOIN basic_products
-                ON basic_products.uuid = basic_udirel.uuid
-                     left join company_product_relevance
-                on basic_udirel.id = company_product_relevance.udiRlIdFk
-                     left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId
+        inner JOIN basic_products
+        ON basic_products.uuid = basic_udirel.uuid
+        left join company_product_relevance
+        on basic_udirel.id = company_product_relevance.udiRlIdFk
+        left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId
         <where>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
                 AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')