feat:任务上传找品项带上产线编号

src/main/java/com/qlm/service/UploadService.java

@@ -10,6 +10,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jfinal.aop.Before;
@@ -63,7 +64,7 @@ public class UploadService {
 			String master = jsonObject.getString("m");
 			master = master.toUpperCase();
 			String childCode = jsonObject.getString("i");
-	
+
 			if("nodata".equals(master)){
 				int update = Db.update("update jinzai_upload_record set master_code = null where child_code = ?",childCode);
 				if(update>0){
@@ -76,7 +77,7 @@ public class UploadService {
 						e.printStackTrace();
 					}
 				}
-			
+
 			}else{
 				JSONObject jsonObject2 = masterMap.get(master);
 				if(jsonObject2 == null){
@@ -89,8 +90,16 @@ public class UploadService {
 			}
 		}
 		Set<Entry<String,JSONObject>> entrySet = masterMap.entrySet();
-		List<Record> find = Db.find("SELECT i.sku,i.kouwei,p.product_name,i.id,i.product_id from t_jz_item i left join t_jz_product p on (i.product_id = p.id) where sku is not null");
-		
+		StringBuilder sqlSb = new StringBuilder("SELECT i.sku,i.kouwei,p.product_name,i.id,i.product_id from t_jz_item i");
+		sqlSb.append(" left join t_jz_product p on (i.product_id = p.id)");
+		sqlSb.append(" left join t_line_product c on p.id = c.product_id");
+		sqlSb.append(" left join t_jz_device d on c.line_id = d.id");
+		sqlSb.append(" where i.sku is not null and d.device_no = ?");
+		List<Record> find = Db.find(sqlSb.toString(), deviceId);
+		if (CollUtil.isEmpty(find)){
+			find = Db.find("SELECT i.sku,i.kouwei,p.product_name,i.id,i.product_id from t_jz_item i left join t_jz_product p on (i.product_id = p.id) where sku is not null");
+		}
+
 		Map<String, Record> skuMap =new HashMap<String, Record>();
 		
 		for (Record record : find) {
@@ -106,10 +115,10 @@ public class UploadService {
 			String taskNo = jsonObject.getString("s");
 			String sku = jsonObject.getString("k");
 			String productDate = jsonObject.getString("d");
-			
+
 			String banzu = jsonObject.getString("b");
 			Record masterInfo = new Record();
-			
+
 			Record record = skuMap.get(sku);
 			String pinXiang = "";
 			String kouwei = "";
@@ -120,14 +129,14 @@ public class UploadService {
 			masterInfo.set("id", master).set("create_time", new Date()).set("produce_date", productDate)
 			.set("duo_code", duoma.toUpperCase()).set("device_no", deviceId).set("guo_time", addTime)
 			.set("pinxiang", pinXiang).set("kouwei", kouwei).set("sku", sku).set("task_no", taskNo).set("banzu", banzu);
-			
+
 			xiangList.add(masterInfo);
 		}
-		
-		
+
+
 		WxUtil.batchSaveIgnore("jinzai_upload_child", list, "");
-	
-		
+
+
 		WxUtil.batchSaveIgnore("jinzai_upload_master", xiangList, "");
 	}