diff --git a/src/main/java/com/glxp/api/constant/ThirdSysConstant.java b/src/main/java/com/glxp/api/constant/ThirdSysConstant.java
index 1d5fdb608..e13d60168 100644
--- a/src/main/java/com/glxp/api/constant/ThirdSysConstant.java
+++ b/src/main/java/com/glxp/api/constant/ThirdSysConstant.java
@@ -8,36 +8,42 @@ public interface ThirdSysConstant {
     /**
      * 仓库货位码查询
      */
-    public static final String WAREHOUSE_QUERY_URL = "warehouseQueryUrl";
+    String WAREHOUSE_QUERY_URL = "warehouseQueryUrl";
 
     /**
      * 业务单据提交
      */
-    public static final String ORDER_SUBMIT_URL = "orderSubmitUrl";
+    String ORDER_SUBMIT_URL = "orderSubmitUrl";
 
     /**
      * 业务单据查询
      */
-    public static final String ORDER_QUERY_URL = "orderQueryUrl";
+    String ORDER_QUERY_URL = "orderQueryUrl";
 
     /**
      * 单据类型查询
      */
-    public static final String BUS_TYPE_QUERY_URL = "busTypeQueryUrl";
+    String BUS_TYPE_QUERY_URL = "busTypeQueryUrl";
 
     /**
      * 仓库/科室查询
      */
-    public static final String invPiUrl = "invPiUrl";
+    String invPiUrl = "invPiUrl";
 
     /**
      * 往来单位查询
      */
-    public static final String CORP_URL = "corpUrl";
+    String CORP_URL = "corpUrl";
 
     /**
      * 产品信息查询
      */
-    public static final String PI_QUERY_URL = "piQueryUrl";
+    String PI_QUERY_URL = "piQueryUrl";
+
+    /**
+     * 产品信息提交
+     */
+    String PI_SUBMIT_URL = "productSubmitUrl";
+
 
 }
diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java
index 1e56cf232..8b89b4f18 100644
--- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java
+++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java
@@ -34,7 +34,7 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus<IoOrderDetailBizDao,
 
     IoOrderInvoiceResponse selectByinvoiceId(Long id);
 
-    IoOrderDetailBizEntity findByRelBatch(@Param("orderId") String orderId, @Param("relId") Long relId, @Param("bacthNo") String bacthNo);
+    IoOrderDetailBizEntity findByRelBatch(@Param("orderId") String orderId, @Param("relId") Long relId, @Param("batchNo") String batchNo);
 
     /**
      * 查询单条单据业务详情
diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java b/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java
index 240f2a381..4e0e3c3ba 100644
--- a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java
+++ b/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java
@@ -1,6 +1,5 @@
 package com.glxp.api.req.inv;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
@@ -64,6 +63,8 @@ public class FilterDeviceInspectTakeRequest extends ListPageRequest {
 
     private Integer repairType;
 
+    private Integer type;
+
 
 
 
diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
index 54bf762fa..a3513a247 100644
--- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
@@ -308,6 +308,7 @@ public class IoCheckInoutService {
         }
     }
 
+    @Resource
     SystemParamConfigService systemParamConfigService;
 
     public String checkCode(IoCodeTempEntity codeEntity) {
@@ -315,7 +316,7 @@ public class IoCheckInoutService {
         SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("only_vail_batch");
         boolean vailBatchNo = false;
         if (systemParamConfigEntity != null) {
-            if (systemParamConfigEntity.getParamValue().equals(1)) {
+            if (systemParamConfigEntity.getParamValue().equals("1")) {
                 vailBatchNo = true;
             }
         }
diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java
index 4261ad0d1..9bc6ccb9f 100644
--- a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java
@@ -7,9 +7,12 @@ import com.github.pagehelper.PageHelper;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.Constant;
+import com.glxp.api.constant.DeviceStatus;
+import com.glxp.api.constant.DeviceType;
 import com.glxp.api.dao.inv.DeviceInspectPlanDao;
 import com.glxp.api.dao.inv.DeviceInspectPlanDelectMapper;
 import com.glxp.api.dao.inv.DeviceRepairOrderDao;
+import com.glxp.api.dao.inv.DeviceRepairOrderDetailMapper;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.inv.*;
 import com.glxp.api.req.inv.AddDeviceRepairOrderRequest;
@@ -52,7 +55,7 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService {
     @Resource
     private DeviceInspectTaskDetailService deviceInspectTaskDetailService;
     @Resource
-    private DeviceInspectPlanDao deviceInspectPlanDao;
+    private DeviceRepairOrderDetailMapper deviceRepairOrderDetailMapper;
 
 
     @Override
@@ -182,7 +185,10 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService {
         deviceInspectTaskEntity.setDeptCode(deviceRepairOrderEntity.getDeptCode());
         deviceInspectTaskEntity.setInvCode(deviceRepairOrderEntity.getInvCode());
         deviceInspectTaskEntity.setCode(deviceRepairOrderEntity.getCode());
-        deviceInspectTaskEntity.setStatus(0);
+        deviceInspectTaskEntity.setStatus(DeviceStatus.DEVICE_STATUS_TEMP_SAVE);
+        deviceInspectTaskEntity.setType(DeviceType.TYPE_REPAIR);
+        deviceInspectTaskEntity.setLevel(deviceRepairOrderEntity.getUrgencyType());
+        deviceInspectTaskEntity.setRepairType(deviceRepairOrderEntity.getRepairType());
         deviceInspectTaskEntity.setRemark(deviceRepairOrderEntity.getRemark());
         deviceInspectTaskEntity.setCreateTime(new Date());
         deviceInspectTaskEntity.setUpdateTime(new Date());
@@ -192,21 +198,20 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService {
 
     //组装任务实体
     public List<DeviceInspectTaskDetailEntity> getDeviceInspectTaskDetailEntity(String orderId, String taskOrderIdFk) {
-        //查询计划详情单
-        DeviceInspectPlanEntity deviceInspectPlanEntity = deviceInspectPlanDao.selectByOrderId(orderId);
+        //查询报修详情单
+        DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(orderId);
         List<DeviceInspectTaskDetailEntity> deviceInspectTaskDetailEntityLis = new ArrayList<>();
-        QueryWrapper<DeviceInspectPlanDelectEntity> ew = new QueryWrapper<>();
+        QueryWrapper<DeviceRepairOrderDetailEntity> ew = new QueryWrapper<>();
         ew.eq("orderIdFK", orderId);
-        List<DeviceInspectPlanDelectEntity> deviceInspectPlanDelectEntityList = deviceInspectPlanDelectMapper.selectList(ew);
-        if (deviceInspectPlanDelectEntityList == null && deviceInspectPlanDelectEntityList.size() == 0) {
+        List<DeviceRepairOrderDetailEntity> deviceRepairOrderDetailEntities = deviceRepairOrderDetailMapper.selectList(ew);
+        if (deviceRepairOrderDetailEntities == null && deviceRepairOrderDetailEntities.size() == 0) {
             return null;
         }
-        for (DeviceInspectPlanDelectEntity deviceInspectPlanDelectEntity : deviceInspectPlanDelectEntityList) {
+        for (DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity : deviceRepairOrderDetailEntities) {
             DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity = new DeviceInspectTaskDetailEntity();
-            deviceInspectTaskDetailEntity.setProjectCode(deviceInspectPlanEntity.getCode());
-            deviceInspectTaskDetailEntity.setProjectContent(deviceInspectPlanDelectEntity.getContent());
+            deviceInspectTaskDetailEntity.setProjectCode(deviceRepairOrderDetailEntity.getCode());
+            deviceInspectTaskDetailEntity.setProjectContent(deviceRepairOrderDetailEntity.getContent());
             deviceInspectTaskDetailEntity.setStatus(1);
-            deviceInspectTaskDetailEntity.setInspectUser(deviceInspectPlanEntity.getInspectUser());
             deviceInspectTaskDetailEntity.setUpdateTime(new Date());
             deviceInspectTaskDetailEntity.setTaskOrderIdFk(taskOrderIdFk);
             deviceInspectTaskDetailEntityLis.add(deviceInspectTaskDetailEntity);
diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java
index 2c7ce9439..943091b3b 100644
--- a/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java
+++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java
@@ -7,6 +7,7 @@ import com.glxp.api.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
 import com.glxp.api.req.thrsys.FilterThrProductsRequest;
 import com.glxp.api.req.thrsys.PostThrProductsRequest;
+import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.res.thrsys.ThrProductsResponse;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.web.multipart.MultipartFile;
@@ -46,7 +47,6 @@ public interface ThrProductsService extends IService<ThrProductsEntity> {
     /**
      * 导入第三方产品信息
      *
-     * @param files
      * @param thirdSys
      * @return
      */
@@ -74,7 +74,14 @@ public interface ThrProductsService extends IService<ThrProductsEntity> {
      * @param filterThrProductsRequest
      * @return
      */
-    BaseResponse downloadByRequest(FilterThrProductsRequest filterThrProductsRequest);
+    BaseResponse downloadByRequest(FilterThrProductsRequest filterThrProductsRequest);  
 
     ThrProductsEntity filterThrProductsByMainId(String relId);
+
+    /**
+     * 上传本地变更产品信息
+     *
+     * @return
+     */
+    BaseResponse uploadThrProduct(ThrSystemDetailEntity thrSystemDetailEntity);
 }
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 9fc482659..967ea650c 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
@@ -17,8 +17,10 @@ import com.glxp.api.http.ErpBasicClient;
 import com.glxp.api.req.thrsys.FilterThrProductsRequest;
 import com.glxp.api.req.thrsys.PostThrProductsRequest;
 import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.res.thrsys.ThrProductsResponse;
 import com.glxp.api.service.thrsys.ThrProductsService;
+import com.glxp.api.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
@@ -281,6 +283,23 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
         return thrProductsDao.filterThrProductsByMainId(relId);
     }
 
+
+    @Resource
+    RedisUtil redisUtil;
+
+    @Override
+    public BaseResponse uploadThrProduct(ThrSystemDetailEntity thrSystemDetailEntity) {
+        //上次修改时间
+        String lastUploadTime = (String) redisUtil.get("THR_PI_UPLOAD_TIME");
+        if (StrUtil.isEmpty(lastUploadTime)) {
+            //下载耗材字典最新维护数据
+
+            //下载第三方产品信息
+
+        }
+        return null;
+    }
+
     /**
      * 校验拉取的第三方数据是否有更新
      *
diff --git a/src/main/java/com/glxp/api/task/SyncThirdSysTask.java b/src/main/java/com/glxp/api/task/SyncThirdSysTask.java
index 5e8150536..a22ea3230 100644
--- a/src/main/java/com/glxp/api/task/SyncThirdSysTask.java
+++ b/src/main/java/com/glxp/api/task/SyncThirdSysTask.java
@@ -125,6 +125,8 @@ public class SyncThirdSysTask implements SchedulingConfigurer {
                     case ThirdSysConstant.ORDER_QUERY_URL:
                         downloadThrOrder(thrSystemDetailEntity);
                         break;
+                    case ThirdSysConstant.PI_SUBMIT_URL:
+                        break;
                     default:
                         //其他接口暂不处理
                         break;
@@ -269,6 +271,29 @@ public class SyncThirdSysTask implements SchedulingConfigurer {
         }
     }
 
+
+    /**
+     * 上传第三方产品信息
+     *
+     * @param thrSystemDetailEntity
+     */
+    private void submitThrProduct(ThrSystemDetailEntity thrSystemDetailEntity) {
+        //校验任务并更新redis数据执行标识
+        if (verifyTask(thrSystemDetailEntity)) {
+            getExecutor().submit(() -> {
+                log.info("开始下载第三方业务单据");
+                try {
+                    thrProductsService.uploadThrProduct(thrSystemDetailEntity);
+                } catch (Exception e) {
+                    log.error("下载第三方业务单据", e);
+                } finally {
+                    updateTask(getTaskKey(thrSystemDetailEntity));
+                }
+                log.info("第三方业务单据下载完成");
+            });
+        }
+    }
+
     /**
      * 更新任务状态为已完成
      *
@@ -289,7 +314,7 @@ public class SyncThirdSysTask implements SchedulingConfigurer {
      */
     private boolean verifyTask(ThrSystemDetailEntity thrSystemDetailEntity) {
         String taskKey = getTaskKey(thrSystemDetailEntity);
-         ThirdSysInterfaceExecuteVo vo = getLastResult(taskKey);
+        ThirdSysInterfaceExecuteVo vo = getLastResult(taskKey);
         if (null != vo && !vo.isFinished()) {
             log.info(vo.getKey() + "有任务尚未执行完成，当前任务key：{}", taskKey);
             return false;
@@ -298,12 +323,12 @@ public class SyncThirdSysTask implements SchedulingConfigurer {
         if (vo != null) {
             long lastTime = vo.getNextTime();
 
-             long timeInterval = Long.parseLong(thrSystemDetailEntity.getTime().intValue() + "") * 1000 * 60;
+            long timeInterval = Long.parseLong(thrSystemDetailEntity.getTime().intValue() + "") * 1000 * 60;
             if (curTime - lastTime < timeInterval) {
                 log.info("定时任务时间未到---" + taskKey);
                 return false;
             } else {
-                 return true;
+                return true;
             }
         } else {
             vo = Optional.ofNullable(vo).orElse(new ThirdSysInterfaceExecuteVo());
diff --git a/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml b/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml
index 0caccb29c..0d40e5067 100644
--- a/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml
+++ b/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml
@@ -44,6 +44,8 @@
     t.remark,
     t.remindTime,
     t.expectedTime,
+    t.repairType,
+    t.level,
     (select `name` from auth_dept where code = t.deptCode)       deptName,
     (select `name` from auth_warehouse where code = t.invCode)   invName,
     ( SELECT `employeeName` FROM auth_user WHERE id = t.inspectUser ) inspectName,
@@ -69,6 +71,12 @@
       <if test="level != null">
         AND t.level = #{level}
       </if>
+      <if test="type != null">
+        AND t.type = #{type}
+      </if>
+      <if test="repairType != null">
+        AND t.repairType = #{repairType}
+      </if>
       <if test="status != null">
         AND t.status = #{status}
       </if>
diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
index f40d69dae..f0ec81f00 100644
--- a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
@@ -121,6 +121,7 @@
         SELECT pur_apply_detail.*,
                pur_apply.billNo,
                basic_products.ggxh spec,
+               basic_products.nameCode,
                basic_products.measname,
                basic_products.manufactory,
                basic_products.ylqxzcrbarmc,
diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml
index fc9c249b9..d9a614695 100644
--- a/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml
@@ -139,6 +139,7 @@
     <select id="selectDetailList" resultType="com.glxp.api.res.purchase.PurOrderDetailResponse">
         SELECT pur_order_detail.*,
                pur_order.billNo,
+               basic_products.nameCode,
                basic_products.ggxh spec,
                basic_products.measname,
                basic_products.manufactory,
diff --git a/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml
index f79f68c0f..531f386fa 100644
--- a/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml
@@ -137,6 +137,7 @@
         pur_plan.billNo,
         basic_products.ggxh spec,
         basic_products.measname,
+        basic_products.nameCode,
         basic_products.manufactory,
         basic_products.ylqxzcrbarmc,
         basic_corp.`name` supName
@@ -174,4 +175,4 @@
               and pur_plan.status=3
         </where>
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/schemas/schema_v2.2.sql b/src/main/resources/schemas/schema_v2.2.sql
index 72d6e2edc..f86b25806 100644
--- a/src/main/resources/schemas/schema_v2.2.sql
+++ b/src/main/resources/schemas/schema_v2.2.sql
@@ -85,6 +85,7 @@ CALL Pro_Temp_ColumnWork('device_inspect_plan', 'planStatus', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('device_inspect_plan', 'inspectUser', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('device_inspect_plan', 'lastTime', 'datetime', 1);
 CALL Pro_Temp_ColumnWork('device_inspect_plan', 'nextTime', 'datetime', 1);
+INSERT ignore INTO  `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) VALUES (2088, 0, '是否只校验批次号', 'only_vail_batch', '0', 0, 0, '是否只校验批次号(0：否；1：是)', NULL);
 
 CALL Pro_Temp_ColumnWork('device_inspect_task', 'repairType', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('device_inspect_task', 'level', 'tinyint', 1);