Merge branch 'dev' into ywj_dev

# Conflicts:
#	src/main/resources/application-dev.yml
#	src/main/resources/schemas/schema_v2.2.sql

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";
+
 
 }

src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
 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.entity.inv.DeviceInspectTaskDetailEntity;
 import com.glxp.api.entity.inv.DeviceInspectTaskEntity;
 import com.glxp.api.req.inv.FilterDeviceInspectTakeRequest;
@@ -52,9 +53,9 @@ public class DeviceInspectTakeController {
     @PostMapping("/udiwms/inv/device/inspect/take/uploadDeviceInspecTake")
     public BaseResponse uploadDeviceInspecTake(@RequestBody DeviceInspectTaskEntity deviceInspectTaskEntity) {
         deviceInspectTaskEntity.setUpdateTime(new Date());
-        if(deviceInspectTaskEntity.getStatus() == 1){
+        if(deviceInspectTaskEntity.getStatus() == DeviceStatus.DEVICE_STATUS_TEMP_DURINGINSPECTTION){
             deviceInspectTaskEntity.setStrartTime(new Date());
-        }else{
+        }else if (deviceInspectTaskEntity.getStatus() == DeviceStatus.DEVICE_STATUS_TEMP_INSPECTED){
             deviceInspectTaskEntity.setEndTime(new Date());
         }
         boolean falg=deviceInspectTaskService.updateById(deviceInspectTaskEntity);

src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java

@@ -0,0 +1,95 @@
+package com.glxp.api.controller.inv;
+
+import cn.hutool.core.util.StrUtil;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity;
+import com.glxp.api.req.inv.FilterDeviceRepairOrderDetailRequest;
+import com.glxp.api.res.inv.DeviceRepairOrderDetailResponse;
+import com.glxp.api.service.inv.DeviceRepairOrderDetailService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 设备报修单接口
+ */
+@Slf4j
+@RestController
+public class DeviceRepairOrderDetailController {
+
+    @Resource
+    private DeviceRepairOrderDetailService deviceRepairOrderDetailService;
+
+    /**
+     * 查询设备报修单列表
+     *
+     * @param filterDeviceRepairOrderDetailRequest
+     * @return
+     */
+    @GetMapping("/udiwms/inv/device/repairDetail/order/filter")
+    public BaseResponse filterList(FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest) {
+        List<DeviceRepairOrderDetailResponse> list = deviceRepairOrderDetailService.filterList(filterDeviceRepairOrderDetailRequest);
+        PageInfo<DeviceRepairOrderDetailResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
+    @GetMapping("/udiwms/inv/device/repairDetail/order/filterByorderIdFk")
+    public BaseResponse filterByorderIdFk(String  orderIdFk) {
+        List<DeviceRepairOrderDetailEntity> detailEntity = deviceRepairOrderDetailService.filterByorderIdFk(orderIdFk);
+        return ResultVOUtils.success(detailEntity);
+
+    }
+
+
+    /**
+     * 添加设备报修单详情
+     *
+     * @param filterDeviceRepairOrderDetailRequest
+     * @return
+     */
+    @PostMapping("/udiwms/inv/device/repair/order/addDeviceRepairOrderDetail")
+    public BaseResponse addDeviceRepairOrderDetail(@RequestBody FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest) {
+
+        DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity = new DeviceRepairOrderDetailEntity();
+        BeanUtils.copyProperties(filterDeviceRepairOrderDetailRequest,deviceRepairOrderDetailEntity);
+
+        deviceRepairOrderDetailService.addDeviceRepairOrderDetail(deviceRepairOrderDetailEntity);
+        return ResultVOUtils.success(deviceRepairOrderDetailEntity);
+    }
+
+    /**
+     * 更新设备报修单信息详情
+     *
+     * @param filterDeviceRepairOrderDetailRequest
+     * @return
+     */
+    @PostMapping("/udiwms/inv/device/repair/order/updateDeviceRepairOrderDetail")
+    public BaseResponse updateDeviceRepairOrderDetail(@RequestBody FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest) {
+
+        DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity = new DeviceRepairOrderDetailEntity();
+        BeanUtils.copyProperties(filterDeviceRepairOrderDetailRequest,deviceRepairOrderDetailEntity);
+         deviceRepairOrderDetailService.updateDeviceRepairOrderDetail(deviceRepairOrderDetailEntity);
+        return ResultVOUtils.success();
+    }
+
+
+    /**
+     * 删除报修单详情
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/udiwms/inv/device/repair/order/deleteRepairOrderDetail")
+    public BaseResponse deleteRepairOrderDetail( String id) {
+        deviceRepairOrderDetailService.deleteRepairOrderDetail(id);
+        return ResultVOUtils.success();
+    }
+
+}

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);
 
     /**
      * 查询单条单据业务详情

src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java

@@ -0,0 +1,15 @@
+package com.glxp.api.dao.inv;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity;
+import com.glxp.api.req.inv.FilterDeviceRepairOrderDetailRequest;
+import com.glxp.api.res.inv.DeviceRepairOrderDetailResponse;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceRepairOrderDetailMapper extends BaseMapper<DeviceRepairOrderDetailEntity> {
+    List<DeviceRepairOrderDetailResponse> filterList(FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest);
+
+}

src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java

@@ -99,6 +99,12 @@ public class DeviceInspectTaskEntity implements Serializable {
     @TableField(value = "type")
     private Integer type;
 
+    @TableField(value = "repairType")
+    private Integer repairType;
+
+    @TableField(value = "level")
+    private Integer level;
+
 
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetailEntity.java

@@ -0,0 +1,55 @@
+package com.glxp.api.entity.inv;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName(value = "device_repair_order_detail")
+public class DeviceRepairOrderDetailEntity {
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @TableField(value = "orderIdFk")
+    private String orderIdFk;
+
+    /**
+     * 项目编号
+     */
+    @TableField(value = "code")
+    private String code;
+
+    /**
+     * 项目内容
+     */
+    @TableField(value = "content")
+    private String content;
+
+    /**
+     * 项目类型：1：巡检；2：养护
+     */
+    @TableField(value = "`type`")
+    private Integer type;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+    /**
+     * 更新人
+     */
+    @TableField(value = "updateUser")
+    private String updateUser;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    private Date updateTime;
+}

src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java

@@ -1,5 +1,6 @@
 package com.glxp.api.req.inv;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
@@ -61,4 +62,10 @@ public class FilterDeviceInspectTakeRequest extends ListPageRequest {
     private String yjjsEndDate;
 
 
+    private Integer repairType;
+
+
+
+
+
 }

src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderDetailRequest.java

@@ -0,0 +1,48 @@
+package com.glxp.api.req.inv;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 查询部门设备报修单接口参数
+ */
+@Data
+public class FilterDeviceRepairOrderDetailRequest extends ListPageRequest {
+
+    private Long id;
+
+    private String orderIdFk;
+
+    /**
+     * 项目编号
+     */
+    private String code;
+
+    /**
+     * 项目内容
+     */
+    private String content;
+
+    /**
+     * 项目类型：1：巡检；2：养护
+     */
+    private Integer type;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 更新人
+     */
+    private String updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}

src/main/java/com/glxp/api/res/inv/DeviceInspectTakeResponse.java

@@ -109,6 +109,8 @@ public class DeviceInspectTakeResponse {
     private String inspectName;
     private Date expectedTime;
     private Integer type;
+    private Integer repairType;
+    private Integer level;
 
 
 

src/main/java/com/glxp/api/res/inv/DeviceRepairOrderDetailResponse.java

@@ -0,0 +1,48 @@
+package com.glxp.api.res.inv;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 设备报修单VO
+ */
+@Data
+public class DeviceRepairOrderDetailResponse {
+    private Long id;
+
+    private String orderIdFk;
+
+    /**
+     * 项目编号
+     */
+    private String code;
+
+    /**
+     * 项目内容
+     */
+    private String content;
+
+    /**
+     * 项目类型：1：巡检；2：养护
+     */
+    private Integer type;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 更新人
+     */
+    private String updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+
+
+}

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

@@ -309,6 +309,7 @@ public class IoCheckInoutService {
         }
     }
 
+    @Resource
     SystemParamConfigService systemParamConfigService;
 
     public String checkCode(IoCodeTempEntity codeEntity) {
@@ -316,7 +317,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;
             }
         }

src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java

@@ -0,0 +1,26 @@
+package com.glxp.api.service.inv;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity;
+import com.glxp.api.req.inv.FilterDeviceRepairOrderDetailRequest;
+import com.glxp.api.res.inv.DeviceRepairOrderDetailResponse;
+
+import java.util.List;
+
+public interface DeviceRepairOrderDetailService extends IService<DeviceRepairOrderDetailEntity>{
+
+    List<DeviceRepairOrderDetailResponse> filterList(FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest);
+
+    List<DeviceRepairOrderDetailEntity> filterByorderIdFk(String orderIdFk);
+
+
+
+    boolean addDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity);
+
+    boolean updateDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity);
+
+    boolean deleteRepairOrderDetail(String id);
+
+
+
+}

src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java

@@ -0,0 +1,56 @@
+package com.glxp.api.service.inv.impl;
+
+import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.dao.inv.DeviceRepairOrderDetailMapper;
+import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity;
+import com.glxp.api.req.inv.FilterDeviceRepairOrderDetailRequest;
+import com.glxp.api.res.inv.DeviceRepairOrderDetailResponse;
+import com.glxp.api.service.inv.DeviceRepairOrderDetailService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class DeviceRepairOrderDetailServiceImpl extends ServiceImpl<DeviceRepairOrderDetailMapper, DeviceRepairOrderDetailEntity> implements DeviceRepairOrderDetailService{
+
+    @Resource
+    DeviceRepairOrderDetailMapper deviceRepairOrderDetailMapper;
+    @Override
+    public List<DeviceRepairOrderDetailResponse> filterList(FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest) {
+        if (null == filterDeviceRepairOrderDetailRequest) {
+            return Collections.emptyList();
+        }
+        if (null != filterDeviceRepairOrderDetailRequest.getPage() && null != filterDeviceRepairOrderDetailRequest.getLimit()) {
+            PageHelper.offsetPage((filterDeviceRepairOrderDetailRequest.getPage() - 1) * filterDeviceRepairOrderDetailRequest.getLimit(), filterDeviceRepairOrderDetailRequest.getLimit());
+        }
+        return deviceRepairOrderDetailMapper.filterList(filterDeviceRepairOrderDetailRequest);
+    }
+
+    @Override
+    public List<DeviceRepairOrderDetailEntity> filterByorderIdFk(String orderIdFk) {
+        return    deviceRepairOrderDetailMapper.selectList(new QueryWrapper<DeviceRepairOrderDetailEntity>().eq("orderIdFk", orderIdFk));
+
+    }
+
+    @Override
+    public boolean addDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity) {
+        deviceRepairOrderDetailEntity.setId(IdUtil.getSnowflakeNextId());
+        deviceRepairOrderDetailEntity.setType(3);
+        return  deviceRepairOrderDetailMapper.insert(deviceRepairOrderDetailEntity)>0;
+    }
+
+    @Override
+    public boolean updateDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity) {
+        return deviceRepairOrderDetailMapper.updateById(deviceRepairOrderDetailEntity)>0;
+    }
+
+    @Override
+    public boolean deleteRepairOrderDetail(String id) {
+        return deviceRepairOrderDetailMapper.deleteById(id)>0;
+    }
+}

src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java

@@ -2,18 +2,26 @@ package com.glxp.api.service.inv.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.DeviceRepairOrderEntity;
+import com.glxp.api.entity.inv.*;
 import com.glxp.api.req.inv.AddDeviceRepairOrderRequest;
 import com.glxp.api.req.inv.FilterDeviceRepairOrderRequest;
 import com.glxp.api.res.inv.DeviceRepairOrderResponse;
 import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.inv.DeviceInspectOrderService;
+import com.glxp.api.service.inv.DeviceInspectTaskDetailService;
+import com.glxp.api.service.inv.DeviceInspectTaskService;
 import com.glxp.api.service.inv.DeviceRepairOrderService;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.OrderNoTypeBean;
@@ -22,6 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -39,6 +48,15 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService {
     private GennerOrderUtils gennerOrderUtils;
     @Resource
     private DeviceInspectOrderService deviceInspectOrderService;
+    @Resource
+    private DeviceInspectTaskService deviceInspectTaskService;
+    @Resource
+    private DeviceInspectPlanDelectMapper deviceInspectPlanDelectMapper;
+    @Resource
+    private DeviceInspectTaskDetailService deviceInspectTaskDetailService;
+    @Resource
+    private DeviceRepairOrderDetailMapper deviceRepairOrderDetailMapper;
+
 
     @Override
     public List<DeviceRepairOrderResponse> filterList(FilterDeviceRepairOrderRequest filterDeviceRepairOrderRequest) {
@@ -67,7 +85,7 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService {
         deviceRepairOrderEntity.setPlanTime(addDeviceRepairOrderRequest.getPlanTime());
         deviceRepairOrderEntity.setUploadImage(addDeviceRepairOrderRequest.getUploadImage());
         deviceRepairOrderDao.insert(deviceRepairOrderEntity);
-        return ResultVOUtils.success();
+        return ResultVOUtils.success(deviceRepairOrderEntity);
     }
 
     @Override
@@ -76,7 +94,7 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService {
         BeanUtil.copyProperties(deviceRepairOrderEntity, repairOrderEntity, "id", "createTime", "createUser");
         repairOrderEntity.setUpdateTime(new Date());
         deviceRepairOrderDao.updateById(repairOrderEntity);
-        return ResultVOUtils.success();
+        return ResultVOUtils.success(repairOrderEntity);
     }
 
     @Override
@@ -92,27 +110,25 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService {
     }
 
     @Override
-    public BaseResponse updateStatus(String orderId, Integer status,String repariName) {
+    public BaseResponse updateStatus(String orderId, Integer status, String repariName) {
         if (StrUtil.isBlank(orderId) || null == status) {
             return ResultVOUtils.paramVerifyFail();
         }
-        AuthAdmin authAdmin=customerService.getUserBean();
+        AuthAdmin authAdmin = customerService.getUserBean();
         DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(orderId);
         deviceRepairOrderEntity.setStatus(status);
         Date date = new Date();
-//        if (status == 2) {
-//            //审核通过，生成维保单
-//            deviceInspectOrderService.addByRepairOrderId(orderId);
-//            deviceRepairOrderEntity.setAuditUser(customerService.getUserIdStr());
-//            deviceRepairOrderEntity.setAuditTime(date);
-//        }
         deviceRepairOrderEntity.setUpdateTime(date);
         deviceRepairOrderEntity.setAuditTime(date);
-        deviceRepairOrderEntity.setAuditUser(authAdmin.getId()+"");
+        deviceRepairOrderEntity.setAuditUser(authAdmin.getId() + "");
-        if(null != repariName){
+        if (null != repariName) {
             deviceRepairOrderEntity.setRepariName(repariName);
         }
         deviceRepairOrderDao.updateById(deviceRepairOrderEntity);
+        //生成计划主表
+        DeviceInspectTaskEntity deviceInspectTaskEntity = getDeviceInspectTaskEntity(orderId);
+        //生成计划详情主表
+        getDeviceInspectTaskDetailEntity(orderId, deviceInspectTaskEntity.getOrderId());
         return ResultVOUtils.success();
     }
 
@@ -154,4 +170,55 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService {
         return ResultVOUtils.success();
     }
 
+
+    //组装任务实体
+    public DeviceInspectTaskEntity getDeviceInspectTaskEntity(String orderId) {
+        //查询保修单
+        DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(orderId);
+        if (deviceRepairOrderEntity == null) {
+            return null;
+        }
+        String takeOrderId = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEVICE_INSPECT_TAKE_ORDER, "yyyyMMdd"));
+        DeviceInspectTaskEntity deviceInspectTaskEntity = new DeviceInspectTaskEntity();
+        deviceInspectTaskEntity.setOrderId(takeOrderId);
+        deviceInspectTaskEntity.setPlanOrderIdFk(orderId);
+        deviceInspectTaskEntity.setDeptCode(deviceRepairOrderEntity.getDeptCode());
+        deviceInspectTaskEntity.setInvCode(deviceRepairOrderEntity.getInvCode());
+        deviceInspectTaskEntity.setCode(deviceRepairOrderEntity.getCode());
+        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());
+        deviceInspectTaskService.addDeviceInspectTask(deviceInspectTaskEntity);
+        return deviceInspectTaskEntity;
+    }
+
+    //组装任务实体
+    public List<DeviceInspectTaskDetailEntity> getDeviceInspectTaskDetailEntity(String orderId, String taskOrderIdFk) {
+        //查询报修详情单
+        DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(orderId);
+        List<DeviceInspectTaskDetailEntity> deviceInspectTaskDetailEntityLis = new ArrayList<>();
+        QueryWrapper<DeviceRepairOrderDetailEntity> ew = new QueryWrapper<>();
+        ew.eq("orderIdFK", orderId);
+        List<DeviceRepairOrderDetailEntity> deviceRepairOrderDetailEntities = deviceRepairOrderDetailMapper.selectList(ew);
+        if (deviceRepairOrderDetailEntities == null && deviceRepairOrderDetailEntities.size() == 0) {
+            return null;
+        }
+        for (DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity : deviceRepairOrderDetailEntities) {
+            DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity = new DeviceInspectTaskDetailEntity();
+            deviceInspectTaskDetailEntity.setProjectCode(deviceRepairOrderDetailEntity.getCode());
+            deviceInspectTaskDetailEntity.setProjectContent(deviceRepairOrderDetailEntity.getContent());
+            deviceInspectTaskDetailEntity.setStatus(1);
+            deviceInspectTaskDetailEntity.setUpdateTime(new Date());
+            deviceInspectTaskDetailEntity.setTaskOrderIdFk(taskOrderIdFk);
+            deviceInspectTaskDetailEntityLis.add(deviceInspectTaskDetailEntity);
+        }
+        deviceInspectTaskDetailService.addDeviceInspectTaskDelectList(deviceInspectTaskDetailEntityLis);
+        return deviceInspectTaskDetailEntityLis;
+    }
+
+
 }

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);
 }

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;
+    }
+
     /**
      * 校验拉取的第三方数据是否有更新
      *

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());

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_pt?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_pzh?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

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,9 @@
       <if test="level != null">
         AND t.level = #{level}
       </if>
+      <if test="repairType != null">
+        AND t.repairType = #{repairType}
+      </if>
       <if test="status != null">
         AND t.status = #{status}
       </if>

src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.dao.inv.DeviceRepairOrderDetailMapper">
+  <resultMap id="BaseResultMap" type="com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity">
+    <!--@mbg.generated-->
+    <!--@Table device_repair_order_detail-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="orderIdFk" jdbcType="VARCHAR" property="orderIdFk" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="content" jdbcType="VARCHAR" property="content" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
+    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, orderIdFk, code, content, `type`, remark, updateUser, updateTime
+  </sql>
+
+  <select id="filterList" resultType="com.glxp.api.res.inv.DeviceRepairOrderDetailResponse">
+    select *
+    from device_repair_order_detail
+    <where>
+      <if test="orderIdFk != null and orderIdFk != ''">
+        AND orderIdFk like concat('%', #{orderIdFk}, '%')
+      </if>
+      <if test="code != null and code != ''">
+        AND code = #{code}
+      </if>
+      <if test="content != null and content != ''">
+        AND content like concat('%', #{content}, '%')
+      </if>
+      <if test="type != null ">
+        AND type = #{type}
+      </if>
+
+    </where>
+  </select>
+
+
+</mapper>

src/main/resources/schemas/schema_v2.2.sql

@@ -85,6 +85,10 @@ 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);
 
 
 CALL Pro_Temp_ColumnWork('io_order', 'preInSelected', 'tinyint', 1);