yaozhixue 1 year ago
parent
commit
1d481bd891

+ 20 - 14
src/main/java/com/zfire/jiasm/syncdata/service/impl/DetailDownloadServiceImpl.java

@@ -353,25 +353,30 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 					.last("limit 1").one();
 
 			for (ItfTblAzWgmxJyktDownload item :jykts){
-				OrderInstallDetail a = new OrderInstallDetail();
 				// 生成采集明细数据
-				count = getOrderInstallDetail(oids, count, order, item,a);
+				count = getOrderInstallDetail(oids, count, order, item);
 
-				log.info("生成采集条码表a {}",JSONObject.toJSONString(a));
+				// 增加处理三级从表的下载任务
+				getItfGreeToFaDownloadTaskList(its, item);
+			}
 
-				// 把条码信息放在采集条码表中使用
-				if (StringUtils.isNotEmpty(a.getInsideCode())){
-					outid = getInOutid(oidcs, outid, order, a, a.getInsideCode(), "1");
-				}
-				if (StringUtils.isNotEmpty(a.getOutCode())){
-					outid = getInOutid(oidcs, outid, order, a, a.getOutCode(), "2");
+			// 生成采集条码数据
+			if (oids.size()>0){
+				for (OrderInstallDetail a :oids){
+					log.info("生成采集条码表a {}",JSONObject.toJSONString(a));
+
+					// 把条码信息放在采集条码表中使用
+					if (StringUtils.isNotEmpty(a.getInsideCode())){
+						outid = getInOutid(oidcs, outid, order, a, a.getInsideCode(), "1");
+					}
+					if (StringUtils.isNotEmpty(a.getOutCode())){
+						outid = getInOutid(oidcs, outid, order, a, a.getOutCode(), "2");
+					}
+					log.info("生成采集条码表b {}",JSONObject.toJSONString(oidcs));
 				}
+			}
 
-				log.info("生成采集条码表b {}",JSONObject.toJSONString(oidcs));
 
-				// 增加处理三级从表的下载任务
-				getItfGreeToFaDownloadTaskList(its, item);
-			}
 			if (oids.size()>0){
 				orderInstallDetailService.saveBatch(oids);
 				oids.clear();
@@ -1194,8 +1199,9 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		its.add(tl);
 	}
 
-	private int getOrderInstallDetail(List<OrderInstallDetail> oids, int count, OrderBase order, ItfTblAzWgmxJyktDownload item,OrderInstallDetail a) {
+	private int getOrderInstallDetail(List<OrderInstallDetail> oids, int count, OrderBase order, ItfTblAzWgmxJyktDownload item) {
 		WebsitSH websitSH;
+		OrderInstallDetail a = new OrderInstallDetail();
 
 		OrderPar req = new OrderPar();
 		req.setSynReqId(item.getSynReqId());