diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java index 714953072..a9e49d79c 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java @@ -29,6 +29,7 @@ import org.slf4j.LoggerFactory; import org.springblade.common.constant.LogpmDataStatusEnum; import org.springblade.common.constant.PackagesTypeEnum; import org.springblade.common.utils.CommonUtil; +import org.springblade.core.tool.api.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -428,24 +429,41 @@ public class FactoryXxlJob { @XxlJob("factoryByOpOrderPackageCodeJobHandlerIn") public ReturnT factoryByOpOrderPackageCodeJobHandlerIn(String param) throws Exception { + + List split = new ArrayList<>(); + List codes = new ArrayList<>(); + if (StringUtils.isBlank(param)) { - return ReturnT.FAIL; +// return ReturnT.FAIL; + // 查询数据库 + List packagePushAgain = factoryOrderMapper.findPackagePushAgain(1); + + for (JSONObject jsonObject : packagePushAgain) { + split.add(jsonObject.getString("code")); + } + }else{ + + String[] splits = param.split(","); + split.addAll(Arrays.asList(splits)); } - String[] split = param.split(","); try { for (String orderPackageCode : split) { OrderStatusDTO orderStatusDTO = new OrderStatusDTO(); - orderStatusDTO.setUnitNo(orderPackageCode); + orderStatusDTO.setUnitNo(orderPackageCode.trim()); orderStatusDTO.setStatus("1"); - // 查询老系统的操作人 orderStatusDTO.setUsername("admin");// 操作人 - ouPaiFactoryService.handleStatusData(orderStatusDTO); + R r =ouPaiFactoryService.handleStatusData(orderStatusDTO); + if(r.isSuccess()){ + factoryOrderMapper.updatePackagePushAgain(orderPackageCode.trim(),1); + } } + + return ReturnT.SUCCESS; } catch (Exception e) { XxlJobLogger.log(e); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryOrderMapper.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryOrderMapper.java index e698c14be..3af8f4783 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryOrderMapper.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryOrderMapper.java @@ -16,6 +16,7 @@ */ package com.logpm.factory.oupai.mapper; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.factory.oupai.entity.FactoryOrderEntity; @@ -49,4 +50,8 @@ public interface FactoryOrderMapper extends BaseMapper { List findOrderInforIdBySelfCodeAndReceivingid(@Param("selfCode") String selfCode,@Param("receivingId") Long receivingId); + + + List findPackagePushAgain(@Param("type") Integer type); + void updatePackagePushAgain(@Param("code") String code,@Param("type") Integer type); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryOrderMapper.xml b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryOrderMapper.xml index c1481ffb4..c0cc28ed7 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryOrderMapper.xml +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryOrderMapper.xml @@ -7,6 +7,7 @@ + @@ -32,4 +33,16 @@ + + + + + update op_package_pushagain set status=2 where code=#{code} and type=#{type} + + +