Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/job/PullOrderDataJob.java

@@ -1,6 +1,7 @@
 package com.logpm.factorydata.olo.job;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
@@ -55,7 +56,9 @@ public class PullOrderDataJob {
 			List<DeliveryNoteVO> vos = data.stream().map(p -> BeanUtil.toBean(p, DeliveryNoteVO.class)).collect(Collectors.toList());
 			try {
 				log.info("拉取老系统订单数：{}", vos.size());
-				deliveryNoteService.order(vos);
+				if(CollUtil.isNotEmpty(vos)){
+    				deliveryNoteService.order(vos);
+				}
 			} catch (Exception e) {
 				log.error("工厂订单异常：{} ", e);
 			}