add

src/main/java/com/zfire/jiasm/syncdata/service/impl/DetailDownloadServiceImpl.java

@@ -146,7 +146,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 				+ " c.download_task_type_name "
 				+ " FROM itf_gree_to_fa_download_task_list a,itf_gree_to_fa_download_task_type c "
 				+ " where a.download_task_type=c.download_task_type "
-				+ " and a.id=32 ");
+				+ " and a.download_key_value='603C28AF9ADB9C2DF8C6165689321C9D' ");
 		return result;
 	}
 	
@@ -430,6 +430,24 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		}
 	}
 
+	private void getOrderInstallDetailOtherCode(List<OrderInstallDetail> oids, List<OrderInstallDetailCode> oidcs,
+												OrderBase order) {
+		int outid=0;
+		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");
+				}
+			}
+		}
+	}
+
 	private int getInOutid(List<OrderInstallDetailCode> oidcs, int outid, OrderBase order, OrderInstallDetail a, String insideCode, String s) {
 		OrderInstallDetailCode odf = new OrderInstallDetailCode();
 		odf.setId(IdWorker.getIdStr());
@@ -1531,6 +1549,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 	public void processOrderInstallDetailO(String downloadTaskNo, String pgguid) {
 		List<OrderInstallDetail> oids = new ArrayList<>();
 		List<ItfGreeToFaDownloadTaskList> its = new ArrayList<>();
+		List<OrderInstallDetailCode> oidcs = new ArrayList<>();
 		int count = 1;
 
 		// 提取数据
@@ -1551,10 +1570,22 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 				// 增加处理三级从表的下载任务
 				getItfGreeToFaDownloadTaskListO(its, item);
 			}
-			orderInstallDetailService.saveBatch(oids);
-			oids.clear();
-			itfGreeToFaDownloadTaskListService.saveBatch(its);
-			its.clear();
+
+			// 生成采集条码数据
+			getOrderInstallDetailOtherCode(oids, oidcs, order);
+
+			if (oidcs.size()>0){
+				orderInstallDetailCodeService.saveBatch(oidcs);
+				oidcs.clear();
+			}
+			/*if (oids.size()>0){
+				orderInstallDetailService.saveBatch(oids);
+				oids.clear();
+			}
+			if (its.size()>0){
+				itfGreeToFaDownloadTaskListService.saveBatch(its);
+				its.clear();
+			}*/
 		}
 
 		// 修改同步状态