Commit 58751beb by lijingjing

处理查询异常问题;

parent 59719297
......@@ -21,10 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.concurrent.Executor;
import java.util.stream.Collectors;
......@@ -284,6 +281,9 @@ public class EntrustSamplePrepareServiceImpl extends BaseServiceImpl<EntrustSamp
// 添加委托操作记录
entrustRecordService.record(new Long[]{entrust.getId()}, "样品接收", "任务分配", 0, account, "提交至任务分配");
}
// 异步推送WMS数据任务
executor1.execute(() -> entrustSampleService.postWmsEntrustData(Collections.singletonList(entrust)));
}
return true;
}
......@@ -379,9 +379,7 @@ public class EntrustSamplePrepareServiceImpl extends BaseServiceImpl<EntrustSamp
}
}
// 异步推送WMS数据任务
executor1.execute(() -> {
entrustSampleService.postWmsEntrustData(entrustList);
});
executor1.execute(() -> entrustSampleService.postWmsEntrustData(entrustList));
return true;
}
......
......@@ -16,6 +16,7 @@ import com.patzn.cloud.commons.exception.PatznException;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.commons.toolkit.DateUtils;
import com.patzn.cloud.commons.toolkit.FileUtils;
import com.patzn.cloud.commons.toolkit.JacksonUtils;
import com.patzn.cloud.commons.toolkit.MapMergeUtils;
import com.patzn.cloud.oss.starter.OssClient;
import com.patzn.cloud.service.hmhj.dto.*;
......@@ -2454,7 +2455,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
// 查询样品信息
List<EntrustSample> sampleList = list(Condition.<EntrustSample>wrapper()
.setSqlSelect("id,entrust_id,name,code,name_code")
.in("entrust_ids", entrustIds));
.in("entrust_id", entrustIds));
// 是否为空,为空返回不发送
if (CollectionUtils.isEmpty(sampleList)) {
logger.error("==== EntrustSampleServiceImpl ==== postWmsEntrustData ====> 样品信息为空,取消发送!");
......@@ -2465,9 +2466,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
// 会覆盖,不予理会
sampleList.forEach(s -> entrustSampleMap.put(s.getEntrustId(), s));
// 循环发送信息
entrustList.forEach(entrust -> {
doSendWmsEntrustData(entrust.getCode(), entrustSampleMap.get(entrust.getId()));
});
entrustList.forEach(entrust -> doSendWmsEntrustData(entrust.getCode(), entrustSampleMap.get(entrust.getId())));
}
@Override
......@@ -2492,6 +2491,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
logger.info("==== EntrustSampleServiceImpl ==== doSendWmsEntrustData ====> 委托信息推送WMS数据成功!");
return;
}
logger.error("==== EntrustSampleServiceImpl ==== doSendWmsEntrustData ====> 委托信息推送WMS数据失败!");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment